From 06c27d6b50408040c97f06f3d9a1be1163c9e621 Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 1 Oct 2025 16:06:02 +0200 Subject: [PATCH 1/3] fixed geo-location breaking chats and white text on white background --- lib/api/marianumcloud/talk/chat/getChatResponse.dart | 1 + lib/api/marianumcloud/talk/chat/getChatResponse.g.dart | 1 + .../talk/chatDetails/participants/participantsListView.dart | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/api/marianumcloud/talk/chat/getChatResponse.dart b/lib/api/marianumcloud/talk/chat/getChatResponse.dart index 7055417..cc83ea0 100644 --- a/lib/api/marianumcloud/talk/chat/getChatResponse.dart +++ b/lib/api/marianumcloud/talk/chat/getChatResponse.dart @@ -120,4 +120,5 @@ enum RichObjectStringObjectType { @JsonValue('guest') guest, @JsonValue('highlight') highlight, @JsonValue('talk-poll') talkPoll, + @JsonValue('geo-location') geoLocation, } diff --git a/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart b/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart index 9cfcf18..0087344 100644 --- a/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart +++ b/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart @@ -113,4 +113,5 @@ const _$RichObjectStringObjectTypeEnumMap = { RichObjectStringObjectType.guest: 'guest', RichObjectStringObjectType.highlight: 'highlight', RichObjectStringObjectType.talkPoll: 'talk-poll', + RichObjectStringObjectType.geoLocation: 'geo-location', }; diff --git a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart index db25cb7..50558f1 100644 --- a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart +++ b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart @@ -27,7 +27,7 @@ class ParticipantsListView extends StatelessWidget { children: [ ListTile( title: Text(entry.key.prettyName), - titleTextStyle: TextStyle(fontWeight: FontWeight.bold), + titleTextStyle: Theme.of(context).textTheme.titleMedium ), ...entry.value.map((participant) => ListTile( leading: UserAvatar(id: participant.actorId), From 33dd6c4c6938ff53591e78bb0165e6eb16869c49 Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 1 Oct 2025 16:15:09 +0200 Subject: [PATCH 2/3] fixed wrong sorting in participants view --- .../chatDetails/participants/participantsListView.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart index 50558f1..8cb6612 100644 --- a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart +++ b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart @@ -13,8 +13,11 @@ class ParticipantsListView extends StatelessWidget { lastname(participant) => participant.displayName.toString().split(' ').last; final participants = participantsResponse.data - .sorted((a, b) => lastname(a).compareTo(lastname(b))) - .sorted((a, b) => a.participantType.index.compareTo(b.participantType.index)); + .sorted((a, b) { + final t = a.participantType.index.compareTo(b.participantType.index); + if (t != 0) return t; + return lastname(a).compareTo(lastname(b)); + }); var groupedParticipants = participants.groupListsBy((participant) => participant.participantType); return Scaffold( From a460d2b296c98fa085b99d262c6ebc5217b121be Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 1 Oct 2025 19:03:43 +0200 Subject: [PATCH 3/3] changed naming of variable at participants sorting --- .../talk/chatDetails/participants/participantsListView.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart index 8cb6612..dfb6b82 100644 --- a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart +++ b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart @@ -14,8 +14,8 @@ class ParticipantsListView extends StatelessWidget { final participants = participantsResponse.data .sorted((a, b) { - final t = a.participantType.index.compareTo(b.participantType.index); - if (t != 0) return t; + final typeComparison = a.participantType.index.compareTo(b.participantType.index); + if (typeComparison != 0) return typeComparison; return lastname(a).compareTo(lastname(b)); }); var groupedParticipants = participants.groupListsBy((participant) => participant.participantType);