From 751cd04ce2516d0258afb99cf21ebb9c6fe0a89b Mon Sep 17 00:00:00 2001 From: CroatianHusky <90392654+CroatianHusky@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:14:42 +0200 Subject: [PATCH 1/3] developer settings i18n --- .../lib/screens/settings/settings_screen.dart | 14 +++++++------- .../screens/settings/settings_screen.i18n.dart | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart index c7df96a..2220ec3 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart @@ -912,7 +912,7 @@ class _SettingsScreenState extends State padding: const EdgeInsets.symmetric( vertical: 12.0, horizontal: 24.0), child: Panel( - title: const Text("Developer Settings"), + title: Text("devsettings".i18n), child: Column( children: [ Material( @@ -921,8 +921,8 @@ class _SettingsScreenState extends State contentPadding: const EdgeInsets.only(left: 12.0), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12.0)), - title: const Text("Developer Mode", - style: TextStyle(fontWeight: FontWeight.w500)), + title: Text("devmode".i18n, + style: const TextStyle(fontWeight: FontWeight.w500)), onChanged: (v) => settings.update(developerMode: false), value: settings.developerMode, @@ -931,7 +931,7 @@ class _SettingsScreenState extends State ), PanelButton( leading: const Icon(FeatherIcons.copy), - title: const Text("Copy JWT"), + title: Text("copy_jwt".i18n), onPressed: () => Clipboard.setData(ClipboardData( text: Provider.of(context, listen: false) @@ -998,13 +998,13 @@ class _SettingsScreenState extends State ScaffoldMessenger.of(context).showSnackBar(SnackBar( duration: const Duration(milliseconds: 200), content: Text( - "You are $devmodeCountdown taps away from Developer Mode."), + "devmoretaps".i18n.fill([devmodeCountdown])), )); setState(() => devmodeCountdown--); } else if (devmodeCountdown == 0) { - ScaffoldMessenger.of(context).showSnackBar(const SnackBar( - content: Text("Developer Mode successfully activated."), + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text("devactivated".i18n), )); settings.update(developerMode: true); diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart index 8126d58..eb59939 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart @@ -66,6 +66,11 @@ extension SettingsLocalization on String { "Adaptive Theme": "Adaptive Theme", "presentation": "Presentation mode", "uwufymode": "UwU-fied mode (hungarian)", + "devmoretaps": "You are %s taps away from Developer Mode.", + "devactivated": "Developer Mode successfully activated.", + "devsettings": "Developer Settings", + "devmode": "Developer Mode", + "copy_jwt": "Copy JWT", }, "hu_hu": { "personal_details": "Személyes információk", @@ -130,6 +135,11 @@ extension SettingsLocalization on String { "Adaptive Theme": "Adaptív téma", "presentation": "Bemutató mód", "uwufymode": "UwU mód (magyar)", + "devmoretaps": "Még %s érintésre vagy a Fejlesztői módtól.", + "devactivated": "Fejlesztői mód sikeresen aktiválva.", + "devsettings": "Fejlesztői Beállítások", + "devmode": "Fejlesztői mód", + "copy_jwt": "JWT másolása", }, "de_de": { "personal_details": "Persönliche Angaben", @@ -193,6 +203,11 @@ extension SettingsLocalization on String { "Adaptive Theme": "Adaptive Theme", "presentation": "Präsentationsmodus", "uwufymode": "UwU-Modus (ungarisch)", + "devmoretaps": "Sie sind %s Taps vom Entwicklermodus entfernt.", + "devactivated": "Entwicklermodus erfolgreich aktiviert.", + "devsettings": "Entwickleroptionen", + "devmode": "Entwicklermodus", + "copy_jwt": "JWT kopieren", }, }; From ae7c724f6571bb55f37bd9f9025e86040847fd1d Mon Sep 17 00:00:00 2001 From: CroatianHusky <90392654+CroatianHusky@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:33:00 +0200 Subject: [PATCH 2/3] notification toggle color fix --- .../lib/screens/settings/settings_screen.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart index 2220ec3..80bf7c4 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart @@ -458,13 +458,13 @@ class _SettingsScreenState extends State fontSize: 16.0, ), ), - SizedBox( + const SizedBox( width: 5, ), SizedBox( height: 30, child: AnimatedContainer( - duration: Duration(milliseconds: 200), + duration: const Duration(milliseconds: 200), child: Padding( padding: const EdgeInsets.only(left: 10, right: 10), @@ -482,8 +482,9 @@ class _SettingsScreenState extends State overflow: TextOverflow.ellipsis))), ), decoration: BoxDecoration( - color: AppColors.of(context).filc.withOpacity( - settings.notificationsEnabled ? 1.0 : .5), + color: settings.notificationsEnabled + ? Theme.of(context).colorScheme.secondary + : AppColors.of(context).text.withOpacity(.25), borderRadius: BorderRadius.circular(40)), ), ) From 301e8cb638c203d56455eca233a27260b0ffe873 Mon Sep 17 00:00:00 2001 From: CroatianHusky <90392654+CroatianHusky@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:35:13 +0200 Subject: [PATCH 3/3] Updated settings_screen.i18n.dart --- .../lib/screens/settings/settings_screen.i18n.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart index eb59939..ae7f40d 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart @@ -135,7 +135,7 @@ extension SettingsLocalization on String { "Adaptive Theme": "Adaptív téma", "presentation": "Bemutató mód", "uwufymode": "UwU mód (magyar)", - "devmoretaps": "Még %s érintésre vagy a Fejlesztői módtól.", + "devmoretaps": "Még %s koppintásra vagy a Fejlesztői módtól.", "devactivated": "Fejlesztői mód sikeresen aktiválva.", "devsettings": "Fejlesztői Beállítások", "devmode": "Fejlesztői mód",