Start fixes for last PR.

Author: Fox2Code

LEGALS.md

@@ -71,10 +71,7 @@ android {
 }
 
 aboutLibraries {
-    additionalLicenses = [
-            "LGPL_3_0_only",
-            "rosetta"
-    ]
+    additionalLicenses = ["LGPL_3_0_only"]
 }
 
 configurations {
@@ -101,7 +98,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
     implementation 'com.squareup.okhttp3:okhttp-brotli:4.9.3'
     implementation 'com.github.topjohnwu.libsu:io:5.0.1'
-    implementation project(":rosetta")
+    implementation 'com.github.Fox2Code:RosettaX:46ec630055'
 
     // Markdown
     implementation "io.noties.markwon:core:4.6.2"

app/build.gradle

@@ -23,6 +23,7 @@
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.utils.GMSProviderInstaller;
 import com.fox2code.mmm.utils.Http;
+import com.fox2code.rosettax.LanguageSwitcher;
 import com.google.android.material.color.DynamicColors;
 import com.topjohnwu.superuser.Shell;
 
@@ -307,6 +308,8 @@ public void onCreate() {
         } else {
             MainApplication.firstBoot = bootPrefs.getBoolean("first_boot", false);
         }
+        // Force initialize language early.
+        new LanguageSwitcher(this);
         this.updateTheme();
         // Update SSL Ciphers if update is possible
         GMSProviderInstaller.installIfNeeded(this);

app/src/main/java/com/fox2code/mmm/MainApplication.java

@@ -31,7 +31,7 @@ public enum ActionButtonType {
     INFO() {
         @Override
         public void update(Chip button, ModuleHolder moduleHolder) {
-            button.setChipIcon(button.getContext().getResources().getDrawable(R.drawable.ic_baseline_info_24));
+            button.setChipIcon(button.getContext().getDrawable(R.drawable.ic_baseline_info_24));
             button.setText(R.string.description);
         }
 
@@ -70,7 +70,7 @@ public void update(Chip button, ModuleHolder moduleHolder) {
             int icon = moduleHolder.hasUpdate() ?
                     R.drawable.ic_baseline_update_24 :
                     R.drawable.ic_baseline_system_update_24;
-            button.setChipIcon(button.getContext().getResources().getDrawable(icon));
+            button.setChipIcon(button.getContext().getDrawable(icon));
             if (moduleHolder.hasUpdate()) {
                 button.setText(R.string.update);
             } else {
@@ -150,7 +150,7 @@ public void update(Chip button, ModuleHolder moduleHolder) {
                             moduleHolder.hasFlag(ModuleInfo.FLAGS_MODULE_ACTIVE)) ?
                     R.drawable.ic_baseline_delete_24 :
                     R.drawable.ic_baseline_delete_forever_24;
-            button.setChipIcon(button.getContext().getResources().getDrawable(icon));
+            button.setChipIcon(button.getContext().getDrawable(icon));
             button.setText(R.string.uninstall);
         }
 
@@ -190,7 +190,7 @@ public boolean doActionLong(Chip button, ModuleHolder moduleHolder) {
     CONFIG() {
         @Override
         public void update(Chip button, ModuleHolder moduleHolder) {
-            button.setChipIcon(button.getContext().getResources().getDrawable(R.drawable.ic_baseline_app_settings_alt_24));
+            button.setChipIcon(button.getContext().getDrawable(R.drawable.ic_baseline_app_settings_alt_24));
             button.setText(R.string.config);
         }
 
@@ -209,7 +209,7 @@ public void doAction(Chip button, ModuleHolder moduleHolder) {
         @Override
         public void update(Chip button, ModuleHolder moduleHolder) {
             ModuleInfo moduleInfo = moduleHolder.getMainModuleInfo();
-            button.setChipIcon(button.getContext().getResources().getDrawable(supportIconForUrl(moduleInfo.support)));
+            button.setChipIcon(button.getContext().getDrawable(supportIconForUrl(moduleInfo.support)));
             button.setText(R.string.support);
         }
 
@@ -228,7 +228,7 @@ public void update(Chip button, ModuleHolder moduleHolder) {
             } else if (moduleInfo.donate.startsWith("https://www.patreon.com/")) {
                 icon = R.drawable.ic_patreon;
             }
-            button.setChipIcon(button.getContext().getResources().getDrawable(icon));
+            button.setChipIcon(button.getContext().getDrawable(icon));
             button.setText(R.string.donate);
         }
 
@@ -266,7 +266,7 @@ public static int supportIconForUrl(String url) {
     }
 
     public void update(Chip button, ModuleHolder moduleHolder) {
-        button.setChipIcon(button.getContext().getResources().getDrawable(this.iconId));
+        button.setChipIcon(button.getContext().getDrawable(this.iconId));
     }
 
     public abstract void doAction(Chip button, ModuleHolder moduleHolder);

app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java

@@ -26,7 +26,7 @@
 import com.fox2code.mmm.utils.Http;
 import com.fox2code.mmm.utils.IntentHelper;
 
-import com.ahmedjazzar.rosetta.LanguageSwitcher;
+import com.fox2code.rosettax.LanguageSwitcher;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 
@@ -98,9 +98,6 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 return true;
             });
 
-            // This is the locale that you wanna your app to launch with.
-            String firstLaunchLocale = "en";
-
             // Warning! Locales that are't exist will crash the app
             HashSet<String> supportedLocales = new HashSet<>();
             supportedLocales.add("cs");
@@ -120,13 +117,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             supportedLocales.add("vi");
             supportedLocales.add("zh-rCH");
             supportedLocales.add("zh-rTW");
-            supportedLocales.add(firstLaunchLocale);
+            supportedLocales.add("en");
 
             Preference languageSelector = findPreference("pref_language_selector");
             languageSelector.setOnPreferenceClickListener(preference -> {
-                LanguageSwitcher ls = new LanguageSwitcher(getActivity(), new Locale(firstLaunchLocale));
-                ls.showChangeLanguageDialog(getActivity());
+                LanguageSwitcher ls = new LanguageSwitcher(getActivity());
                 ls.setSupportedStringLocales(supportedLocales);
+                ls.showChangeLanguageDialog(getActivity());
                 return true;
             });