fix: use font weight specified via font variant

Fixes #315
phnx-im · Jan 31, 2025 · 597cc8a · 597cc8a
1 parent 8cf7564
commit 597cc8a
Show file tree

Hide file tree

Showing 37 changed files with 397 additions and 169 deletions.
diff --git a/app/lib/conversation_details/add_members_screen.dart b/app/lib/conversation_details/add_members_screen.dart
@@ -66,7 +66,7 @@ class AddMembersScreenView extends StatelessWidget {
                         ),
                         title: Text(
                           contact.userName,
-                          style: labelStyle,
+                          style: Theme.of(context).textTheme.labelMedium,
                           overflow: TextOverflow.ellipsis,
                         ),
                         trailing: Checkbox(

diff --git a/app/lib/conversation_details/connection_details.dart b/app/lib/conversation_details/connection_details.dart
@@ -37,11 +37,11 @@ class ConnectionDetails extends StatelessWidget {
           ),
           Text(
             conversation.title,
-            style: labelStyle,
+            style: Theme.of(context).textTheme.labelMedium,
           ),
           Text(
             conversation.conversationType.description,
-            style: labelStyle,
+            style: Theme.of(context).textTheme.labelMedium,
           ),
         ],
       ),

diff --git a/app/lib/conversation_details/conversation_screen.dart b/app/lib/conversation_details/conversation_screen.dart
@@ -57,7 +57,10 @@ class _EmptyConversationPane extends StatelessWidget {
     return Scaffold(
       body: Center(
         child: Text(
-          style: labelStyle.copyWith(color: colorDMB),
+          style: Theme.of(context)
+              .textTheme
+              .labelMedium
+              ?.copyWith(color: colorDMB),
           "Select a chat to start messaging",
         ),
       ),

diff --git a/app/lib/conversation_details/group_details.dart b/app/lib/conversation_details/group_details.dart
@@ -51,10 +51,13 @@ class GroupDetails extends StatelessWidget {
                   final bytes = await image?.readAsBytes();
                   conversationDetailsCubit.setConversationPicture(bytes: bytes);
                 }),
-            Text(conversation.title, style: labelStyle),
+            Text(
+              conversation.title,
+              style: Theme.of(context).textTheme.labelMedium,
+            ),
             Text(
               conversation.conversationType.description,
-              style: labelStyle,
+              style: Theme.of(context).textTheme.labelMedium,
             ),
             Expanded(
               child: Container(
@@ -64,9 +67,12 @@ class GroupDetails extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      const Text(
+                      Text(
                         "Members",
-                        style: boldLabelStyle,
+                        style: Theme.of(context)
+                            .textTheme
+                            .labelMedium
+                            ?.merge(VariableFontWeight.bold),
                       ),
                       Expanded(
                         child: ListView.builder(
@@ -82,7 +88,7 @@ class GroupDetails extends StatelessWidget {
                               ),
                               title: Text(
                                 member,
-                                style: labelStyle,
+                                style: Theme.of(context).textTheme.labelMedium,
                                 overflow: TextOverflow.ellipsis,
                               ),
                               trailing: const Icon(Icons.more_horiz),

diff --git a/app/lib/conversation_details/member_details_screen.dart b/app/lib/conversation_details/member_details_screen.dart
@@ -60,7 +60,7 @@ class MemberDetailsScreen extends StatelessWidget {
                 const SizedBox(height: _padding),
                 Text(
                   memberUsername,
-                  style: labelStyle,
+                  style: Theme.of(context).textTheme.labelMedium,
                 ),
                 const SizedBox(height: _padding),
               ],

diff --git a/app/lib/conversation_list/conversation_list_content.dart b/app/lib/conversation_list/conversation_list_content.dart
@@ -186,10 +186,10 @@ class _UnreadBadge extends StatelessWidget {
       child: Text(
         badgeText,
         style: const TextStyle(
-            color: Colors.white,
-            fontSize: 10,
-            fontVariations: variationSemiBold,
-            letterSpacing: 0),
+          color: Colors.white,
+          fontSize: 10,
+          letterSpacing: 0,
+        ).merge(VariableFontWeight.semiBold),
       ),
     );
   }
@@ -210,16 +210,14 @@ class _LastMessage extends StatelessWidget {
     final style = TextStyle(
       color: colorDMB,
       fontSize: isSmallScreen(context) ? 14 : 13,
-      fontVariations: variationRegular,
-      letterSpacing: -0.2,
       height: 1.2,
     );
 
     final contentStyle = conversation.unreadMessages > 0
-        ? style.copyWith(fontVariations: variationMedium)
+        ? style.merge(VariableFontWeight.medium)
         : style;
 
-    final senderStyle = style.copyWith(fontVariations: variationSemiBold);
+    final senderStyle = style.merge(VariableFontWeight.semiBold);
 
     final (sender, displayedLastMessage) = switch (lastMessage?.message) {
       UiMessage_Content(field0: final content) => (
@@ -263,8 +261,6 @@ class _LastUpdated extends StatelessWidget {
         style: const TextStyle(
           color: colorDMB,
           fontSize: 11,
-          fontVariations: variationRegular,
-          letterSpacing: -0.2,
         ),
       ),
     );
@@ -289,9 +285,7 @@ class _ConversationTitle extends StatelessWidget {
         style: const TextStyle(
           color: convListItemTextColor,
           fontSize: 14,
-          fontVariations: variationSemiBold,
-          letterSpacing: -0.2,
-        ),
+        ).merge(VariableFontWeight.semiBold),
       ),
     );
   }

diff --git a/app/lib/conversation_list/conversation_list_header.dart b/app/lib/conversation_list/conversation_list_header.dart
@@ -100,20 +100,16 @@ class _UsernameSpace extends StatelessWidget {
           displayName ?? "",
           style: const TextStyle(
             color: colorDMB,
-            fontVariations: variationBold,
             fontSize: 13,
-            letterSpacing: -0.2,
-          ),
+          ).merge(VariableFontWeight.bold),
         ),
         const SizedBox(height: 5),
         Text(
           userName,
           style: const TextStyle(
             color: colorDMB,
             fontSize: 10,
-            fontVariations: variationMedium,
-            letterSpacing: -0.2,
-          ),
+          ).merge(VariableFontWeight.medium),
           overflow: TextOverflow.ellipsis,
         ),
       ],

diff --git a/app/lib/conversation_list/create_conversation_view.dart b/app/lib/conversation_list/create_conversation_view.dart
@@ -51,7 +51,10 @@ class _CreateConversationViewState extends State<CreateConversationView> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               const SizedBox(height: 50),
-              Text(widget.prompt, style: labelStyle),
+              Text(
+                widget.prompt,
+                style: Theme.of(context).textTheme.labelMedium,
+              ),
               const SizedBox(height: 20),
               Form(
                 autovalidateMode: AutovalidateMode.always,

diff --git a/app/lib/developer/developer_settings_screen.dart b/app/lib/developer/developer_settings_screen.dart
@@ -21,6 +21,8 @@ class DeveloperSettingsScreen extends StatefulWidget {
       _DeveloperSettingsScreenState();
 }
 
+final _titleFontWeight = VariableFontWeight.medium;
+
 class _DeveloperSettingsScreenState extends State<DeveloperSettingsScreen> {
   String? deviceToken;
 
@@ -69,8 +71,6 @@ class _DeveloperSettingsScreenState extends State<DeveloperSettingsScreen> {
   }
 }
 
-const _titleFontWeight = FontWeight.w600;
-
 class DeveloperSettingsScreenView extends StatelessWidget {
   const DeveloperSettingsScreenView({
     required this.deviceToken,
@@ -87,13 +87,13 @@ class DeveloperSettingsScreenView extends StatelessWidget {
   Widget build(BuildContext context) {
     final user = context.select((LoadableUserCubit cubit) => cubit.state.user);
 
-    return SafeArea(
-      child: Scaffold(
-        appBar: AppBar(
-          title: const Text('Developer Settings'),
-          leading: const AppBarBackButton(),
-        ),
-        body: Center(
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Developer Settings'),
+        leading: const AppBarBackButton(),
+      ),
+      body: SafeArea(
+        child: Center(
           child: Container(
             constraints:
                 isPointer() ? const BoxConstraints(maxWidth: 800) : null,
@@ -103,7 +103,7 @@ class DeveloperSettingsScreenView extends StatelessWidget {
                     titleTextStyle: Theme.of(context)
                         .textTheme
                         .bodyLarge!
-                        .copyWith(fontWeight: _titleFontWeight),
+                        .merge(_titleFontWeight),
                   ),
               child: ListView(
                 children: [
@@ -137,10 +137,13 @@ class DeveloperSettingsScreenView extends StatelessWidget {
                     ListTile(
                       title: Text(
                         user.userName,
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                        style: Theme.of(context)
+                            .textTheme
+                            .bodyLarge
+                            ?.copyWith(
                               color: Colors.red,
-                              fontWeight: _titleFontWeight,
-                            ),
+                            )
+                            .merge(_titleFontWeight),
                       ),
                       subtitle: Text("id: ${user.clientId}"),
                       trailing: const Icon(Icons.delete),
@@ -155,10 +158,13 @@ class DeveloperSettingsScreenView extends StatelessWidget {
                   ListTile(
                     title: Text(
                       'Erase All Databases',
-                      style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                      style: Theme.of(context)
+                          .textTheme
+                          .bodyLarge
+                          ?.copyWith(
                             color: Colors.red,
-                            fontWeight: _titleFontWeight,
-                          ),
+                          )
+                          .merge(_titleFontWeight),
                     ),
                     trailing: const Icon(Icons.delete),
                     onTap: () => _confirmDialog(

diff --git a/app/lib/intro_screen.dart b/app/lib/intro_screen.dart
@@ -35,9 +35,9 @@ class IntroScreen extends StatelessWidget {
                 filterQuality: FilterQuality.high,
                 color: Colors.grey[350],
               ),
-              const _GradientText(
+              _GradientText(
                 "Prototype.",
-                gradient: LinearGradient(
+                gradient: const LinearGradient(
                   colors: [
                     Color.fromARGB(255, 34, 163, 255),
                     Color.fromARGB(255, 72, 23, 250)
@@ -46,9 +46,8 @@ class IntroScreen extends StatelessWidget {
                 ),
                 style: TextStyle(
                   fontSize: 36,
-                  fontVariations: variationMedium,
                   letterSpacing: -0.9,
-                ),
+                ).merge(VariableFontWeight.medium),
               ),
               // Text button that opens the developer settings screen
               TextButton(

diff --git a/app/lib/message_list/display_message_tile.dart b/app/lib/message_list/display_message_tile.dart
@@ -89,11 +89,9 @@ class SystemMessageContent extends StatelessWidget {
         message.message,
         style: TextStyle(
           color: Colors.grey[700],
-          fontVariations: variationBold,
-          letterSpacing: -0.02,
           fontSize: 10,
           height: 1.4,
-        ),
+        ).merge(VariableFontWeight.bold),
       ),
     );
   }
@@ -115,10 +113,9 @@ class ErrorMessageContent extends StatelessWidget {
         message.message,
         style: const TextStyle(
           color: Colors.red,
-          fontWeight: FontWeight.w200,
           fontSize: 10,
           height: 1.0,
-        ),
+        ).merge(VariableFontWeight.w200),
       ),
     );
   }

diff --git a/app/lib/message_list/message_renderer.dart b/app/lib/message_list/message_renderer.dart
@@ -36,11 +36,12 @@ TextSpan _styledTextSpan(
             child: SelectionContainer.disabled(
               child: Text(
                 keyword,
-                style: style?.copyWith(
-                  //color: colorDMB,
-                  fontSize: 12,
-                  fontVariations: variationSemiBold,
-                ),
+                style: style
+                    ?.copyWith(
+                      //color: colorDMB,
+                      fontSize: 12,
+                    )
+                    .merge(VariableFontWeight.semiBold),
               ),
             ),
           ),

diff --git a/app/lib/message_list/text_message_tile.dart b/app/lib/message_list/text_message_tile.dart
@@ -104,9 +104,8 @@ class TextMessageTile extends StatelessWidget {
           style: TextStyle(
             color: colorGreyDark,
             fontSize: isLargeScreen(context) ? 10 : 11,
-            fontVariations: variationMedium,
             letterSpacing: -0.1,
-          ),
+          ).merge(VariableFontWeight.medium),
         ),
       ),
     );
@@ -165,10 +164,8 @@ class TextMessageTile extends StatelessWidget {
         isSender ? "You" : contentMessage.sender.split("@").firstOrNull ?? "",
         style: const TextStyle(
           color: colorDMB,
-          fontVariations: variationSemiBold,
           fontSize: 12,
-          letterSpacing: -0.2,
-        ),
+        ).merge(VariableFontWeight.semiBold),
         overflow: TextOverflow.ellipsis,
       ),
     );

diff --git a/app/lib/message_list/tile_timestamp.dart b/app/lib/message_list/tile_timestamp.dart
@@ -29,10 +29,8 @@ class TileTimestamp extends StatelessWidget {
           timeString(timestamp),
           style: const TextStyle(
             color: colorDMB,
-            fontWeight: FontWeight.w200,
             fontSize: 10,
-            letterSpacing: -0.2,
-          ),
+          ).merge(VariableFontWeight.w200),
         ),
       ),
     );

diff --git a/app/lib/registration/server_choice.dart b/app/lib/registration/server_choice.dart
@@ -31,9 +31,9 @@ class ServerChoice extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [
-              const Text(
+              Text(
                 'Choose a server where you want to create your account',
-                style: labelStyle,
+                style: Theme.of(context).textTheme.labelMedium,
               ),
               Form(
                 autovalidateMode: AutovalidateMode.always,

diff --git a/app/lib/registration/username_password.dart b/app/lib/registration/username_password.dart
@@ -31,9 +31,9 @@ class UsernamePasswordChoice extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [
-              const Text(
+              Text(
                 'Choose a username and password',
-                style: labelStyle,
+                style: Theme.of(context).textTheme.labelMedium,
               ),
               Form(
                 autovalidateMode: AutovalidateMode.always,