Merge pull request #108 from NobodyForNothing/FEAT-in-app-language-se…

…lection Added in-app language selection
derdilla · Jul 20, 2023 · 8f7e800 · 8f7e800
2 parents 2b02c7d + e993f68
commit 8f7e800
Show file tree

Hide file tree

Showing 8 changed files with 245 additions and 8 deletions.
diff --git a/lib/components/measurement_list.dart b/lib/components/measurement_list.dart
@@ -10,8 +10,8 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 class MeasurementList extends StatelessWidget {
-  late final _tableElementsSizes;
-  late final _sideFlex;
+  late final List<int> _tableElementsSizes;
+  late final int _sideFlex;
 
   MeasurementList(BuildContext context, {super.key}) {
     if (MediaQuery.of(context).size.width < 1000) {
@@ -37,7 +37,7 @@ class MeasurementList extends StatelessWidget {
                 ),
                 Expanded(
                     flex: _tableElementsSizes[0],
-                    child: Text(AppLocalizations.of(context)!.time, style: TextStyle(fontWeight: FontWeight.bold))),
+                    child: Text(AppLocalizations.of(context)!.time, style: const TextStyle(fontWeight: FontWeight.bold))),
                 Expanded(
                     flex: _tableElementsSizes[1],
                     child: Text(AppLocalizations.of(context)!.sysShort, style: TextStyle(fontWeight: FontWeight.bold, color: settings.sysColor))),
@@ -49,7 +49,7 @@ class MeasurementList extends StatelessWidget {
                     child: Text(AppLocalizations.of(context)!.pulShort, style: TextStyle(fontWeight: FontWeight.bold, color: settings.pulColor))),
                 Expanded(
                     flex: _tableElementsSizes[4],
-                    child: Text(AppLocalizations.of(context)!.notes, style: TextStyle(fontWeight: FontWeight.bold))),
+                    child: Text(AppLocalizations.of(context)!.notes, style: const TextStyle(fontWeight: FontWeight.bold))),
                 Expanded(
                   flex: _sideFlex,
                   child: const SizedBox(),

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -337,5 +337,6 @@
   "@last30Days": {},
   "allowMissingValues": "Allow missing values",
   "@allowMissingValues": {},
-  "errTimeAfterNow": "The selected time of day is after this moment. We have automatically reset it to the current time. You can disable this validation in the settings!"
+  "errTimeAfterNow": "The selected time of day is after this moment. We have automatically reset it to the current time. You can disable this validation in the settings!",
+  "language": "Language"
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -50,6 +50,7 @@ class AppRoot extends StatelessWidget {
           GlobalCupertinoLocalizations.delegate,
         ],
         supportedLocales: AppLocalizations.supportedLocales,
+        locale: settings.language,
         home: const AppHome(),
       );
     });

diff --git a/lib/model/iso_lang_names.dart b/lib/model/iso_lang_names.dart
@@ -0,0 +1,190 @@
+import 'package:flutter/material.dart';
+
+final _isoLangs = {
+  "ab": "аҧсуа",
+  "aa": "Afaraf",
+  "af": "Afrikaans",
+  "ak": "Akan",
+  "sq": "Shqip",
+  "am": "አማርኛ",
+  "ar": "العربية",
+  "an": "Aragonés",
+  "hy": "Հայերեն",
+  "as": "অসমীয়া",
+  "av": "авар мацӀ, магӀарул мацӀ",
+  "ae": "avesta",
+  "ay": "aymar aru",
+  "az": "azərbaycan dili",
+  "bm": "bamanankan",
+  "ba": "башҡорт теле",
+  "eu": "euskara, euskera",
+  "be": "Беларуская",
+  "bn": "বাংলা",
+  "bh": "भोजपुरी",
+  "bi": "Bislama",
+  "bs": "bosanski jezik",
+  "br": "brezhoneg",
+  "bg": "български език",
+  "my": "ဗမာစာ",
+  "ca": "Català",
+  "ch": "Chamoru",
+  "ce": "нохчийн мотт",
+  "ny": "chiCheŵa, chinyanja",
+  "zh": "中文 (Zhōngwén)",
+  "cv": "чӑваш чӗлхи",
+  "kw": "Kernewek",
+  "co": "corsu, lingua corsa",
+  "cr": "ᓀᐦᐃᔭᐍᐏᐣ",
+  "hr": "hrvatski",
+  "cs": "česky, čeština",
+  "da": "dansk",
+  "dv": "ދިވެހި",
+  "nl": "Nederlands, Vlaams",
+  "en": "English",
+  "eo": "Esperanto",
+  "et": "eesti, eesti keel",
+  "ee": "Eʋegbe",
+  "fo": "føroyskt",
+  "fj": "vosa Vakaviti",
+  "fi": "suomi, suomen kieli",
+  "fr": "française",
+  "ff": "Fulfulde, Pulaar, Pular",
+  "gl": "Galego",
+  "ka": "ქართული",
+  "de": "Deutsch",
+  "el": "Ελληνικά",
+  "gn": "Avañeẽ",
+  "gu": "ગુજરાતી",
+  "ht": "Kreyòl ayisyen",
+  "ha": "Hausa, هَوُسَ",
+  "he": "עברית",
+  "hz": "Otjiherero",
+  "hi": "हिन्दी, हिंदी",
+  "ho": "Hiri Motu",
+  "hu": "Magyar",
+  "ia": "Interlingua",
+  "id": "Bahasa Indonesia",
+  "ie": "Occidental (Interlingue)",
+  "ga": "Gaeilge",
+  "ig": "Asụsụ Igbo",
+  "ik": "Iñupiaq, Iñupiatun",
+  "io": "Ido",
+  "is": "Íslenska",
+  "it": "Italiano",
+  "iu": "ᐃᓄᒃᑎᑐᑦ",
+  "ja": "日本語 (にほんご／にっぽんご)",
+  "jv": "basa Jawa",
+  "kl": "kalaallisut, kalaallit oqaasii",
+  "kn": "ಕನ್ನಡ",
+  "kr": "Kanuri",
+  "ks": "कश्मीरी, كشميري‎",
+  "kk": "Қазақ тілі",
+  "km": "ភាសាខ្មែរ",
+  "ki": "Gĩkũyũ",
+  "rw": "Ikinyarwanda",
+  "ky": "кыргыз тили",
+  "kv": "коми кыв",
+  "kg": "KiKongo",
+  "ko": "한국어 (韓國語), 조선말 (朝鮮語)",
+  "ku": "Kurdî, كوردی‎",
+  "kj": "Kuanyama",
+  "la": "latine, lingua latina",
+  "lb": "Lëtzebuergesch",
+  "lg": "Luganda",
+  "li": "Limburgs",
+  "ln": "Lingála",
+  "lo": "ພາສາລາວ",
+  "lt": "lietuvių kalba",
+  "lu": "",
+  "lv": "latviešu valoda",
+  "gv": "Gaelg, Gailck",
+  "mk": "македонски јазик",
+  "mg": "Malagasy fiteny",
+  "ms": "bahasa Melayu, بهاس ملايو‎",
+  "ml": "മലയാളം",
+  "mt": "Malti",
+  "mi": "te reo Māori",
+  "mr": "मराठी",
+  "mh": "Kajin M̧ajeļ",
+  "mn": "монгол",
+  "na": "Ekakairũ Naoero",
+  "nv": "Diné bizaad, Dinékʼehǰí",
+  "nb": "Norsk bokmål",
+  "nd": "isiNdebele",
+  "ne": "नेपाली",
+  "ng": "Owambo",
+  "nn": "Norsk nynorsk",
+  "no": "Norsk",
+  "ii": "ꆈꌠ꒿ Nuosuhxop",
+  "nr": "isiNdebele",
+  "oc": "Occitan",
+  "oj": "ᐊᓂᔑᓈᐯᒧᐎᓐ",
+  "cu": "ѩзыкъ словѣньскъ",
+  "om": "Afaan Oromoo",
+  "or": "ଓଡ଼ିଆ",
+  "os": "ирон æвзаг",
+  "pa": "ਪੰਜਾਬੀ, پنجابی‎",
+  "pi": "पाऴि",
+  "fa": "فارسی",
+  "pl": "polski",
+  "ps": "پښتو",
+  "pt": "Português",
+  "qu": "Runa Simi, Kichwa",
+  "rm": "rumantsch grischun",
+  "rn": "kiRundi",
+  "ro": "română",
+  "ru": "русский язык",
+  "sa": "संस्कृतम्",
+  "sc": "sardu",
+  "sd": "सिन्धी, سنڌي، سندھی‎",
+  "se": "Davvisámegiella",
+  "sm": "gagana faa Samoa",
+  "sg": "yângâ tî sängö",
+  "sr": "српски језик",
+  "gd": "Gàidhlig",
+  "sn": "chiShona",
+  "si": "සිංහල",
+  "sk": "slovenčina",
+  "sl": "slovenščina",
+  "so": "Soomaaliga, af Soomaali",
+  "st": "Sesotho",
+  "es": "español, castellano",
+  "su": "Basa Sunda",
+  "sw": "Kiswahili",
+  "ss": "SiSwati",
+  "sv": "svenska",
+  "ta": "தமிழ்",
+  "te": "తెలుగు",
+  "tg": "тоҷикӣ, toğikī, تاجیکی‎",
+  "th": "ไทย",
+  "ti": "ትግርኛ",
+  "bo": "བོད་ཡིག",
+  "tk": "Türkmen, Түркмен",
+  "tl": "Wikang Tagalog, ᜏᜒᜃᜅ᜔ ᜆᜄᜎᜓᜄ᜔",
+  "tn": "Setswana",
+  "to": "faka Tonga",
+  "tr": "Türkçe",
+  "ts": "Xitsonga",
+  "tt": "татарча, tatarça, تاتارچا‎",
+  "tw": "Twi",
+  "ty": "Reo Tahiti",
+  "ug": "Uyƣurqə, ئۇيغۇرچە‎",
+  "uk": "українська",
+  "ur": "اردو",
+  "uz": "zbek, Ўзбек, أۇزبېك‎",
+  "ve": "Tshivenḓa",
+  "vi": "Tiếng Việt",
+  "vo": "Volapük",
+  "wa": "Walon",
+  "cy": "Cymraeg",
+  "wo": "Wollof",
+  "fy": "Frysk",
+  "xh": "isiXhosa",
+  "yi": "ייִדיש",
+  "yo": "Yorùbá",
+  "za": "Saɯ cueŋƅ, Saw cuengh"
+};
+
+String? getDisplayLanguage(Locale l) {
+  return _isoLangs[l.languageCode];
+}
diff --git a/lib/model/ram_only_implementations.dart b/lib/model/ram_only_implementations.dart
@@ -70,6 +70,7 @@ class RamSettings extends ChangeNotifier implements Settings {
   String _defaultExportDir = '';
   bool _exportAfterEveryEntry = false;
   bool _allowMissingValues = false;
+  Locale? _language;
 
   RamSettings() {
     _accentColor = createMaterialColor(0xFF009688);
@@ -363,6 +364,15 @@ class RamSettings extends ChangeNotifier implements Settings {
     notifyListeners();
   }
 
+  @override
+  Locale? get language => _language;
+
+  @override
+  set language(Locale? value) {
+    _language = value;
+    notifyListeners();
+  }
+
   @override
   void changeStepSize(TimeStep value) {
     graphStepSize = value;

diff --git a/lib/model/settings_store.dart b/lib/model/settings_store.dart
@@ -474,6 +474,17 @@ class Settings extends ChangeNotifier {
     _prefs.setBool('exportAfterEveryEntry', value);
     notifyListeners();
   }
+
+  Locale? get language {
+    final value = _prefs.getString('language');
+    if (value?.isEmpty ?? true) return null;
+    return Locale(value ?? 'en');
+  }
+
+  set language (Locale? value) {
+    _prefs.setString('language', value?.languageCode ?? '');
+    notifyListeners();
+  }
 }
 
 enum TimeStep {

diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
@@ -1,6 +1,7 @@
 import 'package:blood_pressure_app/components/consistent_future_builder.dart';
 import 'package:blood_pressure_app/components/settings_widgets.dart';
 import 'package:blood_pressure_app/model/blood_pressure.dart';
+import 'package:blood_pressure_app/model/iso_lang_names.dart';
 import 'package:blood_pressure_app/model/settings_store.dart';
 import 'package:blood_pressure_app/screens/subsettings/enter_timeformat.dart';
 import 'package:blood_pressure_app/screens/subsettings/export_import_screen.dart';
@@ -79,6 +80,20 @@ class SettingsPage extends StatelessWidget {
                   }
                 },
               ),
+              DropDownSettingsTile<Locale?>(
+                key: const Key('language'),
+                leading: const Icon(Icons.language),
+                title: Text(AppLocalizations.of(context)!.language),
+                value: settings.language,
+                items: [
+                  DropdownMenuItem(value: null, child: Text(AppLocalizations.of(context)!.system)),
+                  for (final l in AppLocalizations.supportedLocales)
+                    DropdownMenuItem(value: l, child: Text(getDisplayLanguage(l) ?? l.languageCode)),
+                ],
+                onChanged: (Locale? value) {
+                  settings.language = value;
+                },
+              ),
               SliderSettingsTile(
                 key: const Key('iconSize'),
                 title: Text(AppLocalizations.of(context)!.iconSize),

diff --git a/test/model/settings_test.dart b/test/model/settings_test.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:blood_pressure_app/model/ram_only_implementations.dart';
 import 'package:blood_pressure_app/model/settings_store.dart';
 import 'package:file_saver/file_saver.dart';
@@ -47,6 +49,7 @@ void main() {
       expect(s.defaultExportDir.isEmpty, true);
       expect(s.exportAfterEveryEntry, false);
       expect(s.allowMissingValues, false);
+      expect(s.language, null);
     });
 
     test('setting fields should save changes', () async {
@@ -91,6 +94,7 @@ void main() {
       s.defaultExportDir = '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv';
       s.exportAfterEveryEntry = true;
       s.allowMissingValues = true;
+      s.language = const Locale('de');
 
       expect(s.displayDataStart, DateTime.fromMillisecondsSinceEpoch(10000));
       expect(s.displayDataEnd, DateTime.fromMillisecondsSinceEpoch(200000));
@@ -118,6 +122,7 @@ void main() {
       expect(s.defaultExportDir, '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv');
       expect(s.exportAfterEveryEntry, true);
       expect(s.allowMissingValues, true);
+      expect(s.language, const Locale('de'));
     });
 
     test('setting fields should notify listeners and change values', () async {
@@ -156,8 +161,9 @@ void main() {
       s.defaultExportDir = '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv';
       s.exportAfterEveryEntry = true;
       s.allowMissingValues = true;
+      s.language = const Locale('de');
 
-      expect(i, 28);
+      expect(i, 29);
     });
   });
 
@@ -199,6 +205,7 @@ void main() {
       expect(s.defaultExportDir.isEmpty, true);
       expect(s.exportAfterEveryEntry, false);
       expect(s.allowMissingValues, false);
+      expect(s.language, null);
     });
 
     test('setting fields should save changes', () async {
@@ -243,6 +250,7 @@ void main() {
       s.defaultExportDir = '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv';
       s.exportAfterEveryEntry = true;
       s.allowMissingValues = true;
+      s.language = const Locale('de');
 
       expect(s.displayDataStart, DateTime.fromMillisecondsSinceEpoch(10000));
       expect(s.displayDataEnd, DateTime.fromMillisecondsSinceEpoch(200000));
@@ -270,7 +278,7 @@ void main() {
       expect(s.defaultExportDir, '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv');
       expect(s.exportAfterEveryEntry, true);
       expect(s.allowMissingValues, true);
-
+      expect(s.language, const Locale('de'));
     });
 
     test('setting fields should notify listeners and change values', () async {
@@ -309,8 +317,9 @@ void main() {
       s.defaultExportDir = '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv';
       s.exportAfterEveryEntry = true;
       s.allowMissingValues = true;
+      s.language = const Locale('de');
 
-      expect(i, 28);
+      expect(i, 29);
     });
   });
 }