add multiple locales

yang991178 · yang991178 · commit 02ba12cc1c79 · 2022-06-25T15:07:47.000-07:00
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Fluent Reader"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -50,6 +50,10 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		E30184022867BA2B005DCAE6 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
+		E30184032867BA70005DCAE6 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
+		E30184042867BA7D005DCAE6 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
+		E30184052867BAB1005DCAE6 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		FA1C5CF9893C1976B07DEA5C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -179,6 +183,10 @@
 				"zh-Hans",
 				es,
 				de,
+				fr,
+				hr,
+				"pt-BR",
+				uk,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -302,6 +310,10 @@
 				3271990C25BBF9C8008EA00E /* zh-Hans */,
 				324ACECE25C909AD00CD3591 /* es */,
 				32AC73DE263AED42001F500B /* de */,
+				E30184022867BA2B005DCAE6 /* fr */,
+				E30184032867BA70005DCAE6 /* hr */,
+				E30184042867BA7D005DCAE6 /* pt-BR */,
+				E30184052867BAB1005DCAE6 /* uk */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
diff --git a/ios/Runner/fr.lproj/LaunchScreen.strings b/ios/Runner/fr.lproj/LaunchScreen.strings
@@ -0,0 +1 @@
+
diff --git a/ios/Runner/hr.lproj/LaunchScreen.strings b/ios/Runner/hr.lproj/LaunchScreen.strings
@@ -0,0 +1 @@
+
diff --git a/ios/Runner/pt-BR.lproj/LaunchScreen.strings b/ios/Runner/pt-BR.lproj/LaunchScreen.strings
@@ -0,0 +1 @@
+
diff --git a/ios/Runner/uk.lproj/LaunchScreen.strings b/ios/Runner/uk.lproj/LaunchScreen.strings
@@ -0,0 +1 @@
+
diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb
diff --git a/lib/l10n/intl_uk.arb b/lib/l10n/intl_uk.arb
diff --git a/lib/main.dart b/lib/main.dart
@@ -42,8 +42,9 @@ void main() async {
   SystemChannels.lifecycle.setMessageHandler((msg) {
     if (msg == AppLifecycleState.resumed.toString()) {
       if (Global.server != null) Global.server.restart();
-      if (Global.globalModel.syncOnStart
-        && DateTime.now().difference(Global.syncModel.lastSynced).inMinutes >= 10) {
+      if (Global.globalModel.syncOnStart &&
+          DateTime.now().difference(Global.syncModel.lastSynced).inMinutes >=
+              10) {
         Global.syncModel.syncWithService();
       }
     }
@@ -67,7 +68,8 @@ class MyApp extends StatelessWidget {
     "/settings/service/inoreader": (context) => InoreaderPage(),
     "/settings/service/greader": (context) => GReaderPage(),
     "/settings/service": (context) {
-      var serviceType = SyncService.values[Store.sp.getInt(StoreKeys.SYNC_SERVICE) ?? 0];
+      var serviceType =
+          SyncService.values[Store.sp.getInt(StoreKeys.SYNC_SERVICE) ?? 0];
       switch (serviceType) {
         case SyncService.None:
           break;
@@ -114,12 +116,19 @@ class MyApp extends StatelessWidget {
             const Locale("en"),
             const Locale("es"),
             const Locale("zh"),
+            const Locale("fr"),
+            const Locale("uk"),
+            const Locale("hr"),
+            const Locale("pt"),
           ],
           localeResolutionCallback: (_locale, supportedLocales) {
             _locale = Locale(_locale.languageCode);
-            if (globalModel.locale != null) return globalModel.locale;
-            else if (supportedLocales.contains(_locale)) return _locale;
-            else return Locale("en");
+            if (globalModel.locale != null)
+              return globalModel.locale;
+            else if (supportedLocales.contains(_locale))
+              return _locale;
+            else
+              return Locale("en");
           },
           theme: CupertinoThemeData(
             primaryColor: CupertinoColors.systemBlue,
@@ -133,9 +142,9 @@ class MyApp extends StatelessWidget {
             final mediaQueryData = MediaQuery.of(context);
             if (Global.globalModel.textScale == null) return child;
             return MediaQuery(
-              data: mediaQueryData.copyWith(textScaleFactor: Global.globalModel.textScale),
-              child: child
-            );
+                data: mediaQueryData.copyWith(
+                    textScaleFactor: Global.globalModel.textScale),
+                child: child);
           },
         ),
       ),
diff --git a/lib/pages/settings/general_page.dart b/lib/pages/settings/general_page.dart

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`android {`
`35`		`- compileSdkVersion 29`
	`35`	`+ compileSdkVersion 31`
`36`	`36`
`37`	`37`	`sourceSets {`
`38`	`38`	`main.java.srcDirs += 'src/main/kotlin'`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.3.50'`
	`2`	`+ ext.kotlin_version = '1.7.0'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.5.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:7.0.2'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`