fix multi language

docbohanh · docbohanh · commit 10377ca1990a · 2020-08-06T21:53:05.000+07:00
diff --git a/covid_statistic/lib/generated/i18n.dart b/covid_statistic/lib/generated/i18n.dart
@@ -28,6 +28,19 @@ class S implements WidgetsLocalizations {
   String get more => 'More';
   String get topInfectedCountries => 'Top Infected Countries';
   String get precautions => 'Precautions';
+
+  String get protectiveMask => 'Protective Mask';
+  String get protectiveMaskDesc => 'Always remember to wear a protective mask when stepping out.';
+  String get washHands => 'Wash Hands';
+  String get washHandsDesc => 'Wash your hands often with soap and water and for 20 seconds at least.';
+  String get coverCough => 'Cover Cough';
+  String get coverCoughDesc => 'Cough or sneeze into your elbow or cover your mouth with a disposable napkin.';
+  String get sanitizeOften => 'Sanitize Often';
+  String get sanitizeOftenDesc => 'Use alchohol based sanitizer if water and soap are unavailable.';
+  String get noFaceTouching => 'No Face Touching';
+  String get noFaceTouchingDesc => 'Don\'t touch your eyes, nose or mouth often and with unwashed hands.';
+  String get socialDistancing => 'Social Distancing';
+  String get socialDistancingDesc => 'Keep 7m distance from other people. Stay at home and avoid gatherings.';
 }
 
 class $vi extends S {
@@ -42,11 +55,24 @@ class $vi extends S {
   @override String get totalDeaths => 'Đã tử vong';
   @override String get recovered => 'Chữa khỏi';
   @override String get newCases => 'Mới nhiễm';
-  @override String get newDeaths => 'Mới tử vong';
+  @override String get newDeaths => 'Mới báo tử';
   @override String get activeCases => 'Đang điều trị';
   @override String get more => 'Xem thêm';
   @override String get topInfectedCountries => 'Quốc gia lây nhiễm cao';
   @override String get precautions => 'Biện pháp phòng ngừa';
+
+  @override String get protectiveMask => 'Đeo khẩu trang';
+  @override String get protectiveMaskDesc => 'Luôn luôn đẹo khẩu trang khi ra ngoài';
+  @override String get washHands => 'Rửa tay';
+  @override String get washHandsDesc => 'Rửa tay thường xuyên với xà bông ít nhất 20 giây';
+  @override String get coverCough => 'Che miệng khi ho';
+  @override String get coverCoughDesc => 'Dùng khuỷu tay hoặc giấy ăn dùng một lần để che miệng khi ho hoặc hắt hơi';
+  @override String get sanitizeOften => 'Khử trùng';
+  @override String get sanitizeOftenDesc => 'Sử dụng chất khử trùng có cồn nếu không có nước và xà phòng.';
+  @override String get noFaceTouching => 'Tránh đưa tay lên mặt';
+  @override String get noFaceTouchingDesc => 'Hạn chế đưa tay lên mắt, mũi và miệng.';
+  @override String get socialDistancing => 'Giữ khoảng cách';
+  @override String get socialDistancingDesc => 'Giữ khoảng cách 7m với mọi người. Nên ở nhà và tránh tụ tập.';
 }
 
 class $en extends S {
diff --git a/covid_statistic/lib/helper/app_bar.dart b/covid_statistic/lib/helper/app_bar.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
 import 'package:covid_statistic/utils/custom_colors.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
diff --git a/covid_statistic/lib/helper/locale_dropdown.dart b/covid_statistic/lib/helper/locale_dropdown.dart
@@ -1,6 +1,6 @@
 import 'package:covid_statistic/helper/spinning_widget.dart';
 import 'package:covid_statistic/model/localization.dart';
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
 import 'package:covid_statistic/utils/constant.dart';
 import 'package:covid_statistic/utils/local_utils.dart';
 import 'package:covid_statistic/utils/utility.dart';
diff --git a/covid_statistic/lib/helper/title_view.dart b/covid_statistic/lib/helper/title_view.dart
@@ -1,4 +1,4 @@
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
diff --git a/covid_statistic/lib/main.dart b/covid_statistic/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:covid_statistic/generated/i18n.dart';
 import 'package:covid_statistic/provider/language_provider.dart';
 import 'package:covid_statistic/provider/theme_provider.dart';
 import 'package:covid_statistic/router/router.dart';
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
 import 'package:covid_statistic/utils/constant.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -38,15 +38,12 @@ class App extends StatelessWidget {
 class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final theme = AppStateProvider.of<AppState>(context).currentTheme;
     final language = AppStateProvider.of<AppState>(context).languageCode;
 
     return ValueBuilder<String>(
       streamed: language,
-//      initialData: AppTheme.defaultLight,
       builder: (context, snapshot) => MaterialApp(
         title: 'Covid-19 Pandemic',
-//        theme: _buildThemeData(snapshot.data),
         localizationsDelegates: const [
           S.delegate,
           GlobalMaterialLocalizations.delegate,
@@ -61,17 +58,4 @@ class MyApp extends StatelessWidget {
       ),
     );
   }
-
-  ThemeData _buildThemeData(MyTheme appTheme) {
-    return ThemeData(
-      brightness: appTheme.brightness,
-      backgroundColor: appTheme.backgroundColor,
-      scaffoldBackgroundColor: appTheme.scaffoldBackgroundColor,
-      primaryColor: appTheme.primaryColor,
-      primaryColorBrightness: appTheme.primaryColorBrightness,
-      accentColor: appTheme.accentColor,
-      primaryColorLight: appTheme.primaryColorLight,
-      primaryColorDark: appTheme.primaryColorDark,
-    );
-  }
 }
diff --git a/covid_statistic/lib/model/app_state.dart b/covid_statistic/lib/model/app_state.dart
@@ -1,5 +1,5 @@
 import 'package:covid_statistic/network/api.dart';
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
 import 'package:covid_statistic/utils/constant.dart';
 import 'package:covid_statistic/utils/utility.dart';
 import 'package:frideos/frideos.dart';
diff --git a/covid_statistic/lib/model/prevention.dart b/covid_statistic/lib/model/prevention.dart
@@ -0,0 +1,10 @@
+class Prevention {
+  String prevention, description, imagePath;
+
+  Prevention({this.prevention, this.description, this.imagePath});
+
+  Prevention.fromJson(Map<String, dynamic> json)
+      : prevention = json['prevention'],
+        description = json['desc'],
+        imagePath = json['imgPath'];
+}
diff --git a/covid_statistic/lib/pages/main/main_drop.dart b/covid_statistic/lib/pages/main/main_drop.dart
@@ -1,5 +1,5 @@
 import 'package:covid_statistic/model/main_info.dart';
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
diff --git a/covid_statistic/lib/pages/main/main_page.dart b/covid_statistic/lib/pages/main/main_page.dart
@@ -8,18 +8,21 @@ import 'package:covid_statistic/model/app_state.dart';
 import 'package:covid_statistic/model/covid_info.dart';
 import 'package:covid_statistic/model/country_info.dart';
 import 'package:covid_statistic/model/main_info.dart';
+import 'package:covid_statistic/model/prevention.dart';
 import 'package:covid_statistic/pages/main/main_drop.dart';
 import 'package:covid_statistic/pages/main/precautions/precaution_grid.dart';
 import 'package:covid_statistic/pages/main/stats/pandemic_view.dart';
 import 'package:covid_statistic/pages/main/top_country/country_stats.dart';
-import 'package:covid_statistic/utils/app_theme.dart';
+import 'package:covid_statistic/utils/themes/app_theme.dart';
+import 'package:covid_statistic/utils/constant.dart';
 import 'package:covid_statistic/utils/local_utils.dart';
 import 'package:covid_statistic/utils/utility.dart';
 import 'package:covid_statistic/view_model/main_vm.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:frideos/frideos.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class MainPage extends StatefulWidget {
   const MainPage({Key key}) : super(key: key);
@@ -50,8 +53,6 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
     });
 
     super.initState();
-
-    addAllListData();
     viewModel.getCountryPandemic();
   }
 
@@ -73,7 +74,7 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
               value: snapshot.data,
               onChanged: viewModel.mainInfoChanged,
             ),
-            subTxt: 'Details',
+            subTxt: S.of(context).details,
             animation: Tween<double>(begin: 0.0, end: 1.0).animate(
                 CurvedAnimation(
                     parent: animationController,
@@ -119,7 +120,7 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
             builder: (context, AsyncSnapshot<bool> snapshot) {
               if (!snapshot.hasData || !snapshot.data) {
                 return Text(
-                  'Top Infected Countries',
+                  S.of(context).topInfectedCountries,
                   textAlign: TextAlign.left,
                   style: GoogleFonts.roboto(
                     fontWeight: FontWeight.w500,
@@ -136,7 +137,7 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
             },
           ),
         ),
-        subTxt: 'More',
+        subTxt: S.of(context).more,
         onViewMore: () {
           HUD.showMessage(context, text: 'See more at https://disease.sh/v3');
         },
@@ -170,7 +171,7 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
     listViews.add(
       TitleView(
         title: Text(
-          'Precautions',
+          S.of(context).precautions,
           textAlign: TextAlign.left,
           style: GoogleFonts.roboto(
             fontWeight: FontWeight.w500,
@@ -179,7 +180,7 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
             color: AppTheme.lightText,
           ),
         ),
-        subTxt: 'More',
+        subTxt: S.of(context).more,
         onViewMore: () {
           HUD.showMessage(context, text: 'View more');
         },
@@ -198,12 +199,40 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
             curve:
                 Interval((1 / count) * 5, 1.0, curve: Curves.fastOutSlowIn))),
         animationController: animationController,
+        preventions: [
+          Prevention(
+              prevention: S.of(context).protectiveMask,
+              description: S.of(context).protectiveMaskDesc,
+              imagePath: 'assets/prevention/mask.png'),
+          Prevention(
+              prevention: S.of(context).washHands,
+              description: S.of(context).washHandsDesc,
+              imagePath: 'assets/prevention/wash.png'),
+          Prevention(
+              prevention: S.of(context).coverCough,
+              description: S.of(context).coverCoughDesc,
+              imagePath: 'assets/prevention/coughCover.png'),
+          Prevention(
+              prevention: S.of(context).sanitizeOften,
+              description: S.of(context).sanitizeOftenDesc,
+              imagePath: 'assets/prevention/sanitizer.png'),
+          Prevention(
+              prevention: S.of(context).noFaceTouching,
+              description: S.of(context).noFaceTouchingDesc,
+              imagePath: 'assets/prevention/touch.png'),
+          Prevention(
+              prevention: S.of(context).socialDistancing,
+              description: S.of(context).socialDistancingDesc,
+              imagePath: 'assets/prevention/socialDistance.png'),
+        ],
       ),
     );
   }
 
   @override
   Widget build(BuildContext context) {
+    if (listViews.isEmpty) addAllListData();
+
     final language = AppStateProvider.of<AppState>(context).languageCode;
 
     return WillPopScope(
@@ -220,8 +249,10 @@ class _MainPage extends State<MainPage> with TickerProviderStateMixin {
             actions: [
               LocaleDropDown(
                 locale: LocalizationUtils.locale(language.value),
-                onChanged: (String newValue) {
+                onChanged: (String newValue) async {
                   language.value = newValue;
+                  var prefs = await SharedPreferences.getInstance();
+                  prefs.setString(Constant.language, newValue);
                 },
               )
             ],
diff --git a/covid_statistic/lib/pages/main/precautions/precaution_grid.dart b/covid_statistic/lib/pages/main/precautions/precaution_grid.dart
diff --git a/covid_statistic/lib/pages/main/stats/pandemic_view.dart b/covid_statistic/lib/pages/main/stats/pandemic_view.dart
diff --git a/covid_statistic/lib/utils/themes/app_theme.dart b/covid_statistic/lib/utils/themes/app_theme.dart
diff --git a/covid_statistic/lib/view_model/main_vm.dart b/covid_statistic/lib/view_model/main_vm.dart

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'package:covid_statistic/utils/app_theme.dart';`
	`1`	`+import 'package:covid_statistic/utils/themes/app_theme.dart';`
`2`	`2`	`import 'package:flutter/material.dart';`
`3`	`3`	`import 'package:google_fonts/google_fonts.dart';`
`4`	`4`