UI updates

lib/cake_pay/src/cards/cake_pay_buy_card_page.dart

@@ -39,9 +39,8 @@ import 'package:keyboard_actions/keyboard_actions.dart';
 import 'package:mobx/mobx.dart';
 
 class CakePayBuyCardPage extends BasePage {
-  CakePayBuyCardPage(
-    this.cakePayBuyCardViewModel
-  )   : _sendViewModel = cakePayBuyCardViewModel.sendViewModel,
+  CakePayBuyCardPage(this.cakePayBuyCardViewModel)
+      : _sendViewModel = cakePayBuyCardViewModel.sendViewModel,
         _amountFieldFocus = FocusNode(),
         _amountController = TextEditingController(),
         _quantityFieldFocus = FocusNode(),
@@ -303,7 +302,8 @@ class CakePayBuyCardPage extends BasePage {
                   methods.length <= 1 || selected == null
                       ? const SizedBox.shrink()
                       : _buildPaymentMethodWidget(methods, selected),
-                  if (_sendViewModel.walletType == WalletType.litecoin && _sendViewModel.isMwebEnabled)
+                  if (_sendViewModel.walletType == WalletType.litecoin &&
+                      _sendViewModel.isMwebEnabled)
                     Observer(
                       builder: (_) => Padding(
                         padding: EdgeInsets.only(top: 10, bottom: 0, right: 20, left: 20),
@@ -323,8 +323,7 @@ class CakePayBuyCardPage extends BasePage {
                                   captionColor: Theme.of(context).colorScheme.onSurfaceVariant,
                                   borderColor: Theme.of(context).colorScheme.primary,
                                   iconColor: Theme.of(context).colorScheme.primary,
-                                  value:
-                                  _sendViewModel.coinTypeToSpendFrom == UnspentCoinType.any,
+                                  value: _sendViewModel.coinTypeToSpendFrom == UnspentCoinType.any,
                                   onChanged: (bool? value) {
                                     _sendViewModel.setAllowMwebCoins(value ?? false);
                                   },
@@ -351,9 +350,8 @@ class CakePayBuyCardPage extends BasePage {
                         text: '(Dev) Simulate Purchasing Gift Card',
                         isDisabled: !cakePayBuyCardViewModel.isAmountSufficient ||
                             cakePayBuyCardViewModel.isPurchasing,
-                        isLoading:
-                        _sendViewModel.state is IsExecutingState ||
-                                cakePayBuyCardViewModel.isPurchasing,
+                        isLoading: _sendViewModel.state is IsExecutingState ||
+                            cakePayBuyCardViewModel.isPurchasing,
                         color: Theme.of(context).colorScheme.primary,
                         textColor: Theme.of(context).colorScheme.onPrimary,
                       ),
@@ -600,7 +598,7 @@ class CakePayBuyCardPage extends BasePage {
                         profileName: order?.cards.first.cardName ?? 'Cake Pay',
                         profileImageUrl: order?.cards.first.cardImagePath ?? '',
                       ),
-                  fiatAmount: '${order?.totalReceiveAmount}',
+                      fiatAmount: '${order?.totalReceiveAmount}',
                     ))
                 .toList();
 
@@ -613,7 +611,6 @@ class CakePayBuyCardPage extends BasePage {
                 return ConfirmSendingBottomSheet(
                   key: ValueKey('cake_pay_buy_page_confirm_sending_dialog_key'),
                   titleText: S.of(bottomSheetContext).confirm_transaction,
-                  currentTheme: currentTheme,
                   cakePayBuyCardViewModel: cakePayBuyCardViewModel,
                   paymentId: S.of(bottomSheetContext).payment_id,
                   paymentIdValue: cakePayBuyCardViewModel.order?.orderId,
@@ -627,7 +624,7 @@ class CakePayBuyCardPage extends BasePage {
                   fiatAmountValue: _sendViewModel.pendingTransactionFiatAmountFormatted,
                   fee: S.of(bottomSheetContext).send_fee,
                   feeValue: _sendViewModel.pendingTransaction!.feeFormatted,
-                  feeFiatAmount:_sendViewModel.pendingTransactionFeeFiatAmountFormatted,
+                  feeFiatAmount: _sendViewModel.pendingTransactionFeeFiatAmountFormatted,
                   outputs: displayingOutputs,
                   footerType: FooterType.slideActionButton,
                   slideActionButtonText:
@@ -732,7 +729,6 @@ class CakePayBuyCardPage extends BasePage {
             context: context,
             isDismissible: false,
             builder: (BuildContext bottomSheetContext) => InfoBottomSheet(
-              currentTheme: currentTheme,
               footerType: FooterType.singleActionButton,
               titleText: S.of(bottomSheetContext).proceed_on_device,
               contentImage: 'assets/images/hardware_wallet/ledger_nano_x.png',

lib/cake_pay/src/cards/cake_pay_cards_page.dart

@@ -10,13 +10,10 @@ import 'package:cake_wallet/cake_pay/src/widgets/card_item.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/filter_widget.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/cake_pay_card_info_bottom_sheet_widget.dart';
-import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/src/widgets/tab_view_wrapper_widget.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
 import 'package:cake_wallet/typography.dart';
-import 'package:cake_wallet/utils/debounce.dart';
 import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -94,23 +91,18 @@ class CakePayCardsPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    return CakePayCardsPageBody(
-        cardsListViewModel: _cardsListViewModel,
-        currentTheme: currentTheme,
-        titleColor: titleColor);
+    return CakePayCardsPageBody(cardsListViewModel: _cardsListViewModel, titleColor: titleColor);
   }
 }
 
 class CakePayCardsPageBody extends StatefulWidget {
   const CakePayCardsPageBody({
     super.key,
     required CakePayCardsListViewModel cardsListViewModel,
-    required this.currentTheme,
     required this.titleColor,
   }) : _cardsListViewModel = cardsListViewModel;
 
   final CakePayCardsListViewModel _cardsListViewModel;
-  final MaterialThemeBase currentTheme;
   final Color? Function(BuildContext) titleColor;
 
   @override
@@ -188,8 +180,8 @@ class _CakePayCardsPageBodyState extends State<CakePayCardsPageBody> {
                   ],
                   views: [
                     _MyCardsTab(
-                        cardsListViewModel: widget._cardsListViewModel,
-                        currentTheme: widget.currentTheme),
+                      cardsListViewModel: widget._cardsListViewModel,
+                    ),
                     _ShopTab(cardsListViewModel: widget._cardsListViewModel)
                   ]),
             )
@@ -258,10 +250,9 @@ class _TrailingIcon extends StatelessWidget {
 }
 
 class _MyCardsTab extends StatefulWidget {
-  const _MyCardsTab({required this.cardsListViewModel, required this.currentTheme});
+  const _MyCardsTab({required this.cardsListViewModel});
 
   final CakePayCardsListViewModel cardsListViewModel;
-  final MaterialThemeBase currentTheme;
 
   @override
   State<_MyCardsTab> createState() => _MyCardsTabState();
@@ -322,18 +313,20 @@ class _MyCardsTabState extends State<_MyCardsTab> {
                         logoUrl: card.cardImageUrl,
                         title: card.name,
                         subTitle: '\$100',
-                        onTap: () => _showCardInfoBottomSheet(context, card, widget.currentTheme),
+                        onTap: () => _showCardInfoBottomSheet(context, card),
                       );
                     },
                   ),
                 ],
               );
-              return showThumb ? Scrollbar(
-                key: ValueKey('cake_pay_my_cards_tab_scrollbar_key'),
-                thumbVisibility: true,
-                trackVisibility: true,
-                child: userCardsList,
-              ) : userCardsList;
+              return showThumb
+                  ? Scrollbar(
+                      key: ValueKey('cake_pay_my_cards_tab_scrollbar_key'),
+                      thumbVisibility: true,
+                      trackVisibility: true,
+                      child: userCardsList,
+                    )
+                  : userCardsList;
             }),
           ),
         ],
@@ -342,8 +335,7 @@ class _MyCardsTabState extends State<_MyCardsTab> {
   }
 }
 
-Future<void> _showCardInfoBottomSheet(
-    BuildContext context, CakePayCard card, MaterialThemeBase currentTheme) async {
+Future<void> _showCardInfoBottomSheet(BuildContext context, CakePayCard card) async {
   bool isReloadable = false; // TODO: replace with real logic
   if (card.name.toLowerCase().contains('prepaid')) {
     isReloadable = true;
@@ -360,7 +352,6 @@ Future<void> _showCardInfoBottomSheet(
               titleText: 'Reloadable Card',
               balance: '100 USD',
               howToUse: card.howToUse,
-              currentTheme: currentTheme,
               footerType: FooterType.doubleActionButton,
               applyBoxShadow: true,
               contentImage: card.cardImageUrl,
@@ -376,7 +367,6 @@ Future<void> _showCardInfoBottomSheet(
               titleText: card.name,
               balance: '500 USD',
               howToUse: card.howToUse,
-              currentTheme: currentTheme,
               footerType: FooterType.singleActionButton,
               applyBoxShadow: true,
               contentImage: card.cardImageUrl,
@@ -400,7 +390,6 @@ class _ShopTab extends StatefulWidget {
 class _ShopTabState extends State<_ShopTab> {
   late final ScrollController _scroll;
 
-
   @override
   void initState() {
     super.initState();
@@ -466,8 +455,7 @@ class _ShopTabState extends State<_ShopTab> {
               return const _Loading();
             }
 
-            if (vendors.isEmpty)
-              return Center(child: Text(S.of(context).no_cards_found));
+            if (vendors.isEmpty) return Center(child: Text(S.of(context).no_cards_found));
 
             final loadingMore = viewModel.isLoadingNextPage;
             final showThumb = vendors.length > 3;

lib/di.dart

@@ -1169,15 +1169,13 @@ Future<void> setup({
   getIt.registerFactoryParam<SwapConfirmationBottomSheet, PaymentFlowResult, void>(
     (paymentFlowResult, _) => SwapConfirmationBottomSheet(
       paymentFlowResult: paymentFlowResult,
-      currentTheme: getIt.get<AppStore>().themeStore.currentTheme,
       exchangeViewModel: getIt.get<ExchangeViewModel>(),
       authService: getIt.get<AuthService>(),
     ),
   );
 
   getIt.registerFactory<SwapDetailsBottomSheet>(
     () => SwapDetailsBottomSheet(
-      currentTheme: getIt.get<AppStore>().themeStore.currentTheme,
       exchangeTradeViewModel: getIt.get<ExchangeTradeViewModel>(),
     ),
   );

lib/entities/preferences_key.dart

@@ -37,6 +37,9 @@ class PreferencesKey {
   static const exchangeStatusKey = 'exchange_status';
   static const currentTheme = 'current_theme';
   static const themeMode = 'theme_mode';
+  static const blackThemeOled = 'black_theme_oled_enabled';
+  static const savedDarkTheme = 'saved_dark_theme';
+  static const savedLightTheme = 'saved_light_theme';
   static const displayActionListModeKey = 'display_list_mode';
   static const currentPinLength = 'current_pin_length';
   static const currentLanguageCode = 'language_code';

lib/nostr/nostr_api.dart

@@ -29,7 +29,10 @@ class NostrProfileHandler {
   }
 
   static Future<UserMetadata?> processRelays(
-      BuildContext context, ProfilePointer profile, String nip05Address) async {
+    BuildContext context,
+    ProfilePointer profile,
+    String nip05Address,
+  ) async {
     String userDomain = _extractDomain(nip05Address);
     const int metaData = 0;
 
@@ -45,7 +48,8 @@ class NostrProfileHandler {
     }
     await _showErrorDialog(context, S.of(context).no_relays, S.of(context).no_relay_on_domain);
 
-    String? chosenRelayUrl = await _showRelayChoiceDialog(context, profile.relays ?? []);
+    String? chosenRelayUrl =
+        await _showRelayChoiceDialog(context, profile.relays ?? []);
     if (chosenRelayUrl != null) {
       final userData = await _fetchInfoFromRelay(chosenRelayUrl, profile.pubkey, [metaData]);
       if (userData != null) {
@@ -121,7 +125,10 @@ class NostrProfileHandler {
     }
   }
 
-  static Future<String?> _showRelayChoiceDialog(BuildContext context, List<String> relays) async {
+  static Future<String?> _showRelayChoiceDialog(
+    BuildContext context,
+    List<String> relays,
+  ) async {
     String? selectedRelay;
 
     if (context.mounted) {

lib/src/screens/base_page.dart

@@ -72,7 +72,7 @@ abstract class BasePage extends StatelessWidget {
 
   Widget backButton(BuildContext context) => Icon(
         Icons.arrow_back_ios,
-        color: pageIconColor(context),
+        color: Theme.of(context).colorScheme.primary,
         size: 16,
       );
 

lib/src/screens/buy/buy_sell_page.dart

@@ -78,11 +78,10 @@ class BuySellPage extends BasePage {
   Widget? leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).colorScheme.onSurface,
+      color: Theme.of(context).colorScheme.primary,
       size: 16,
     );
-    final _closeButton =
-        buySellViewModel.isDarkTheme ? closeButtonImageDarkTheme : closeButtonImage;
+    final _closeButton = currentTheme.isDark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
 
@@ -211,7 +210,7 @@ class BuySellPage extends BasePage {
           borderRadius: 30,
           padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8),
           leadingIcon: Icons.arrow_forward_ios,
-          isDarkTheme: buySellViewModel.isDarkTheme);
+          isDarkTheme: currentTheme.isDark);
     }
     if (buySellViewModel.paymentMethodState is PaymentMethodFailed) {
       return OptionTilePlaceholder(errorText: 'No payment methods available', borderRadius: 30);
@@ -225,7 +224,7 @@ class BuySellPage extends BasePage {
         title: selectedPaymentMethod.title,
         onPressed: () => _pickPaymentMethod(context),
         leadingIcon: Icons.arrow_forward_ios,
-        isLightMode: !buySellViewModel.isDarkTheme,
+        isLightMode: !currentTheme.isDark,
         borderRadius: 30,
         padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8),
         titleTextStyle: Theme.of(context).textTheme.titleMedium?.copyWith(
@@ -321,8 +320,8 @@ class BuySellPage extends BasePage {
     _cryptoAddressFocus.addListener(() async {
       if (!_cryptoAddressFocus.hasFocus && cryptoAddressController.text.isNotEmpty) {
         final domain = cryptoAddressController.text;
-        buySellViewModel.cryptoCurrencyAddress =
-            await fetchParsedAddress(context, domain, buySellViewModel.cryptoCurrency);
+        buySellViewModel.cryptoCurrencyAddress = await fetchParsedAddress(
+            context, domain, buySellViewModel.cryptoCurrency);
       }
     });
 
@@ -404,7 +403,7 @@ class BuySellPage extends BasePage {
         onCurrencySelected: (currency) => buySellViewModel.changeFiatCurrency(currency: currency),
         imageArrow: Image.asset(
           'assets/images/arrow_bottom_purple_icon.png',
-          color: Theme.of(context).colorScheme.onSurface,
+          color: Theme.of(context).colorScheme.primary,
           height: 8,
         ),
         currencyButtonColor: Colors.transparent,
@@ -441,7 +440,7 @@ class BuySellPage extends BasePage {
         onCurrencySelected: (currency) => buySellViewModel.changeCryptoCurrency(currency: currency),
         imageArrow: Image.asset(
           'assets/images/arrow_bottom_cake_green.png',
-          color: Theme.of(context).colorScheme.onSurface,
+          color: Theme.of(context).colorScheme.primary,
           height: 8,
         ),
         currencyButtonColor: Colors.transparent,
@@ -508,8 +507,12 @@ class BuySellPage extends BasePage {
   }
 
   Future<String> fetchParsedAddress(
-      BuildContext context, String domain, CryptoCurrency currency) async {
-    final parsedAddress = await getIt.get<AddressResolver>().resolve(context, domain, currency);
+    BuildContext context,
+    String domain,
+    CryptoCurrency currency,
+  ) async {
+    final parsedAddress =
+        await getIt.get<AddressResolver>().resolve(context, domain, currency);
     final address = await extractAddressFromParsed(context, parsedAddress);
     return address;
   }