text styles font based on theme

2025-01-10 20:54:33 +00:00 · 2022-09-26 11:34:41 -06:00 · 2022-09-26 11:34:41 -06:00 · 944bee890e
commit 944bee890e
parent fb0908840d
7 changed files with 839 additions and 366 deletions
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
@ -80,59 +80,30 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
      colorArrowNext: Theme.of(context).extension<StackColors>()!.textSubtitle1,
      colorArrowPrevious:
          Theme.of(context).extension<StackColors>()!.textSubtitle1,
-      textStyleButtonNegative: GoogleFonts.inter(
+      textStyleButtonNegative: STextStyles.datePicker600(context).copyWith(
        color: baseColor,
-        letterSpacing: 0.5,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleButtonPositive: GoogleFonts.inter(
+      textStyleButtonPositive: STextStyles.datePicker600(context).copyWith(
        color: baseColor,
-        letterSpacing: 0.5,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleCurrentDayOnCalendar: GoogleFonts.inter(
-        fontSize: 12,
-        fontWeight: FontWeight.w400,
-        letterSpacing: 0.5,
-        color: Theme.of(context).extension<StackColors>()!.accentColorDark,
-      ),
-      textStyleDayHeader: GoogleFonts.inter(
-        letterSpacing: 0.5,
-        color: Theme.of(context).extension<StackColors>()!.accentColorDark,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
-      ),
-      textStyleDayOnCalendar: GoogleFonts.inter(
+      textStyleCurrentDayOnCalendar: STextStyles.datePicker400(context),
+      textStyleDayHeader: STextStyles.datePicker600(context),
+      textStyleDayOnCalendar: STextStyles.datePicker400(context).copyWith(
        color: baseColor,
-        fontSize: 12,
-        fontWeight: FontWeight.w400,
-        letterSpacing: 0.5,
      ),
-      textStyleDayOnCalendarDisabled: GoogleFonts.inter(
-        fontSize: 12,
-        fontWeight: FontWeight.w400,
-        letterSpacing: 0.5,
+      textStyleDayOnCalendarDisabled:
+          STextStyles.datePicker400(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textSubtitle3,
      ),
-      textStyleDayOnCalendarSelected: GoogleFonts.inter(
-        fontSize: 12,
-        fontWeight: FontWeight.w400,
-        letterSpacing: 0.5,
+      textStyleDayOnCalendarSelected:
+          STextStyles.datePicker400(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.popupBG,
      ),
-      textStyleMonthYearHeader: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleMonthYearHeader: STextStyles.datePicker600(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textSubtitle1,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleYearButton: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleYearButton: STextStyles.datePicker600(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textWhite,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
      textStyleButtonAction: GoogleFonts.inter(),
    );
@ -140,16 +111,10 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {

  MaterialRoundedYearPickerStyle _buildYearPickerStyle() {
    return MaterialRoundedYearPickerStyle(
-      textStyleYear: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleYear: STextStyles.datePicker600(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textSubtitle2,
-        fontWeight: FontWeight.w600,
-        fontSize: 16,
      ),
-      textStyleYearSelected: GoogleFonts.inter(
-        letterSpacing: 0.5,
-        color: Theme.of(context).extension<StackColors>()!.accentColorDark,
-        fontWeight: FontWeight.w600,
+      textStyleYearSelected: STextStyles.datePicker600(context).copyWith(
        fontSize: 18,
      ),
    );
--- a/lib/pages/exchange_view/sub_widgets/step_indicator.dart
+++ b/lib/pages/exchange_view/sub_widgets/step_indicator.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';

 enum StepIndicatorStatus { current, completed, incomplete }
@ -39,9 +39,7 @@ class StepIndicator extends StatelessWidget {
      case StepIndicatorStatus.current:
        return Text(
          step.toString(),
-          style: GoogleFonts.roboto(
-            fontWeight: FontWeight.w600,
-            fontSize: 8,
+          style: STextStyles.stepIndicator(context).copyWith(
            color: Theme.of(context)
                .extension<StackColors>()!
                .stepIndicatorIconNumber,
@ -57,9 +55,7 @@ class StepIndicator extends StatelessWidget {
      case StepIndicatorStatus.incomplete:
        return Text(
          step.toString(),
-          style: GoogleFonts.roboto(
-            fontWeight: FontWeight.w600,
-            fontSize: 8,
+          style: STextStyles.stepIndicator(context).copyWith(
            color: Theme.of(context)
                .extension<StackColors>()!
                .stepIndicatorIconInactive,
--- a/lib/pages/pinpad_views/create_pin_view.dart
+++ b/lib/pages/pinpad_views/create_pin_view.dart
@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:stackwallet/notifications/show_flush_bar.dart';
 import 'package:stackwallet/pages/home_view/home_view.dart';
 import 'package:stackwallet/providers/global/prefs_provider.dart';
@ -188,7 +187,10 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
                  fieldsCount: Constants.pinLength,
                  eachFieldHeight: 12,
                  eachFieldWidth: 12,
-                  textStyle: GoogleFonts.workSans(
+                  textStyle: STextStyles.infoSmall(context).copyWith(
+                    color: Theme.of(context)
+                        .extension<StackColors>()!
+                        .textSubtitle3,
                    fontSize: 1,
                  ),
                  focusNode: _pinPutFocusNode2,
--- a/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
+++ b/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:stackwallet/notifications/show_flush_bar.dart';
 import 'package:stackwallet/pages/settings_views/global_settings_view/security_views/security_view.dart';
 import 'package:stackwallet/utilities/assets.dart';
@ -168,7 +167,10 @@ class _ChangePinViewState extends State<ChangePinView> {
                  fieldsCount: Constants.pinLength,
                  eachFieldHeight: 12,
                  eachFieldWidth: 12,
-                  textStyle: GoogleFonts.workSans(
+                  textStyle: STextStyles.infoSmall(context).copyWith(
+                    color: Theme.of(context)
+                        .extension<StackColors>()!
+                        .textSubtitle3,
                    fontSize: 1,
                  ),
                  focusNode: _pinPutFocusNode2,
--- a/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
+++ b/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
@ -4,7 +4,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_rounded_date_picker/flutter_rounded_date_picker.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:stackwallet/models/transaction_filter.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/providers/ui/color_theme_provider.dart';
@ -122,77 +121,43 @@ class _TransactionSearchViewState
      colorArrowNext: Theme.of(context).extension<StackColors>()!.textSubtitle1,
      colorArrowPrevious:
          Theme.of(context).extension<StackColors>()!.textSubtitle1,
-      textStyleButtonNegative: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleButtonNegative: STextStyles.datePicker600(context).copyWith(
        color: baseColor,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleButtonPositive: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleButtonPositive: STextStyles.datePicker600(context).copyWith(
        color: baseColor,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleCurrentDayOnCalendar: GoogleFonts.inter(
-        letterSpacing: 0.5,
-        color: Theme.of(context).extension<StackColors>()!.accentColorDark,
-        fontWeight: FontWeight.w400,
-        fontSize: 12,
-      ),
-      textStyleDayHeader: GoogleFonts.inter(
-        letterSpacing: 0.5,
-        color: Theme.of(context).extension<StackColors>()!.accentColorDark,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
-      ),
-      textStyleDayOnCalendar: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleCurrentDayOnCalendar: STextStyles.datePicker400(context),
+      textStyleDayHeader: STextStyles.datePicker600(context),
+      textStyleDayOnCalendar: STextStyles.datePicker400(context).copyWith(
        color: baseColor,
-        fontSize: 12,
-        fontWeight: FontWeight.w400,
      ),
-      textStyleDayOnCalendarDisabled: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleDayOnCalendarDisabled:
+          STextStyles.datePicker400(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textSubtitle3,
-        fontWeight: FontWeight.w400,
-        fontSize: 12,
      ),
-      textStyleDayOnCalendarSelected: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleDayOnCalendarSelected:
+          STextStyles.datePicker400(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textWhite,
-        fontWeight: FontWeight.w400,
-        fontSize: 12,
      ),
-      textStyleMonthYearHeader: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleMonthYearHeader: STextStyles.datePicker600(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textSubtitle1,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleYearButton: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleYearButton: STextStyles.datePicker600(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textWhite,
-        fontSize: 16,
-        fontWeight: FontWeight.w600,
      ),
-      textStyleButtonAction: GoogleFonts.inter(),
+      // textStyleButtonAction: GoogleFonts.inter(),
    );
  }

  MaterialRoundedYearPickerStyle _buildYearPickerStyle() {
    return MaterialRoundedYearPickerStyle(
      backgroundPicker: Theme.of(context).extension<StackColors>()!.popupBG,
-      textStyleYear: GoogleFonts.inter(
-        letterSpacing: 0.5,
+      textStyleYear: STextStyles.datePicker600(context).copyWith(
        color: Theme.of(context).extension<StackColors>()!.textSubtitle2,
-        fontWeight: FontWeight.w600,
        fontSize: 16,
      ),
-      textStyleYearSelected: GoogleFonts.inter(
-        letterSpacing: 0.5,
-        color: Theme.of(context).extension<StackColors>()!.accentColorDark,
-        fontWeight: FontWeight.w600,
+      textStyleYearSelected: STextStyles.datePicker600(context).copyWith(
        fontSize: 18,
      ),
    );
--- a/lib/utilities/text_styles.dart
+++ b/lib/utilities/text_styles.dart
--- a/lib/widgets/custom_pin_put/pin_keyboard.dart
+++ b/lib/widgets/custom_pin_put/pin_keyboard.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';

 class NumberKey extends StatefulWidget {
@ -72,12 +72,7 @@ class _NumberKeyState extends State<NumberKey> {
        child: Center(
          child: Text(
            number,
-            style: GoogleFonts.roboto(
-              color:
-                  Theme.of(context).extension<StackColors>()!.numberTextDefault,
-              fontWeight: FontWeight.w400,
-              fontSize: 26,
-            ),
+            style: STextStyles.numberDefault(context),
          ),
        ),
      ),