Fix errors

Author: HuanCheng65

app/src/main/java/com/huanchengfly/utils/ColorUtils.java

@@ -1,11 +1,24 @@
 package com.huanchengfly.utils;
 
+import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Color;
 
+import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.FloatRange;
 
 public final class ColorUtils {
+    public static @ColorInt
+    int getColorByAttr(Context context, @AttrRes int attr, @ColorRes int defaultColor) {
+        int[] attrs = new int[]{attr};
+        TypedArray typedArray = context.obtainStyledAttributes(attrs);
+        int color = typedArray.getColor(0, context.getResources().getColor(defaultColor));
+        typedArray.recycle();
+        return color;
+    }
+
     public static int getDarkerColor(@ColorInt int color) {
         float[] hsv = new float[3];
         Color.colorToHSV(color, hsv); // convert to hsv

app/src/main/java/com/solohsu/android/edxp/manager/adapter/AppHelper.java

@@ -45,11 +45,10 @@ public class AppHelper {
     private static final String WHITE_LIST_MODE = "conf/usewhitelist";
     private static final String BLACK_LIST_MODE = "conf/blackwhitelist";
 
-    private static final List<String> FORCE_WHITE_LIST  = new ArrayList<>(Collections.singletonList(BuildConfig.APPLICATION_ID));
+    private static final List<String> FORCE_WHITE_LIST = new ArrayList<>(Collections.singletonList(BuildConfig.APPLICATION_ID));
+    private static final List<String> SAFETYNET_BLACK_LIST = new ArrayList<>(Arrays.asList("com.google.android.gms", "com.google.android.gsf"));
     static List<String> FORCE_WHITE_LIST_MODULE = new ArrayList<>(FORCE_WHITE_LIST);
 
-    private static final List<String> SAFETYNET_BLACK_LIST  = new ArrayList<>(Arrays.asList("com.google.android.gms", "com.google.android.gsf"));
-
     @SuppressWarnings("OctalInteger")
     static void makeSurePath() {
         XposedApp.mkdirAndChmod(WHITE_LIST_PATH, 00777);

app/src/main/java/com/solohsu/android/edxp/manager/fragment/CompileDialogFragment.java

@@ -31,7 +31,8 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
     private ApplicationInfo appInfo;
 
 
-    public CompileDialogFragment() {}
+    public CompileDialogFragment() {
+    }
 
     public static CompileDialogFragment newInstance(ApplicationInfo appInfo,
                                                     String msg, String[] commands) {

app/src/main/java/de/robv/android/xposed/installer/SettingsActivity.java

@@ -468,7 +468,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 return (enabled == finalFlagFile.exists());
             });
 
-            Objects.requireNonNull(colors).setOnPreferenceClickListener(this);
+            //Objects.requireNonNull(colors).setOnPreferenceClickListener(this);
             Objects.requireNonNull(customIcon).setOnPreferenceChangeListener(iconChange);
             downloadLocation.setOnPreferenceClickListener(this);
 

app/src/main/java/de/robv/android/xposed/installer/XposedApp.java

@@ -34,6 +34,8 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.huanchengfly.utils.ColorUtils;
+
 import org.meowcat.edxposed.manager.BuildConfig;
 import org.meowcat.edxposed.manager.R;
 
@@ -58,11 +60,11 @@
 @SuppressLint("Registered")
 public class XposedApp extends Application implements ActivityLifecycleCallbacks {
     public static final String TAG = "EdXposedManager";
-    public static final String ENABLED_MODULES_LIST_FILE = BASE_DIR + "conf/enabled_modules.list";
     @SuppressLint("SdCardPath")
     private static final String BASE_DIR_LEGACY = "/data/data/" + BuildConfig.APPLICATION_ID + "/";
     public static final String BASE_DIR = Build.VERSION.SDK_INT >= 24
             ? "/data/user_de/0/" + BuildConfig.APPLICATION_ID + "/" : BASE_DIR_LEGACY;
+    public static final String ENABLED_MODULES_LIST_FILE = BASE_DIR + "conf/enabled_modules.list";
     private static final File EDXPOSED_PROP_FILE = new File("/system/framework/edconfig.jar");
     public static int WRITE_EXTERNAL_PERMISSION = 69;
     public static int[] iconsValues = new int[]{R.mipmap.ic_launcher, R.mipmap.ic_launcher_dvdandroid, R.mipmap.ic_launcher_hjmodi, R.mipmap.ic_launcher_rovo, R.mipmap.ic_launcher_cornie, R.mipmap.ic_launcher_rovo_old, R.mipmap.ic_launcher_staol};
@@ -191,8 +193,8 @@ public static void setColors(ActionBar actionBar, Integer value, Activity activi
             if (getPreferences().getBoolean("nav_bar", false)) {
                 activity.getWindow().setNavigationBarColor(darkenColor(color, 0.85f));
             } else {
-                int black = activity.getResources().getColor(android.R.color.black);
-                activity.getWindow().setNavigationBarColor(black);
+                //int black = activity.getResources().getColor(android.R.color.black);
+                activity.getWindow().setNavigationBarColor(ColorUtils.getColorByAttr(activity, R.attr.color_bottom_nav, android.R.color.black));
             }
         }
     }

app/src/main/java/de/robv/android/xposed/installer/installation/AdvancedInstallerFragment.java

@@ -98,7 +98,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onResume() {
         super.onResume();
         mTabLayout.setSelectedTabIndicatorColor(XposedApp.getColor(Objects.requireNonNull(getContext())));
-        mTabLayout.setTabTextColors(XposedApp.getColorByAttr(Objects.requireNonNull(getContext()), R.attr.color_unselected, R.color.color_unselected_light),XposedApp.getColor(Objects.requireNonNull(getContext())));
+        mTabLayout.setTabTextColors(XposedApp.getColorByAttr(Objects.requireNonNull(getContext()), R.attr.color_unselected, R.color.color_unselected_light), XposedApp.getColor(Objects.requireNonNull(getContext())));
     }
 
     @Override

app/src/main/java/de/robv/android/xposed/installer/installation/InstallationActivity.java

@@ -34,8 +34,6 @@
 import de.robv.android.xposed.installer.XposedBaseActivity;
 import de.robv.android.xposed.installer.util.RootUtil;
 
-import static de.robv.android.xposed.installer.XposedApp.darkenColor;
-
 public class InstallationActivity extends XposedBaseActivity {
     private static final int REBOOT_COUNTDOWN = 15000;
 

app/src/main/java/de/robv/android/xposed/installer/util/DownloadsUtil.java

@@ -648,12 +648,12 @@ public static class DownloadInfo implements Comparable<DownloadInfo> {
         public final long id;
         public final String url;
         public final String title;
-        final long lastModification;
         public final String localFilename;
         public final int status;
         public final int totalSize;
         public final int bytesDownloaded;
         public final int reason;
+        final long lastModification;
 
         private DownloadInfo(long id, String url, String title, long lastModification, String localFilename, int status, int totalSize, int bytesDownloaded, int reason) {
             this.id = id;

app/src/main/java/de/robv/android/xposed/installer/util/LocaleUtil.java

@@ -11,6 +11,6 @@ public static void setLocale(Context context, Locale locale) {
         Resources resources = context.getResources();
         Configuration configuration = resources.getConfiguration();
         configuration.setLocale(locale);
-        resources.updateConfiguration(configuration,resources.getDisplayMetrics());
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
     }
 }

app/src/main/java/de/robv/android/xposed/installer/util/ModuleUtil.java

@@ -347,7 +347,6 @@ public boolean isInstalledOnExternalStorage() {
 //        public boolean isForwardLocked() {
 //            return (app.flags & FLAG_FORWARD_LOCK) != 0;
 //        }
-
         public String getAppName() {
             if (appName == null)
                 appName = app.loadLabel(mPm).toString();