Merge pull request #1762 from SatoshiPortal/moar-theme-fixes

fix: theme + localization in exhcnage logout bottom sheet.

Author: i5hi

ios/Podfile.lock

@@ -57,8 +57,9 @@ PODS:
     - Flutter
   - flutter_nfc_kit (3.6.0):
     - Flutter
-  - flutter_secure_storage (6.0.0):
+  - flutter_secure_storage_darwin (10.0.0):
     - Flutter
+    - FlutterMacOS
   - flutter_zxing (0.0.1):
     - Flutter
   - google_sign_in_ios (0.0.1):
@@ -163,7 +164,7 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_nfc_kit (from `.symlinks/plugins/flutter_nfc_kit/ios`)
-  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - flutter_zxing (from `.symlinks/plugins/flutter_zxing/ios`)
   - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
@@ -218,8 +219,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_nfc_kit:
     :path: ".symlinks/plugins/flutter_nfc_kit/ios"
-  flutter_secure_storage:
-    :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  flutter_secure_storage_darwin:
+    :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin"
   flutter_zxing:
     :path: ".symlinks/plugins/flutter_zxing/ios"
   google_sign_in_ios:
@@ -271,7 +272,7 @@ SPEC CHECKSUMS:
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_nfc_kit: e1b71583eafd2c9650bc86844a7f2d185fb414f6
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   flutter_zxing: e8bcc43bd3056c70c271b732ed94e7a16fd62f93
   google_sign_in_ios: b48bb9af78576358a168361173155596c845f0b9
   GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4

lib/core/widgets/logout_confirmation_bottom_sheet.dart

@@ -1,4 +1,5 @@
 import 'package:bb_mobile/core/themes/app_theme.dart';
+import 'package:bb_mobile/core/utils/build_context_x.dart';
 import 'package:bb_mobile/core/widgets/bottom_sheet/x.dart';
 import 'package:bb_mobile/core/widgets/buttons/button.dart';
 import 'package:bb_mobile/core/widgets/text/text.dart';
@@ -43,15 +44,13 @@ class LogoutConfirmationBottomSheet extends StatelessWidget {
               Icon(Icons.logout, size: 48, color: context.appColors.primary),
               const SizedBox(height: 16),
               BBText(
-                'Confirm Logout',
-                style: context.font.headlineSmall?.copyWith(
-                  fontWeight: .bold,
-                ),
+                context.loc.logoutConfirmationTitle,
+                style: context.font.headlineSmall?.copyWith(fontWeight: .bold),
                 textAlign: .center,
               ),
               const SizedBox(height: 8),
               BBText(
-                'Are you sure you want to log out of your Bull Bitcoin account? You will need to log in again to access exchange features.',
+                context.loc.logoutConfirmationDescription,
                 style: context.font.bodyMedium?.copyWith(
                   color: context.appColors.secondary.withValues(alpha: 0.7),
                 ),
@@ -64,22 +63,24 @@ class LogoutConfirmationBottomSheet extends StatelessWidget {
                 children: [
                   Expanded(
                     child: BBButton.small(
-                      label: 'Cancel',
+                      label: context.loc.logoutConfirmationCancel,
                       onPressed: () => Navigator.of(context).pop(),
-                      bgColor: context.appColors.secondaryFixed,
+                      outlined: true,
+                      bgColor: Colors.transparent,
                       textColor: context.appColors.secondary,
+                      borderColor: context.appColors.outline,
                     ),
                   ),
                   const SizedBox(width: 12),
                   Expanded(
                     child: BBButton.small(
-                      label: 'Logout',
+                      label: context.loc.logoutConfirmationLogout,
                       onPressed: () async {
                         Navigator.of(context).pop();
                         await onConfirm();
                       },
-                      bgColor: context.appColors.text,
-                      textColor: context.appColors.onPrimary,
+                      bgColor: context.appColors.secondary,
+                      textColor: context.appColors.onSecondary,
                     ),
                   ),
                 ],

localization/app_de.arb

@@ -4130,5 +4130,9 @@
   "payAdvancedSettings": "Erweiterte Einstellungen",
   "transactionNoteUpdateButton": "Aktualisieren",
   "sellAdvancedSettings": "Erweiterte Einstellungen",
-  "importWatchOnlyCancel": "Abbrechen"
+  "importWatchOnlyCancel": "Abbrechen",
+  "logoutConfirmationTitle": "Abmeldung bestätigen",
+  "logoutConfirmationDescription": "Sind Sie sicher, dass Sie sich von Ihrem Bull Bitcoin-Konto abmelden möchten? Sie müssen sich erneut anmelden, um auf Exchange-Funktionen zuzugreifen.",
+  "logoutConfirmationCancel": "Abbrechen",
+  "logoutConfirmationLogout": "Abmelden"
 }

localization/app_en.arb

@@ -12246,5 +12246,21 @@
         "type": "String"
       }
     }
+  },
+  "logoutConfirmationTitle": "Confirm Logout",
+  "@logoutConfirmationTitle": {
+    "description": "Title for logout confirmation bottom sheet"
+  },
+  "logoutConfirmationDescription": "Are you sure you want to log out of your Bull Bitcoin account? You will need to log in again to access exchange features.",
+  "@logoutConfirmationDescription": {
+    "description": "Description text for logout confirmation bottom sheet"
+  },
+  "logoutConfirmationCancel": "Cancel",
+  "@logoutConfirmationCancel": {
+    "description": "Cancel button label for logout confirmation"
+  },
+  "logoutConfirmationLogout": "Logout",
+  "@logoutConfirmationLogout": {
+    "description": "Logout button label for logout confirmation"
   }
 }

localization/app_es.arb

@@ -4131,5 +4131,9 @@
     }
   },
   "bitcoinSettingsMempoolServerTitle": "Configuración del servidor Mempool",
-  "save": "Guardar"
+  "save": "Guardar",
+  "logoutConfirmationTitle": "Confirmar cierre de sesión",
+  "logoutConfirmationDescription": "¿Está seguro de que desea cerrar sesión en su cuenta de Bull Bitcoin? Necesitará iniciar sesión nuevamente para acceder a las funciones de intercambio.",
+  "logoutConfirmationCancel": "Cancelar",
+  "logoutConfirmationLogout": "Cerrar sesión"
 }

localization/app_fi.arb

@@ -4131,5 +4131,9 @@
   "bitcoinSettingsMempoolServerTitle": "Mempool-palvelimen asetukset",
   "autoswapTriggerAtBalanceInfoText": "Autoswap käynnistyy, kun saldo ylittää tämän summan.",
   "autoswapWarningCardTitle": "Autoswap on käytössä.",
-  "autoswapWarningCardSubtitle": "Swap käynnistyy, jos välittömien maksujen saldo ylittää 0,02 BTC."
+  "autoswapWarningCardSubtitle": "Swap käynnistyy, jos välittömien maksujen saldo ylittää 0,02 BTC.",
+  "logoutConfirmationTitle": "Vahvista uloskirjautuminen",
+  "logoutConfirmationDescription": "Oletko varma, että haluat kirjautua ulos Bull Bitcoin -tilistäsi? Sinun on kirjauduttava sisään uudelleen päästäksesi vaihto-ominaisuuksiin.",
+  "logoutConfirmationCancel": "Peruuta",
+  "logoutConfirmationLogout": "Kirjaudu ulos"
 }

localization/app_fr.arb

@@ -4132,5 +4132,9 @@
   },
   "bitcoinSettingsMempoolServerTitle": "Configurations serveur Mempool",
   "save": "Sauvegarder",
-  "recipientsSearchHint": "Rechercher des destinataires par nom ou étiquette"
+  "recipientsSearchHint": "Rechercher des destinataires par nom ou étiquette",
+  "logoutConfirmationTitle": "Confirmer la déconnexion",
+  "logoutConfirmationDescription": "Êtes-vous sûr de vouloir vous déconnecter de votre compte Bull Bitcoin? Vous devrez vous reconnecter pour accéder aux fonctionnalités d'échange.",
+  "logoutConfirmationCancel": "Annuler",
+  "logoutConfirmationLogout": "Déconnexion"
 }

localization/app_it.arb

@@ -4129,5 +4129,9 @@
   "ledgerSignTitle": "Transazione dei segni",
   "importWatchOnlyCancel": "Annulla",
   "arkAboutTitle": "Informazioni",
-  "exchangeSettingsSecuritySettingsTitle": "Impostazioni di sicurezza"
+  "exchangeSettingsSecuritySettingsTitle": "Impostazioni di sicurezza",
+  "logoutConfirmationTitle": "Conferma disconnessione",
+  "logoutConfirmationDescription": "Sei sicuro di voler disconnetterti dal tuo account Bull Bitcoin? Dovrai accedere nuovamente per accedere alle funzionalità di scambio.",
+  "logoutConfirmationCancel": "Annulla",
+  "logoutConfirmationLogout": "Disconnetti"
 }

localization/app_pt.arb

@@ -4097,5 +4097,9 @@
   "pinCodeLoading": "A carregar",
   "fundExchangeCrIbanUsdLabelRecipientName": "Nome do destinatário",
   "ledgerSignTitle": "Transação de Sinais",
-  "importWatchOnlyCancel": "Cancelar"
+  "importWatchOnlyCancel": "Cancelar",
+  "logoutConfirmationTitle": "Confirmar saída",
+  "logoutConfirmationDescription": "Tem certeza de que deseja sair da sua conta Bull Bitcoin? Você precisará fazer login novamente para acessar os recursos de câmbio.",
+  "logoutConfirmationCancel": "Cancelar",
+  "logoutConfirmationLogout": "Sair"
 }

localization/app_ru.arb

@@ -4126,5 +4126,9 @@
   "fundExchangeCrIbanUsdLabelRecipientName": "Имя получателя",
   "ledgerSignTitle": "Подписание",
   "importWatchOnlyCancel": "Отмена",
-  "arkAboutTitle": "О проекте"
+  "arkAboutTitle": "О проекте",
+  "logoutConfirmationTitle": "Подтвердить выход",
+  "logoutConfirmationDescription": "Вы уверены, что хотите выйти из своей учетной записи Bull Bitcoin? Вам нужно будет снова войти в систему, чтобы получить доступ к функциям обмена.",
+  "logoutConfirmationCancel": "Отмена",
+  "logoutConfirmationLogout": "Выйти"
 }