Merge pull request 'develop-fix-geolocation' (#91) from develop-fix-geolocation into develop

Reviewed-on: #91
Reviewed-by: Elias Müller <elias@elias-mueller.com>
This commit is contained in:
2025-10-01 17:08:16 +00:00
3 changed files with 8 additions and 3 deletions

View File

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

View File

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

View File

@@ -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 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);
return Scaffold(
@@ -27,7 +30,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),