refactor: accentTextTheme.bodyLarge.backgroundColor -> KeyboardTheme.keyboardBarColor

2025-02-04 04:06:34 +00:00 · 2023-07-03 13:29:44 -03:00 · 2023-07-03 13:29:44 -03:00 · 2ef03ceda9
commit 2ef03ceda9
parent 7d55092704
18 changed files with 71 additions and 65 deletions
--- a/lib/src/screens/buy/pre_order_page.dart
+++ b/lib/src/screens/buy/pre_order_page.dart
@ -3,6 +3,7 @@ import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/src/screens/buy/widgets/buy_list_item.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
@ -80,10 +81,7 @@ class PreOrderPage extends BasePage {
    return KeyboardActions(
      config: KeyboardActionsConfig(
            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context)
-                .accentTextTheme!
-                .bodyLarge!
-                .backgroundColor!,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
            nextFocus: false,
            actions: [
              KeyboardActionsItem(
--- a/lib/src/screens/dashboard/widgets/address_page.dart
+++ b/lib/src/screens/dashboard/widgets/address_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/anonpay/anonpay_donation_link_info.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/entities/receive_page_option.dart';
@ -153,10 +154,7 @@ class AddressPage extends BasePage {
        tapOutsideToDismiss: true,
        config: KeyboardActionsConfig(
            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context)
-                .accentTextTheme!
-                .bodyLarge!
-                .backgroundColor!,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
            nextFocus: false,
            actions: [
              KeyboardActionsItem(
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/desktop_exchange_cards_section.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_section.dart';
@ -151,7 +152,7 @@ class ExchangePage extends BasePage {
        config: KeyboardActionsConfig(
            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
            keyboardBarColor:
-                Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!,
+                Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
            nextFocus: false,
            actions: [
              KeyboardActionsItem(
--- a/lib/src/screens/exchange/exchange_template_page.dart
+++ b/lib/src/screens/exchange/exchange_template_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/exchange/exchange_provider.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
@ -73,10 +74,7 @@ class ExchangeTemplatePage extends BasePage {
        disableScroll: true,
        config: KeyboardActionsConfig(
            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context)
-                .accentTextTheme!
-                .bodyLarge!
-                .backgroundColor!,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
            nextFocus: false,
            actions: [
              KeyboardActionsItem(
@ -444,4 +442,4 @@ class ExchangeTemplatePage extends BasePage {
      key.currentState!.addressController.text = '';
    }
  }
-}
+}
--- a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
+++ b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
@ -65,10 +66,7 @@ class IoniaVerifyIoniaOtp extends BasePage {
    return KeyboardActions(
      config: KeyboardActionsConfig(
          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context)
-              .accentTextTheme!
-              .bodyLarge!
-              .backgroundColor!,
+          keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
          nextFocus: false,
          actions: [
            KeyboardActionsItem(
--- a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@ -50,10 +51,7 @@ class IoniaBuyGiftCardPage extends BasePage {
      disableScroll: true,
      config: KeyboardActionsConfig(
          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context)
-              .accentTextTheme!
-              .bodyLarge!
-              .backgroundColor!,
+          keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
          nextFocus: false,
          actions: [
            KeyboardActionsItem(
--- a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@ -50,10 +51,7 @@ class IoniaCustomRedeemPage extends BasePage {
      disableScroll: true,
      config: KeyboardActionsConfig(
          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context)
-              .accentTextTheme!
-              .bodyLarge!
-              .backgroundColor!,
+          keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
          nextFocus: false,
          actions: [
            KeyboardActionsItem(
--- a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/ionia/ionia_merchant.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@ -51,10 +52,7 @@ class IoniaCustomTipPage extends BasePage {
      disableScroll: true,
      config: KeyboardActionsConfig(
          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context)
-              .accentTextTheme!
-              .bodyLarge!
-              .backgroundColor!,
+          keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
          nextFocus: false,
          actions: [
            KeyboardActionsItem(
--- a/lib/src/screens/receive/anonpay_invoice_page.dart
+++ b/lib/src/screens/receive/anonpay_invoice_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/anonpay/anonpay_donation_link_info.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/di.dart';
@ -85,10 +86,7 @@ class AnonPayInvoicePage extends BasePage {
        disableScroll: true,
        config: KeyboardActionsConfig(
            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context)
-              .accentTextTheme!
-              .bodyLarge!
-              .backgroundColor!,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
          nextFocus: false,
          actions: [
            KeyboardActionsItem(
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
@ -104,10 +105,7 @@ class ReceivePage extends BasePage {
        ? KeyboardActions(
            config: KeyboardActionsConfig(
                keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-                keyboardBarColor: Theme.of(context)
-                    .accentTextTheme!
-                    .bodyLarge!
-                    .backgroundColor!,
+                keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
                nextFocus: false,
                actions: [
                  KeyboardActionsItem(
--- a/lib/src/screens/restore/wallet_restore_page.dart
+++ b/lib/src/screens/restore/wallet_restore_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@ -139,10 +140,7 @@ class WalletRestorePage extends BasePage {
    return KeyboardActions(
      config: KeyboardActionsConfig(
        keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-        keyboardBarColor: Theme.of(context)
-            .accentTextTheme!
-            .bodyLarge!
-            .backgroundColor!,
+        keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
        nextFocus: false,
        actions: [
          KeyboardActionsItem(
--- a/lib/src/screens/send/send_template_page.dart
+++ b/lib/src/screens/send/send_template_page.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
@ -50,10 +51,7 @@ class SendTemplatePage extends BasePage {
    return KeyboardActions(
        config: KeyboardActionsConfig(
            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context)
-                .accentTextTheme!
-                .bodyLarge!
-                .backgroundColor!,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
            nextFocus: false,
            actions: [
              KeyboardActionsItem(
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
@ -102,10 +103,7 @@ class SendCardState extends State<SendCard>
        KeyboardActions(
            config: KeyboardActionsConfig(
                keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-                keyboardBarColor: Theme.of(context)
-                    .accentTextTheme!
-                    .bodyLarge!
-                    .backgroundColor!,
+                keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
                nextFocus: false,
                actions: [
                  KeyboardActionsItem(
@ -676,4 +674,4 @@ class SendCardState extends State<SendCard>

  @override
  bool get wantKeepAlive => true;
-}
+}
--- a/lib/themes/bright_theme.dart
+++ b/lib/themes/bright_theme.dart
@ -239,8 +239,5 @@ class BrightTheme extends LightTheme {
          bodyMedium: TextStyle(
            color: Palette.darkGray, // indicators (PIN code)
            decorationColor: Palette.darkGray, // switch (PIN code)
-          ),
-          // body2 -> bodyLarge
-          bodyLarge: TextStyle(backgroundColor: Palette.dullGray // keyboard bar color
-              )));
+          )));
 }
--- a/lib/themes/dark_theme.dart
+++ b/lib/themes/dark_theme.dart
@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@ -36,6 +37,10 @@ class DarkTheme extends ThemeBase {
      notSyncedIconColor: PaletteDark.orangeYellow,
      notSyncedBackgroundColor: PaletteDark.oceanBlue);

+  @override
+  KeyboardTheme get keyboardTheme =>
+      KeyboardTheme(keyboardBarColor: PaletteDark.granite);
+
  @override
  ThemeData get themeData => super.themeData.copyWith(
      indicatorColor: PaletteDark.cyanBlue, // page indicator
@ -254,10 +259,6 @@ class DarkTheme extends ThemeBase {
            color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)
            decorationColor: PaletteDark.lightPurpleBlue, // switch (PIN code)
            ),
-        // body2 -> bodyLarge
-        bodyLarge: TextStyle(
-            backgroundColor: PaletteDark.granite // keyboard bar color
-        ),
      ),
      );
 }
--- a/lib/themes/extensions/keyboard_theme.dart
+++ b/lib/themes/extensions/keyboard_theme.dart
@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+class KeyboardTheme extends ThemeExtension<KeyboardTheme> {
+  final Color keyboardBarColor;
+
+  KeyboardTheme({required this.keyboardBarColor});
+
+  @override
+  Object get type => KeyboardTheme;
+
+  @override
+  KeyboardTheme copyWith({Color? keyboardBarColor}) => KeyboardTheme(
+      keyboardBarColor: keyboardBarColor ?? this.keyboardBarColor);
+
+  @override
+  KeyboardTheme lerp(ThemeExtension<KeyboardTheme>? other, double t) {
+    if (other is! KeyboardTheme) {
+      return this;
+    }
+
+    return KeyboardTheme(
+        keyboardBarColor:
+            Color.lerp(keyboardBarColor, other.keyboardBarColor, t) ??
+                keyboardBarColor);
+  }
+}
--- a/lib/themes/light_theme.dart
+++ b/lib/themes/light_theme.dart
@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@ -37,6 +38,10 @@ class LightTheme extends ThemeBase {
      notSyncedIconColor: Palette.shineOrange,
      notSyncedBackgroundColor: Palette.blueAlice.withOpacity(0.75));

+  @override
+  KeyboardTheme get keyboardTheme =>
+      KeyboardTheme(keyboardBarColor: Palette.dullGray);
+
  @override
  ThemeData get themeData => super.themeData.copyWith(
      indicatorColor:
@ -250,10 +255,6 @@ class LightTheme extends ThemeBase {
            color: Palette.darkGray, // indicators (PIN code)
            decorationColor: Palette.darkGray, // switch (PIN code)
            ),
-        // body2 -> bodyLarge
-        bodyLarge: TextStyle(
-            backgroundColor: Palette.dullGray // keyboard bar color
-        ),
      ),
      );
 }
--- a/lib/themes/theme_base.dart
+++ b/lib/themes/theme_base.dart
@ -1,5 +1,6 @@
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_gradient_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';

@ -42,6 +43,8 @@ abstract class ThemeBase {

  SyncIndicatorTheme get syncIndicatorStyle;

+  KeyboardTheme get keyboardTheme;
+
  ThemeData get themeData => generatedThemeData.copyWith(
      primaryColor: primaryColor,
      cardColor: containerColor,
@ -49,7 +52,8 @@ abstract class ThemeBase {
      extensions: [
        pageGradientTheme,
        scrollbarTheme,
-        syncIndicatorStyle
+        syncIndicatorStyle,
+        keyboardTheme,
      ],
      scrollbarTheme: ScrollbarThemeData(
          thumbColor: MaterialStateProperty.all(scrollbarTheme.thumbColor),
@ -58,4 +62,4 @@ abstract class ThemeBase {
          thickness: MaterialStateProperty.all(6),
          thumbVisibility: MaterialStateProperty.all(true),
          crossAxisMargin: 6));
-}
+}