MarianumMobile/Client
5
1
Fork 0
Code Issues 33 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

develop-fix-geolocation #91

Merged
Pupsi merged 3 commits from develop-fix-geolocation into develop 2025-10-01 17:08:17 +00:00
Conversation 3 Commits 3 Files Changed 3 +8 -3
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/api/marianumcloud/talk/chat/getChatResponse.dart
View File

@@ -120,4 +120,5 @@ enum RichObjectStringObjectType {
@JsonValue('guest') guest, @JsonValue('guest') guest,
@JsonValue('highlight') highlight, @JsonValue('highlight') highlight,
@JsonValue('talk-poll') talkPoll, @JsonValue('talk-poll') talkPoll,
@JsonValue('geo-location') geoLocation,
} }

1
lib/api/marianumcloud/talk/chat/getChatResponse.g.dart
View File

@@ -113,4 +113,5 @@ const _$RichObjectStringObjectTypeEnumMap = {
RichObjectStringObjectType.guest: 'guest', RichObjectStringObjectType.guest: 'guest',
RichObjectStringObjectType.highlight: 'highlight', RichObjectStringObjectType.highlight: 'highlight',
RichObjectStringObjectType.talkPoll: 'talk-poll', RichObjectStringObjectType.talkPoll: 'talk-poll',
RichObjectStringObjectType.geoLocation: 'geo-location',
}; };

9
lib/view/pages/talk/chatDetails/participants/participantsListView.dart
View File

@@ -13,8 +13,11 @@ class ParticipantsListView extends StatelessWidget {
lastname(participant) => participant.displayName.toString().split(' ').last; lastname(participant) => participant.displayName.toString().split(' ').last;
final participants = participantsResponse.data final participants = participantsResponse.data
.sorted((a, b) => lastname(a).compareTo(lastname(b))) .sorted((a, b) {
.sorted((a, b) => a.participantType.index.compareTo(b.participantType.index)); 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); var groupedParticipants = participants.groupListsBy((participant) => participant.participantType);
return Scaffold( return Scaffold(
@@ -27,7 +30,7 @@ class ParticipantsListView extends StatelessWidget {
children: [ children: [
ListTile( ListTile(
title: Text(entry.key.prettyName), title: Text(entry.key.prettyName),
titleTextStyle: TextStyle(fontWeight: FontWeight.bold), titleTextStyle: Theme.of(context).textTheme.titleMedium
), ),
...entry.value.map((participant) => ListTile( ...entry.value.map((participant) => ListTile(
leading: UserAvatar(id: participant.actorId), leading: UserAvatar(id: participant.actorId),