From bd5dc8405d930110be826cb1b9eaa4c427332052 Mon Sep 17 00:00:00 2001
From: krille-chan <christian-kussowski@posteo.de>
Date: Thu, 30 May 2024 15:24:11 +0200
Subject: [PATCH] refactor: Calc avatar font size by avatar size

---
 lib/pages/chat/seen_by_row.dart                         | 1 -
 lib/pages/chat_details/chat_details_view.dart           | 1 -
 lib/pages/chat_list/chat_list_view.dart                 | 1 -
 lib/pages/chat_list/client_chooser_button.dart          | 2 --
 lib/pages/chat_list/space_view.dart                     | 1 -
 lib/pages/settings/settings_view.dart                   | 1 -
 lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart | 1 -
 lib/widgets/avatar.dart                                 | 4 +---
 lib/widgets/public_room_bottom_sheet.dart               | 1 -
 9 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart
index c2c3cd737..9b1ad8953 100644
--- a/lib/pages/chat/seen_by_row.dart
+++ b/lib/pages/chat/seen_by_row.dart
@@ -42,7 +42,6 @@ class SeenByRow extends StatelessWidget {
                 mxContent: user.avatarUrl,
                 name: user.calcDisplayname(),
                 size: 16,
-                fontSize: 9,
               ),
             ),
             if (seenByUsers.length > maxAvatars)
diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
index 5b9324d0c..4e19e43ca 100644
--- a/lib/pages/chat_details/chat_details_view.dart
+++ b/lib/pages/chat_details/chat_details_view.dart
@@ -111,7 +111,6 @@ class ChatDetailsView extends StatelessWidget {
                                         mxContent: room.avatar,
                                         name: displayname,
                                         size: Avatar.defaultSize * 2.5,
-                                        fontSize: 18 * 2.5,
                                       ),
                                     ),
                                   ),
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 9cd31e0e0..160db9b86 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -163,7 +163,6 @@ class ChatListView extends StatelessWidget {
                                 MatrixLocals(L10n.of(context)!),
                               ),
                               size: 32,
-                              fontSize: 12,
                             ),
                           );
                         },
diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index e533d37f6..a37901b2f 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -126,7 +126,6 @@ class ClientChooserButton extends StatelessWidget {
                     name:
                         snapshot.data?.displayName ?? client.userID!.localpart,
                     size: 32,
-                    fontSize: 12,
                   ),
                   const SizedBox(width: 12),
                   Expanded(
@@ -216,7 +215,6 @@ class ClientChooserButton extends StatelessWidget {
                 name: snapshot.data?.displayName ??
                     matrix.client.userID!.localpart,
                 size: 32,
-                fontSize: 12,
               ),
             ),
           ),
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 40ad71c49..a984b4377 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -461,7 +461,6 @@ class _SpaceViewState extends State<SpaceView> {
                                   size: 24,
                                   mxContent: spaceChild.avatarUrl,
                                   name: spaceChild.name,
-                                  fontSize: 9,
                                 ),
                               ),
                               color: Theme.of(context)
diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart
index a709f46f6..b1d60f142 100644
--- a/lib/pages/settings/settings_view.dart
+++ b/lib/pages/settings/settings_view.dart
@@ -74,7 +74,6 @@ class SettingsView extends StatelessWidget {
                               mxContent: profile?.avatarUrl,
                               name: displayname,
                               size: Avatar.defaultSize * 2.5,
-                              fontSize: 18 * 2.5,
                             ),
                           ),
                           if (profile != null)
diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
index da60ee597..9e72a4a3f 100644
--- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
+++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
@@ -187,7 +187,6 @@ class UserBottomSheetView extends StatelessWidget {
                           mxContent: avatarUrl,
                           name: displayname,
                           size: Avatar.defaultSize * 2.5,
-                          fontSize: 18 * 2.5,
                         ),
                       ),
                     ),
diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart
index a22f3602d..2066536dc 100644
--- a/lib/widgets/avatar.dart
+++ b/lib/widgets/avatar.dart
@@ -13,7 +13,6 @@ class Avatar extends StatelessWidget {
   final void Function()? onTap;
   static const double defaultSize = 44;
   final Client? client;
-  final double fontSize;
   final String? presenceUserId;
   final Color? presenceBackgroundColor;
 
@@ -23,7 +22,6 @@ class Avatar extends StatelessWidget {
     this.size = defaultSize,
     this.onTap,
     this.client,
-    this.fontSize = 18,
     this.presenceUserId,
     this.presenceBackgroundColor,
     super.key,
@@ -48,7 +46,7 @@ class Avatar extends StatelessWidget {
         fallbackLetters,
         style: TextStyle(
           color: noPic ? Colors.white : null,
-          fontSize: fontSize,
+          fontSize: (size / 2.5).roundToDouble(),
         ),
       ),
     );
diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart
index 3a4f68f3f..8bd354ef5 100644
--- a/lib/widgets/public_room_bottom_sheet.dart
+++ b/lib/widgets/public_room_bottom_sheet.dart
@@ -133,7 +133,6 @@ class PublicRoomBottomSheet extends StatelessWidget {
                         mxContent: profile.avatarUrl,
                         name: profile.name ?? roomAlias,
                         size: Avatar.defaultSize * 3,
-                        fontSize: 36,
                       ),
                     ),
                   ),