Fix body text

totem-technologies · Mar 24, 2024 · 38f4459 · 38f4459
1 parent a4b88b2
commit 38f4459
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/app/lib/theme/app_text_styles.dart b/app/lib/theme/app_text_styles.dart
@@ -8,7 +8,8 @@ class AppTextStyles extends TextTheme {
     required TextStyle headline4,
     required TextStyle headline5,
     required TextStyle headline6,
-    required TextStyle body,
+    required TextStyle bodyLarge,
+    required TextStyle bodyMedium,
     required TextStyle button,
     required this.pinInput,
     required this.inputLabel,
@@ -19,7 +20,8 @@ class AppTextStyles extends TextTheme {
     required this.hintInputLabel,
     required this.nextTag,
   }) : super(
-          bodyLarge: body,
+          bodyLarge: bodyLarge,
+          bodyMedium: bodyMedium,
           displayLarge: headline1,
           displayMedium: headline2,
           displaySmall: headline3,

diff --git a/app/lib/theme/std_app_text_styles.dart b/app/lib/theme/std_app_text_styles.dart
@@ -5,86 +5,74 @@ class StdAppTextStyles extends AppTextStyles {
   StdAppTextStyles(AppThemeColors themeColors)
       : super(
           headline1: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 32,
               fontWeight: FontWeight.w600,
               height: 43.52 / 32,
               color: themeColors.primaryText),
-          body: TextStyle(
-              fontFamily: 'Montserrat',
+          bodyLarge: TextStyle(
               fontSize: 20,
               fontWeight: FontWeight.w600,
               color: themeColors.primaryText),
+          bodyMedium: TextStyle(
+              fontSize: 12,
+              fontWeight: FontWeight.w600,
+              color: themeColors.primaryText),
           button: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 16,
               fontWeight: FontWeight.w600,
               color: themeColors.primaryText),
           pinInput: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 20,
               fontWeight: FontWeight.w600,
               color: themeColors.primaryText),
           headline2: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 24,
               fontWeight: FontWeight.w400,
               height: 1.5,
               color: themeColors.secondaryText),
           headline6: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 24,
               fontWeight: FontWeight.w600,
               color: themeColors.primaryText),
           headline3: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 16,
               height: 18.78 / 16,
               fontWeight: FontWeight.w600,
               color: themeColors.primaryText),
           headline4: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 14,
               height: 18 / 14,
               fontWeight: FontWeight.w500,
               color: themeColors.secondaryText),
           headline5: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 12,
               fontWeight: FontWeight.w600,
               color: themeColors.reversedText),
           inputLabel: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 16,
               fontWeight: FontWeight.bold,
               color: themeColors.primaryText),
           formErrorLabel: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 12,
               fontWeight: FontWeight.normal,
               color: themeColors.error),
           textLinkButton: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 16,
               fontWeight: FontWeight.w600,
               color: themeColors.linkText),
           dialogContent: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 16,
               color: themeColors.primaryText,
               fontWeight: FontWeight.normal),
           dialogTitle: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 24,
               fontWeight: FontWeight.w600,
               color: themeColors.primaryText),
           hintInputLabel: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 14,
               color: themeColors.secondaryText,
               fontWeight: FontWeight.w500),
           nextTag: TextStyle(
-              fontFamily: 'Montserrat',
               fontSize: 14,
               height: 1.5,
               fontWeight: FontWeight.w500,