Merge pull request '#53 fixed misplaced profile pictures' (#62) from develop-fixSwappedProfilePictures into develop

Reviewed-on: #62
Reviewed-by: Pupsi <larslukasneuhaus@gmx.de>
This commit is contained in:
Lars Neuhaus 2024-04-09 17:22:08 +00:00
commit 07ffa374fe

View File

@ -30,18 +30,14 @@ class ChatTile extends StatefulWidget {
} }
class _ChatTileState extends State<ChatTile> { class _ChatTileState extends State<ChatTile> {
late String username; late String selfUsername;
late UserAvatar circleAvatar;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
SharedPreferences.getInstance().then((value) => { SharedPreferences.getInstance().then((value) => {
username = value.getString('username')! selfUsername = value.getString('username')!
}); });
var isGroup = widget.data.type != GetRoomResponseObjectConversationType.oneToOne;
circleAvatar = UserAvatar(id: isGroup ? widget.data.token : widget.data.name, isGroup: isGroup);
} }
void setCurrentAsRead() { void setCurrentAsRead() {
@ -54,9 +50,11 @@ class _ChatTileState extends State<ChatTile> {
).run().then((value) => widget.query(renew: true)); ).run().then((value) => widget.query(renew: true));
} }
@override @override
Widget build(BuildContext context) => Consumer<ChatProps>(builder: (context, chatData, child) => ListTile( Widget build(BuildContext context) => Consumer<ChatProps>(builder: (context, chatData, child) {
var isGroup = widget.data.type != GetRoomResponseObjectConversationType.oneToOne;
var circleAvatar = UserAvatar(id: isGroup ? widget.data.token : widget.data.name, isGroup: isGroup);
return ListTile(
style: ListTileStyle.list, style: ListTileStyle.list,
tileColor: chatData.currentToken() == widget.data.token && TalkNavigator.isSecondaryVisible(context) tileColor: chatData.currentToken() == widget.data.token && TalkNavigator.isSecondaryVisible(context)
? Theme.of(context).primaryColor.withAlpha(100) ? Theme.of(context).primaryColor.withAlpha(100)
@ -117,7 +115,7 @@ class _ChatTileState extends State<ChatTile> {
), ),
onTap: () async { onTap: () async {
setCurrentAsRead(); setCurrentAsRead();
var view = ChatView(room: widget.data, selfId: username, avatar: circleAvatar); var view = ChatView(room: widget.data, selfId: selfUsername, avatar: circleAvatar);
TalkNavigator.pushSplitView(context, view, overrideToSingleSubScreen: true); TalkNavigator.pushSplitView(context, view, overrideToSingleSubScreen: true);
Provider.of<ChatProps>(context, listen: false).setQueryToken(widget.data.token); Provider.of<ChatProps>(context, listen: false).setQueryToken(widget.data.token);
}, },
@ -182,5 +180,6 @@ class _ChatTileState extends State<ChatTile> {
], ],
)); ));
}, },
)); );
});
} }