feature: always show current language (#348)

* feature: always show current languge * resolve mistakes --------- Co-authored-by: Sagar Raj <[email protected]>
CCExtractor · Jan 24, 2024 · 0307faa · 0307faa
1 parent 78be78a
commit 0307faa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/lib/app/data/providers/get_storage_provider.dart b/lib/app/data/providers/get_storage_provider.dart
@@ -11,6 +11,15 @@ class GetStorageProvider {
     return this;
   }
 
+  Future<String> readCurrentLanguage() async{
+    print(_getStorage.read('currentLanguageKey'));
+    return await _getStorage.read('currentLanguageKey');
+  }
+
+  Future<void> writeCurrentLanguage(String value) async{
+    await _getStorage.write('currentLanguageKey', value);
+  }
+
   Future<Locale> readLocale() async {
     final languageCode = _getStorage.read('languageCode');
 
@@ -25,7 +34,6 @@ class GetStorageProvider {
     await _getStorage.write('languageCode', lanCode);
     await _getStorage.write('countryCode', countryCode);
   }
-
 }
 
 
diff --git a/lib/app/modules/settings/controllers/settings_controller.dart b/lib/app/modules/settings/controllers/settings_controller.dart
@@ -24,6 +24,7 @@ class SettingsController extends GetxController {
   final _f24HrsEnabledKey = '24_hours_format';
   var isSortedAlarmListEnabled = true.obs;
   final _sortedAlarmListKey = 'sorted_alarm_list';
+  var currentLanguage = 'en_US'.obs;
   final _secureStorageProvider = SecureStorageProvider();
   final apiKey = TextEditingController();
   final currentPoint = LatLng(0, 0).obs;
@@ -219,6 +220,8 @@ class SettingsController extends GetxController {
     isSortedAlarmListEnabled.value = await _secureStorageProvider
         .readSortedAlarmListValue(key: _sortedAlarmListKey);
 
+    currentLanguage.value=await storage.readCurrentLanguage();
+
     // Store the retrieved API key from the flutter secure storage
     String? retrievedAPIKey = await getKey(ApiKeys.openWeatherMap);
 
@@ -284,6 +287,7 @@ class SettingsController extends GetxController {
     final String countryCode = optionslocales[key]['countryCode'];
     Get.updateLocale(Locale(languageCode, countryCode));
     local.value = Get.locale.toString();
+    storage.writeCurrentLanguage(local.value);
     storage.writeLocale(languageCode, countryCode);
   }
 }
diff --git a/lib/app/modules/settings/views/language_menu.dart b/lib/app/modules/settings/views/language_menu.dart
@@ -38,8 +38,9 @@ class _LanguageMenuState extends State<LanguageMenu> {
         padding: EdgeInsets.only(left: 30),
         child: Row(
           children: [
-            DropdownMenu(
-              menuStyle: MenuStyle(
+            Obx(
+              () => DropdownMenu(
+                menuStyle: MenuStyle(
                   backgroundColor: MaterialStatePropertyAll(
                     widget.themeController.isLightMode.value
                         ? kLightSecondaryBackgroundColor
@@ -48,13 +49,15 @@ class _LanguageMenuState extends State<LanguageMenu> {
                 ),
                 inputDecorationTheme:
                     InputDecorationTheme(enabledBorder: InputBorder.none),
-                trailingIcon: Icon(Icons.arrow_drop_down_outlined,
-                    size: 40.0,
-                    color: widget.themeController.isLightMode.value
-                        ? kLightPrimaryTextColor.withOpacity(0.8)
-                        : kprimaryTextColor.withOpacity(0.8)),
+                trailingIcon: Icon(
+                  Icons.arrow_drop_down_outlined,
+                  size: 40.0,
+                  color: widget.themeController.isLightMode.value
+                      ? kLightPrimaryTextColor.withOpacity(0.8)
+                      : kprimaryTextColor.withOpacity(0.8),
+                ),
                 width: widget.width * 0.78,
-                initialSelection: 'English',
+                initialSelection: widget.controller.currentLanguage.value,
                 label: const Text('Change Language'),
                 dropdownMenuEntries:
                     widget.controller.optionslocales.entries.map((e) {
@@ -73,6 +76,7 @@ class _LanguageMenuState extends State<LanguageMenu> {
                 onSelected: (newValue) {
                   widget.controller.updateLocale(newValue!);
                 },
+              ),
             ),
           ],
         ),