Merge branch 'master' into master

Author: rolandgeider

AUTHORS.md

@@ -31,6 +31,7 @@
 - Dennis van Peer - <https://github.com/Denpeer>
 - sizzlesloth - <https://github.com/sizzlesloth>
 - Arya Singh - <https://github.com/ARYPROGRAMMER>
+- Xianglin Zeng - <https://github.com/FutureYL3>
 
 ## Translators
 

lib/l10n/app_en.arb

@@ -888,5 +888,29 @@
   "@log": {
     "description": "Log a specific meal (imperative form)"
   },
-  "done": "Done"
+  "done": "Done",
+  "overallChangeWeight": "Overall change",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "From meals",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "goalTypeBasic": "Basic",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "Advanced",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorRaw": "raw",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "avg",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  }
 }

lib/l10n/app_ta.arb

@@ -250,9 +250,9 @@
   },
   "delete": "删除",
   "@delete": {},
-  "loadingText": "加载...",
+  "loadingText": "加载中...",
   "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
+    "description": "Text to show when entries are being loaded in the background: Loading..., changed from \"加载\" to \"加载中\""
   },
   "edit": "编辑",
   "@edit": {},
@@ -324,9 +324,9 @@
   "@date": {
     "description": "The date of a workout log or body weight entry"
   },
-  "weight": "重量",
+  "weight": "体重",
   "@weight": {
-    "description": "The weight of a workout log or body weight entry"
+    "description": "The weight of a workout log or body weight entry, changed from \"重量\" to \"体重\"" 
   },
   "anErrorOccurred": "出错了!",
   "@anErrorOccurred": {},
@@ -348,9 +348,9 @@
   "@addMeal": {},
   "save": "保存",
   "@save": {},
-  "name": "名",
+  "name": "名称",
   "@name": {
-    "description": "Name for a workout or nutritional plan"
+    "description": "Name for a workout or nutritional plan, changed from \"名\" to \"名称\""
   },
   "description": "描述",
   "@description": {},
@@ -670,5 +670,39 @@
     }
   },
   "noMeasurementEntries": "您没有测量条目",
-  "@noMeasurementEntries": {}
-}
+  "@noMeasurementEntries": {},
+  "overallChangeWeight": "总体变化",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight"
+  },
+  "goalTypeMeals": "从饮食出发",
+  "goalTypeBasic": "基础",
+  "goalTypeAdvanced": "进阶",
+  "chartAllTimeTitle": "{name} 历史记录曲线",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {}
+    }
+  },
+  "chartDuringPlanTitle": "{chartName} 在计划 \"{planName}\" 期间的改变曲线",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {},
+      "planName": {}
+    }
+  },
+  "indicatorRaw": "原始值",
+  "indicatorAvg": "平均值",
+  "textPromptTitle": "准备就绪？",
+  "@textPromptTitle": {
+    "description": "Title for the text prompt"
+  },
+  "textPromptSubheading": "点击右下角按钮开始",
+  "@textPromptSubheading": {
+    "description": "Subheading for the text prompt"
+  }
+}

lib/l10n/app_zh.arb

@@ -37,7 +37,9 @@ class MeasurementOverallChangeWidget extends StatelessWidget {
             ? '-'
             : '';
 
-    return Text('overall change $prefix ${delta.abs().toStringAsFixed(1)} $_unit');
+    // ignore: prefer_interpolation_to_compose_strings
+    return Text(AppLocalizations.of(context).overallChangeWeight +
+      '$prefix ${delta.abs().toStringAsFixed(1)} $_unit');
   }
 }
 

lib/widgets/measurements/charts.dart

@@ -77,8 +77,8 @@ List<Widget> getOverviewWidgetsSeries(
     Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        Indicator(color: Theme.of(context).colorScheme.primary, text: 'raw', isSquare: true),
-        Indicator(color: Theme.of(context).colorScheme.tertiary, text: 'avg', isSquare: true),
+        Indicator(color: Theme.of(context).colorScheme.primary, text: AppLocalizations.of(context).indicatorRaw, isSquare: true),
+        Indicator(color: Theme.of(context).colorScheme.tertiary, text: AppLocalizations.of(context).indicatorAvg, isSquare: true),
       ],
     ),
   ];

lib/widgets/measurements/helpers.dart

@@ -484,6 +484,17 @@ enum GoalType {
 
   const GoalType(this.label);
   final String label;
+
+  String getI18nLabel(BuildContext context) {
+    switch (this) {
+      case GoalType.meals:
+        return AppLocalizations.of(context).goalTypeMeals;
+      case GoalType.basic:
+        return AppLocalizations.of(context).goalTypeBasic;
+      case GoalType.advanced:
+        return AppLocalizations.of(context).goalTypeAdvanced;
+    }
+  }
 }
 
 class PlanForm extends StatefulWidget {
@@ -572,7 +583,7 @@ class _PlanFormState extends State<PlanForm> {
                       .map(
                         (e) => DropdownMenuItem<GoalType>(
                           value: e,
-                          child: Text(e.label),
+                          child: Text(e.getI18nLabel(context)),
                         ),
                       )
                       .toList(),

lib/widgets/nutrition/forms.dart

@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
+    version: "67.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.4.1"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -298,10 +293,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.7"
+    version: "2.3.6"
   drift:
     dependency: "direct main"
     description:
@@ -402,18 +397,18 @@ packages:
     dependency: "direct main"
     description:
       name: flex_color_scheme
-      sha256: "32914024a4f404d90ff449f58d279191675b28e7c08824046baf06826e99d984"
+      sha256: "03fd5e68eff346a042026577f54be0cd4507e565cd86390b12c0aca1c5d6cb0b"
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.1"
+    version: "8.0.0"
   flex_seed_scheme:
     dependency: "direct main"
     description:
       name: flex_seed_scheme
-      sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01"
+      sha256: "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "3.4.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -500,10 +495,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -529,10 +524,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
+      sha256: "1b7723a814d84fb65869ea7115cdb3ee7c3be5a27a755c1ec60e049f6b9fcbb2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.10+1"
+    version: "2.0.11"
   flutter_svg_icons:
     dependency: "direct main"
     description:
@@ -579,10 +574,10 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
+      sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.7"
+    version: "2.5.2"
   freezed_annotation:
     dependency: "direct main"
     description:
@@ -813,10 +808,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   list_counter:
     dependency: transitive
     description:
@@ -833,14 +828,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2-main.4"
   markdown:
     dependency: transitive
     description:

pubspec.lock

@@ -57,16 +57,16 @@ dependencies:
   flutter_staggered_grid_view: ^0.7.0
   carousel_slider: ^5.0.0
   multi_select_flutter: ^4.1.3
-  flutter_svg: ^2.0.10+1
+  flutter_svg: ^2.0.11
   fl_chart: ^0.69.0
   flutter_zxing: ^1.5.2
   drift: ^2.16.0
   path: ^1.8.3
   path_provider: ^2.1.4
   sqlite3_flutter_libs: ^0.5.20
   get_it: ^7.6.8
-  flex_seed_scheme: ^1.5.0
-  flex_color_scheme: ^7.3.1
+  flex_seed_scheme: ^3.4.1
+  flex_color_scheme: ^8.0.0
   freezed_annotation: ^2.4.4
   clock: ^1.1.1
   flutter_svg_icons: ^0.0.1
@@ -83,7 +83,7 @@ dev_dependencies:
   json_serializable: ^6.8.0
   mockito: ^5.4.4
   network_image_mock: ^2.1.1
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
   cider: ^0.2.7
   drift_dev: ^2.20.3
   freezed: ^2.5.2