diff --git a/lib/config/themes.dart b/lib/config/themes.dart index 5e8c638be..96b1aae14 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -114,6 +114,9 @@ abstract class FluffyThemes { systemNavigationBarColor: colorScheme.surface, ), ), + listTileTheme: ListTileThemeData( + subtitleTextStyle: TextStyle(color: colorScheme.outline, fontSize: 14), + ), outlinedButtonTheme: OutlinedButtonThemeData( style: OutlinedButton.styleFrom( side: BorderSide( diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart index 714f7ac00..193ce1e4a 100644 --- a/lib/pages/chat/chat_app_bar_title.dart +++ b/lib/pages/chat/chat_app_bar_title.dart @@ -90,8 +90,10 @@ class ChatAppBarTitle extends StatelessWidget { builder: (context, presence) { final lastActiveTimestamp = presence?.lastActiveTimestamp; - final style = - Theme.of(context).textTheme.bodySmall; + final style = Theme.of(context) + .listTileTheme + .subtitleTextStyle + ?.copyWith(fontSize: 12); if (presence?.currentlyActive == true) { return Text( L10n.of(context).currentlyActive, diff --git a/lib/pages/chat_list/status_msg_list.dart b/lib/pages/chat_list/status_msg_list.dart index 15402c99a..2f4e13f71 100644 --- a/lib/pages/chat_list/status_msg_list.dart +++ b/lib/pages/chat_list/status_msg_list.dart @@ -223,7 +223,7 @@ class PresenceAvatar extends StatelessWidget { overflow: TextOverflow.ellipsis, style: const TextStyle( color: Colors.black, - fontSize: 10.5, + fontSize: 9, ), ), ), @@ -278,7 +278,7 @@ class PresenceAvatar extends StatelessWidget { maxLines: 1, overflow: TextOverflow.ellipsis, style: const TextStyle( - fontSize: 13, + fontSize: 11, ), ), ), diff --git a/lib/widgets/share_scaffold_dialog.dart b/lib/widgets/share_scaffold_dialog.dart index b7a63c0bc..070d30def 100644 --- a/lib/widgets/share_scaffold_dialog.dart +++ b/lib/widgets/share_scaffold_dialog.dart @@ -150,7 +150,20 @@ class _ShareScaffoldDialogState extends State { name: displayname, size: Avatar.defaultSize * 0.75, ), - title: Text(displayname), + title: Text( + displayname, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + subtitle: Text( + room.directChatMatrixID ?? + L10n.of(context).countParticipants( + (room.summary.mJoinedMemberCount ?? 0) + + (room.summary.mInvitedMemberCount ?? 0), + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), value: selectedRoomId == room.id, onChanged: (_) => _toggleRoom(room.id), ), diff --git a/pubspec.yaml b/pubspec.yaml index d06724fe5..7b97bc087 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -53,7 +53,7 @@ dependencies: ref: main flutter_vodozemac: ^0.2.2 flutter_web_auth_2: ^3.1.1 # Version 4 blocked by https://github.com/MixinNetwork/flutter-plugins/issues/379 - flutter_webrtc: ^1.0.0 + flutter_webrtc: ^1.1.0 geolocator: ^14.0.2 go_router: ^16.1.0 handy_window: ^0.4.0