Merge pull request #1648 from wired-pasteque/improve-language-dropdown

refactor: remove stale code and replace language code by label in dropdown

Author: ethicnology

lib/core/settings/domain/settings_entity.dart

@@ -40,16 +40,16 @@ enum BitcoinUnit {
 }
 
 enum Language {
-  unitedStatesEnglish('en', 'US'),
-  canadianFrench('fr', 'CA'),
-  franceFrench('fr', 'FR'),
-  spanish('es', 'ES'),
-  finnish('fi', 'FI');
+  unitedStatesEnglish('en', 'US', 'English'),
+  franceFrench('fr', 'FR', 'Français'),
+  spanish('es', 'ES', 'Español'),
+  finnish('fi', 'FI', 'Suomeksi');
 
   final String languageCode;
   final String? countryCode;
+  final String label;
 
-  const Language(this.languageCode, this.countryCode);
+  const Language(this.languageCode, this.countryCode, this.label);
 
   static Language fromName(String name) {
     try {

lib/features/settings/presentation/bloc/settings_cubit.dart

@@ -97,7 +97,7 @@ class SettingsCubit extends Cubit<SettingsState> {
   Future<void> changeLanguage(Language language) async {
     final settings = state.storedSettings;
     log.config(
-      'Language changed to: ${language.name} was ${settings?.language?.name}',
+      'Language changed to: ${language.label} was ${settings?.language?.label}',
     );
     await _setLanguageUsecase.execute(language);
     emit(

lib/features/settings/ui/screens/app_settings/app_settings_screen.dart

@@ -66,17 +66,14 @@ class AppSettingsScreen extends StatelessWidget {
                     trailing: DropdownButton<Language>(
                       value: currentLanguage,
                       underline: const SizedBox.shrink(),
-                      items:
-                          Language.values
-                              .map(
-                                (language) => DropdownMenuItem<Language>(
-                                  value: language,
-                                  child: Text(
-                                    '${language.languageCode}${language.countryCode != null ? ' (${language.countryCode})' : ''}',
-                                  ),
-                                ),
-                              )
-                              .toList(),
+                      items: Language.values
+                          .map(
+                            (language) => DropdownMenuItem<Language>(
+                              value: language,
+                              child: Text(language.label),
+                            ),
+                          )
+                          .toList(),
                       onChanged: (Language? newLanguage) {
                         if (newLanguage != null) {
                           context.read<SettingsCubit>().changeLanguage(

lib/features/settings/ui/screens/language/language_settings_screen.dart

@@ -30,7 +30,6 @@ import 'package:bb_mobile/features/settings/ui/screens/exchange/recipients_scree
 import 'package:bb_mobile/features/settings/ui/screens/exchange/referrals_screen.dart';
 import 'package:bb_mobile/features/settings/ui/screens/exchange/security_screen.dart';
 import 'package:bb_mobile/features/settings/ui/screens/exchange/transactions_screen.dart';
-import 'package:bb_mobile/features/settings/ui/screens/language/language_settings_screen.dart';
 import 'package:bb_mobile/features/settings/ui/screens/theme/theme_settings_screen.dart';
 import 'package:bb_mobile/features/settings/ui/widgets/failed_wallet_deletion_alert_dialog.dart';
 import 'package:bb_mobile/features/status_check/presentation/cubit.dart';
@@ -82,11 +81,10 @@ class SettingsRouter {
   static final route = GoRoute(
     name: SettingsRoute.settings.name,
     path: SettingsRoute.settings.path,
-    builder:
-        (context, state) => BlocProvider(
-          create: (_) => locator<ServiceStatusCubit>()..checkStatus(),
-          child: const AllSettingsScreen(),
-        ),
+    builder: (context, state) => BlocProvider(
+      create: (_) => locator<ServiceStatusCubit>()..checkStatus(),
+      child: const AllSettingsScreen(),
+    ),
     routes: [
       GoRoute(
         name: SettingsRoute.exchangeAccount.name,
@@ -97,17 +95,15 @@ class SettingsRouter {
         name: SettingsRoute.exchangeSettings.name,
         path: SettingsRoute.exchangeSettings.path,
 
-        builder:
-            (context, state) => BlocListener<ExchangeCubit, ExchangeState>(
-              listenWhen:
-                  (previous, current) =>
-                      !previous.notLoggedIn && current.notLoggedIn,
-              listener: (context, state) {
-                // Redirect to landing page if the user logged out
-                context.goNamed(ExchangeRoute.exchangeLanding.name);
-              },
-              child: const ExchangeSettingsScreen(),
-            ),
+        builder: (context, state) => BlocListener<ExchangeCubit, ExchangeState>(
+          listenWhen: (previous, current) =>
+              !previous.notLoggedIn && current.notLoggedIn,
+          listener: (context, state) {
+            // Redirect to landing page if the user logged out
+            context.goNamed(ExchangeRoute.exchangeLanding.name);
+          },
+          child: const ExchangeSettingsScreen(),
+        ),
       ),
       GoRoute(
         name: SettingsRoute.exchangeAccountInfo.name,
@@ -176,11 +172,6 @@ class SettingsRouter {
         builder: (context, state) => const ThemeSettingsScreen(),
       ),
 
-      GoRoute(
-        name: SettingsRoute.language.name,
-        path: SettingsRoute.language.path,
-        builder: (context, state) => const LanguageSettingsScreen(),
-      ),
       GoRoute(
         path: SettingsRoute.pinCode.path,
         name: SettingsRoute.pinCode.name,
@@ -232,9 +223,8 @@ class SettingsRouter {
                     listener: (context, state) {
                       showDialog(
                         context: context,
-                        builder:
-                            (dialogContext) =>
-                                const FailedWalletDeletionAlertDialog(),
+                        builder: (dialogContext) =>
+                            const FailedWalletDeletionAlertDialog(),
                       );
                     },
                   ),
@@ -249,9 +239,8 @@ class SettingsRouter {
             builder: (context, state) {
               final walletId = state.pathParameters['walletId']!;
               return BlocProvider(
-                create:
-                    (_) =>
-                        locator<AddressViewBloc>(param1: walletId, param2: 10),
+                create: (_) =>
+                    locator<AddressViewBloc>(param1: walletId, param2: 10),
                 child: AddressesScreen(walletId: walletId),
               );
             },
@@ -266,20 +255,18 @@ class SettingsRouter {
       GoRoute(
         path: SettingsRoute.legacySeeds.path,
         name: SettingsRoute.legacySeeds.name,
-        builder:
-            (context, state) => BlocProvider(
-              create: (_) => locator<LegacySeedViewCubit>(),
-              child: const LegacySeedViewScreen(),
-            ),
+        builder: (context, state) => BlocProvider(
+          create: (_) => locator<LegacySeedViewCubit>(),
+          child: const LegacySeedViewScreen(),
+        ),
       ),
       GoRoute(
         path: SettingsRoute.allSeedView.path,
         name: SettingsRoute.allSeedView.name,
-        builder:
-            (context, state) => BlocProvider(
-              create: (_) => locator<AllSeedViewCubit>(),
-              child: const AllSeedViewScreen(),
-            ),
+        builder: (context, state) => BlocProvider(
+          create: (_) => locator<AllSeedViewCubit>(),
+          child: const AllSeedViewScreen(),
+        ),
       ),
       GoRoute(
         path: SettingsRoute.currency.path,