Commit 4c201f2

derdilla <derdilla06@gmail.com>
2023-07-10 15:18:10
fix remaining hardcoded strings
1 parent 4c93879
lib/components/date_time_picker.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 Future<DateTime?> showDateTimePicker({
   required BuildContext context,
@@ -11,7 +12,7 @@ Future<DateTime?> showDateTimePicker({
   lastDate ??= firstDate.add(const Duration(days: 365 * 200));
 
   final DateTime? selectedDate = await showDatePicker(
-      context: context, initialDate: initialDate, firstDate: firstDate, lastDate: lastDate, confirmText: 'NEXT');
+      context: context, initialDate: initialDate, firstDate: firstDate, lastDate: lastDate, confirmText: AppLocalizations.of(context)!.btnNext);
 
   if (selectedDate == null) return null;
   if (!context.mounted) return null;
lib/components/settings_widgets.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_material_color_picker/flutter_material_color_picker.dart';
 
 class SettingsTile extends StatelessWidget {
@@ -107,7 +108,6 @@ class ColorSelectionSettingsTile extends StatelessWidget {
           builder: (_) {
             return AlertDialog(
               contentPadding: const EdgeInsets.all(6.0),
-              title: const Text('select color'),
               content: MaterialColorPicker(
                 circleSize: 53,
                 selectedColor: initialColor,
@@ -119,7 +119,7 @@ class ColorSelectionSettingsTile extends StatelessWidget {
               actions: [
                 TextButton(
                   onPressed: Navigator.of(context).pop,
-                  child: const Text('CLOSE'),
+                  child: Text(AppLocalizations.of(context)!.btnCancel),
                 ),
               ],
             );
lib/l10n/app_de.arb
@@ -48,6 +48,7 @@
   "btnSave": "OK",
   "btnConfirm": "OK",
   "btnUndo": "ZURÜCK",
+  "btnNext": "WEITER",
 
   "sysLong": "Systole",
   "sysShort": "Sys",
@@ -57,6 +58,7 @@
   "pulShort": "Pul",
   "addNote": "Notiz (optional)",
 
+  "settings": "Einstellungen",
   "layout": "Layout",
   "allowManualTimeInput": "Editierbare Zeitangaben",
   "enterTimeFormatScreen": "Datums-/Zeitformat",
lib/l10n/app_en.arb
@@ -47,6 +47,7 @@
   "btnSave": "SAVE",
   "btnConfirm": "OK",
   "btnUndo": "UNDO",
+  "btnNext": "NEXT",
 
   "sysLong": "Systolic",
   "sysShort": "sys",
@@ -56,6 +57,7 @@
   "pulShort": "pul",
   "addNote": "Note (optional)",
 
+  "settings": "Settings",
   "layout": "Layout",
   "allowManualTimeInput": "Allow manual time input",
   "enterTimeFormatScreen": "Time format",
lib/l10n/app_zh.arb
@@ -47,6 +47,7 @@
   "btnSave": "保存",
   "btnConfirm": "确定",
   "btnUndo": "撤销",
+  "btnNext": "NEXT",
 
   "sysLong": "高压",
   "sysShort": "高",
@@ -56,6 +57,7 @@
   "pulShort": "脉",
   "addNote": "备注(选填)",
 
+  "settings": "Settings",
   "layout": "布局",
   "allowManualTimeInput": "允许手动输入时间",
   "enterTimeFormatScreen": "时间格式",
lib/screens/settings.dart
@@ -18,7 +18,7 @@ class SettingsPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Settings'),
+        title: Text(AppLocalizations.of(context)!.settings),
         backgroundColor: Theme.of(context).primaryColor,
       ),
       body: Consumer<Settings>(builder: (context, settings, child) {
@@ -258,7 +258,7 @@ class SettingsPage extends StatelessWidget {
                 ),
               ],
             ),
-            SettingsSection(title: const Text('about'), children: [
+            SettingsSection(title: Text(AppLocalizations.of(context)!.aboutWarnValuesScreen), children: [
               FutureBuilder<PackageInfo>(
                 future: PackageInfo.fromPlatform(),
                 builder: (context, snapshot) {