Merge pull request #145 from DerGoogler/master

[WIP] UI rework

Author: androidacy-user

LEGALS.md

@@ -0,0 +1,15 @@
+# LEGALS
+
+## Fox's Magisk Module Manager
+- Maintained: Yes
+    - Maintainers
+        - [Fox2Code](https://github.com/Fox2Code)
+        - [androidacybot](https://github.com/androidacybot)
+- License: [<svg aria-hidden="true" height="16" viewBox="0 0 16 16" version="1.1" width="16" data-view-component="true" class="octicon octicon-law mr-2"><path fill-rule="evenodd" d="M8.75.75a.75.75 0 00-1.5 0V2h-.984c-.305 0-.604.08-.869.23l-1.288.737A.25.25 0 013.984 3H1.75a.75.75 0 000 1.5h.428L.066 9.192a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.514 3.514 0 00.686.45A4.492 4.492 0 003 11c.88 0 1.556-.22 2.023-.454a3.515 3.515 0 00.686-.45l.045-.04.016-.015.006-.006.002-.002.001-.002L5.25 9.5l.53.53a.75.75 0 00.154-.838L3.822 4.5h.162c.305 0 .604-.08.869-.23l1.289-.737a.25.25 0 01.124-.033h.984V13h-2.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-2.5V3.5h.984a.25.25 0 01.124.033l1.29.736c.264.152.563.231.868.231h.162l-2.112 4.692a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.517 3.517 0 00.686.45A4.492 4.492 0 0013 11c.88 0 1.556-.22 2.023-.454a3.512 3.512 0 00.686-.45l.045-.04.01-.01.006-.005.006-.006.002-.002.001-.002-.529-.531.53.53a.75.75 0 00.154-.838L13.823 4.5h.427a.75.75 0 000-1.5h-2.234a.25.25 0 01-.124-.033l-1.29-.736A1.75 1.75 0 009.735 2H8.75V.75zM1.695 9.227c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L3 6.327l-1.305 2.9zm10 0c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L13 6.327l-1.305 2.9z"></path></svg> LGPL-3.0 license](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/LICENCE)
+
+## Rosetta ([Fork](https://github.com/iamjazzar/rosetta))
+- Maintained: No
+    - Maintainers
+        - [iamjazzar](https://github.com/iamjazzar)
+        - Others unknown
+- License: [<svg aria-hidden="true" height="16" viewBox="0 0 16 16" version="1.1" width="16" data-view-component="true" class="octicon octicon-law mr-2"><path fill-rule="evenodd" d="M8.75.75a.75.75 0 00-1.5 0V2h-.984c-.305 0-.604.08-.869.23l-1.288.737A.25.25 0 013.984 3H1.75a.75.75 0 000 1.5h.428L.066 9.192a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.514 3.514 0 00.686.45A4.492 4.492 0 003 11c.88 0 1.556-.22 2.023-.454a3.515 3.515 0 00.686-.45l.045-.04.016-.015.006-.006.002-.002.001-.002L5.25 9.5l.53.53a.75.75 0 00.154-.838L3.822 4.5h.162c.305 0 .604-.08.869-.23l1.289-.737a.25.25 0 01.124-.033h.984V13h-2.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-2.5V3.5h.984a.25.25 0 01.124.033l1.29.736c.264.152.563.231.868.231h.162l-2.112 4.692a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.517 3.517 0 00.686.45A4.492 4.492 0 0013 11c.88 0 1.556-.22 2.023-.454a3.512 3.512 0 00.686-.45l.045-.04.01-.01.006-.005.006-.006.002-.002.001-.002-.529-.531.53.53a.75.75 0 00.154-.838L13.823 4.5h.427a.75.75 0 000-1.5h-2.234a.25.25 0 01-.124-.033l-1.29-.736A1.75 1.75 0 009.735 2H8.75V.75zM1.695 9.227c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L3 6.327l-1.305 2.9zm10 0c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L13 6.327l-1.305 2.9z"></path></svg> MIT license](https://github.com/iamjazzar/rosetta/blob/master/LICENSE)

app/build.gradle

@@ -71,7 +71,10 @@ android {
 }
 
 aboutLibraries {
-    additionalLicenses = ["LGPL_3_0_only"]
+    additionalLicenses = [
+            "LGPL_3_0_only",
+            "rosetta"
+    ]
 }
 
 configurations {
@@ -88,7 +91,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.webkit:webkit:1.4.0'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'
     implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
     implementation "dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0"
     implementation "dev.rikka.rikkax.insets:insets:1.2.0"
@@ -98,6 +101,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")
 
     // Markdown
     implementation "io.noties.markwon:core:4.6.2"

app/src/main/AndroidManifest.xml

@@ -32,7 +32,8 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="false"
-        tools:targetApi="s">
+        tools:targetApi="s"
+        tools:replace="android:supportsRtl">
         <receiver android:name="com.fox2code.mmm.manager.ModuleBootReceive"
             android:exported="true">
             <intent-filter>
@@ -62,7 +63,9 @@
             android:name=".installer.InstallerActivity"
             android:parentActivityName=".MainActivity"
             android:exported="false"
-            android:launchMode="singleTop">
+            android:screenOrientation="portrait"
+            android:launchMode="singleTop"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="${applicationId}.intent.action.INSTALL_MODULE_INTERNAL" />
             </intent-filter>

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

@@ -23,6 +23,11 @@ public class Constants {
     public static final String EXTRA_MARKDOWN_URL = "extra_markdown_url";
     public static final String EXTRA_MARKDOWN_TITLE = "extra_markdown_title";
     public static final String EXTRA_MARKDOWN_CONFIG = "extra_markdown_config";
+    public static final String EXTRA_MARKDOWN_CHANGE_BOOT = "extra_markdown_change_boot";
+    public static final String EXTRA_MARKDOWN_NEEDS_RAMDISK = "extra_markdown_needs_ramdisk";
+    public static final String EXTRA_MARKDOWN_MIN_MAGISK = "extra_markdown_min_magisk";
+    public static final String EXTRA_MARKDOWN_MIN_API= "extra_markdown_min_api";
+    public static final String EXTRA_MARKDOWN_MAX_API = "extra_markdown_max_api";
     public static final String EXTRA_FADE_OUT = "extra_fade_out";
     public static final String EXTRA_FROM_MANAGER = "extra_from_manager";
 }

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

@@ -32,6 +32,8 @@
 import com.fox2code.mmm.settings.SettingsActivity;
 import com.fox2code.mmm.utils.Http;
 import com.fox2code.mmm.utils.IntentHelper;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 
 import eightbitlab.com.blurview.BlurView;
@@ -68,10 +70,10 @@ public MainActivity() {
     protected void onCreate(Bundle savedInstanceState) {
         this.initMode = true;
         super.onCreate(savedInstanceState);
-        this.setActionBarExtraMenuButton(R.drawable.ic_baseline_settings_24, v -> {
+         this.setActionBarExtraMenuButton(R.drawable.ic_baseline_settings_24, v -> {
             IntentHelper.startActivity(this, SettingsActivity.class);
-            return true;
-        }, R.string.pref_category_settings);
+         return true;
+         }, R.string.pref_category_settings);
         setContentView(R.layout.activity_main);
         this.setTitle(R.string.app_name);
         this.getWindow().setFlags(
@@ -106,10 +108,10 @@ protected void onCreate(Bundle savedInstanceState) {
         this.actionBarBlur.setBackground(this.actionBarBackground);
         this.actionBarBlur.setupWith(this.moduleList).setFrameClearDrawable(
                 this.getWindow().getDecorView().getBackground())
-                .setBlurAlgorithm(new RenderScriptBlur(this))
-                .setBlurRadius(4F).setBlurAutoUpdate(true)
-                .setHasFixedTransformationMatrix(true);
-        this.updateBlurState();
+               .setBlurAlgorithm(new RenderScriptBlur(this))
+              .setBlurRadius(4F).setBlurAutoUpdate(true)
+               .setHasFixedTransformationMatrix(true);
+         this.updateBlurState();
         this.moduleList.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
@@ -255,7 +257,7 @@ private void updateScreenInsets(Configuration configuration) {
                 bottomInset + this.searchCard.getHeight());
         this.searchCard.setRadius(this.searchCard.getHeight() / 2F);
         this.moduleViewListBuilder.updateInsets();
-        this.actionBarBlur.invalidate();
+        //this.actionBarBlur.invalidate();
         this.overScrollInsetTop = combinedBarsHeight;
         this.overScrollInsetBottom = bottomInset;
         Log.d(TAG, "( " + bottomInset + ", " +

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

@@ -23,6 +23,7 @@
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.utils.GMSProviderInstaller;
 import com.fox2code.mmm.utils.Http;
+import com.google.android.material.color.DynamicColors;
 import com.topjohnwu.superuser.Shell;
 
 import java.text.SimpleDateFormat;
@@ -115,11 +116,20 @@ public static boolean isDohEnabled() {
         return getSharedPreferences().getBoolean("pref_dns_over_https", true);
     }
 
+    public static boolean isMonetEnabled() {
+        return getSharedPreferences().getBoolean("pref_enable_monet", false);
+    }
+
     public static boolean isBlurEnabled() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
                 getSharedPreferences().getBoolean("pref_enable_blur", false);
     }
 
+    public static boolean isChipsDisabled() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                getSharedPreferences().getBoolean("pref_disable_chips", false);
+    }
+
     public static boolean isDeveloper() {
         return BuildConfig.DEBUG ||
                 getSharedPreferences().getBoolean("developer", false);
@@ -275,6 +285,11 @@ public boolean isLightTheme() {
     @Override
     public void onCreate() {
         super.onCreate();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            if (MainApplication.isMonetEnabled()) {
+                DynamicColors.applyToActivitiesIfAvailable(this);
+            }
+        }
         SharedPreferences sharedPreferences = MainApplication.getSharedPreferences();
         // We are only one process so it's ok to do this
         SharedPreferences bootPrefs = MainApplication.bootSharedPreferences =

app/src/main/java/com/fox2code/mmm/compat/CompatActivity.java

@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -36,6 +37,7 @@
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 
 import com.fox2code.mmm.Constants;
 import com.fox2code.mmm.R;
@@ -55,20 +57,21 @@ public class CompatActivity extends AppCompatActivity {
     private static final String TAG = "CompatActivity";
     public static final CompatActivity.OnBackPressedCallback DISABLE_BACK_BUTTON =
             new CompatActivity.OnBackPressedCallback() {
-        @Override
-        public boolean onBackPressed(CompatActivity compatActivity) {
-            compatActivity.setOnBackPressedCallback(this);
-            return true;
-        }
-    };
+                @Override
+                public boolean onBackPressed(CompatActivity compatActivity) {
+                    compatActivity.setOnBackPressedCallback(this);
+                    return true;
+                }
+            };
 
     final WeakReference<CompatActivity> selfReference;
     private final CompatConfigHelper compatConfigHelper = new CompatConfigHelper(this);
     private CompatActivity.OnActivityResultCallback onActivityResultCallback;
     private CompatActivity.OnBackPressedCallback onBackPressedCallback;
     private MenuItem.OnMenuItemClickListener menuClickListener;
     private CharSequence menuContentDescription;
-    @StyleRes private int setThemeDynamic = 0;
+    @StyleRes
+    private int setThemeDynamic = 0;
     private boolean onCreateCalledOnce = false;
     private boolean onCreateCalled = false;
     private boolean isRefreshUi = false;
@@ -221,7 +224,8 @@ public View getActionBarView() {
         }
     }
 
-    @Dimension @Px
+    @Dimension
+    @Px
     public int getActionBarHeight() {
         androidx.appcompat.app.ActionBar compatActionBar;
         try {
@@ -247,6 +251,15 @@ public int getActionBarHeight() {
         }
     }
 
+    public int getActionBarHeight(Activity activity) {
+        TypedValue tv = new TypedValue();
+        int actionBarHeight = 0;
+        if (activity.getTheme().resolveAttribute(R.attr.actionBarSize, tv, true)) {
+            actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
+        }
+        return actionBarHeight;
+    }
+
     public void setActionBarBackground(Drawable drawable) {
         androidx.appcompat.app.ActionBar compatActionBar;
         try {
@@ -264,7 +277,8 @@ public void setActionBarBackground(Drawable drawable) {
         }
     }
 
-    @Dimension @Px
+    @Dimension
+    @Px
     public int getStatusBarHeight() {
         int height = WindowInsetsCompat.CONSUMED.getInsets(
                 WindowInsetsCompat.Type.statusBars()).top;
@@ -476,7 +490,7 @@ void propagateResourcesOverride(boolean forceEnglish, Boolean nightModeOverride)
         this.checkResourcesOverrides(forceEnglish, nightModeOverride);
     }
 
-    private void checkResourcesOverrides(boolean forceEnglish,Boolean nightModeOverride) {
+    private void checkResourcesOverrides(boolean forceEnglish, Boolean nightModeOverride) {
         if (this.isRefreshUi || !this.onCreateCalled) return; // Wait before reload
         this.compatConfigHelper.checkResourcesOverrides(forceEnglish, nightModeOverride);
     }
@@ -534,6 +548,14 @@ public static CompatActivity getCompatActivity(Context context) {
         return (CompatActivity) context;
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        SharedPreferences mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(newBase);
+        Locale locale = new Locale(mSharedPreferences.getString("user_preferred_country", "en"));
+        Context context = CompatWrapper.setLocale(newBase, locale);
+        super.attachBaseContext(context);
+    }
+
     public WeakReference<CompatActivity> asWeakReference() {
         return this.selfReference;
     }

app/src/main/java/com/fox2code/mmm/compat/CompatWrapper.java

@@ -0,0 +1,40 @@
+package com.fox2code.mmm.compat;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.LocaleList;
+
+import java.util.Locale;
+
+public class CompatWrapper extends android.content.ContextWrapper {
+
+    public CompatWrapper(Context base) {
+        super(base);
+    }
+
+    public static ContextWrapper setLocale(Context context, Locale newLocale) {
+
+        Resources res = context.getResources();
+        Configuration configuration = res.getConfiguration();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            configuration.setLocale(newLocale);
+
+            LocaleList localeList = new LocaleList(newLocale);
+            LocaleList.setDefault(localeList);
+            configuration.setLocales(localeList);
+
+            context = context.createConfigurationContext(configuration);
+
+        } else {
+            configuration.setLocale(newLocale);
+            context = context.createConfigurationContext(configuration);
+
+        }
+
+        return new ContextWrapper(context);
+    }
+}