Remove useless compat list

Notice: Since 46100, Modules fragment ID has changed from 4 to 3.
artiao · Feb 5, 2021 · 571ea80 · 571ea80
1 parent df51c8f
commit 571ea80
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 176 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         minSdkVersion 24
         //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 46000
-        versionName "4.6.0"
+        versionCode 46100
+        versionName "4.6.1"
     }
 
     applicationVariants.all { variant ->

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ApplicationFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/ApplicationFragment.java
@@ -87,17 +87,13 @@ public boolean onQueryTextChange(String newText) {
     }
 
     private void changeTitle(boolean isWhiteListMode) {
-        requireActivity().setTitle(String.format("%s(%s)", getString(R.string.nav_title_black_list), getString(isWhiteListMode ? R.string.title_white_list : R.string.title_black_list)));
+        requireActivity().setTitle(String.format("%s (%s)", getString(R.string.nav_title_black_list), getString(isWhiteListMode ? R.string.title_white_list : R.string.title_black_list)));
     }
 
     private boolean isWhiteListMode() {
         return AppHelper.isWhiteListMode();
     }
 
-    private boolean isBlackListMode() {
-        return true;
-    }
-
     @Override
     public void onDataReady() {
         mSwipeRefreshLayout.setRefreshing(false);

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/CompatListFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/CompatListFragment.java
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/WelcomeActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/WelcomeActivity.java
@@ -163,11 +163,6 @@ private void navigate(final int itemId) {
                 setTitle(R.string.nav_title_black_list);
                 navFragment = new ApplicationFragment();
                 break;
-            case R.id.nav_compat_list:
-                mPrevSelectedId = itemId;
-                setTitle(R.string.title_compat_list);
-                navFragment = new CompatListFragment();
-                break;
             case R.id.drawer_item_5:
                 startActivity(new Intent(this, SettingsActivity.class));
                 mNavigationView.getMenu().findItem(mPrevSelectedId).setChecked(true);
@@ -254,7 +249,7 @@ private void notifyDataSetChanged() {
                 getPackageName() + "_preferences", MODE_PRIVATE).getBoolean("snack_bar", true);
 
         if (moduleUpdateAvailable && snackBar) {
-            Snackbar.make(parentLayout, R.string.modules_updates_available, Snackbar.LENGTH_LONG).setAction(getString(R.string.view), view -> switchFragment(4)).show();
+            Snackbar.make(parentLayout, R.string.modules_updates_available, Snackbar.LENGTH_LONG).setAction(getString(R.string.view), view -> switchFragment(3)).show();
         }
     }
 

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapter/AppHelper.java b/app/src/main/java/org/meowcat/edxposed/manager/adapter/AppHelper.java
@@ -1,7 +1,6 @@
 package org.meowcat.edxposed.manager.adapter;
 
 import android.annotation.SuppressLint;
-import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -30,7 +29,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
 import static org.meowcat.edxposed.manager.Constants.getBaseDir;
@@ -271,14 +269,14 @@ public static void showMenu(@NonNull Context context,
                         Snackbar.make(view, R.string.app_no_ui, Snackbar.LENGTH_LONG).show();
                     }
                     break;
-                case R.id.app_menu_stop:
-                    try {
-                        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-                        Objects.requireNonNull(manager).killBackgroundProcesses(info.packageName);
-                    } catch (Exception ex) {
-                        ex.printStackTrace();
-                    }
-                    break;
+//                case R.id.app_menu_stop:
+//                    try {
+//                        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+//                        Objects.requireNonNull(manager).killBackgroundProcesses(info.packageName);
+//                    } catch (Exception ex) {
+//                        ex.printStackTrace();
+//                    }
+//                    break;
                 case R.id.app_menu_compile_speed:
                     CompileUtil.compileSpeed(context, fragmentManager, info);
                     break;

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapter/CompatListAdapter.java b/app/src/main/java/org/meowcat/edxposed/manager/adapter/CompatListAdapter.java
diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
@@ -7,10 +7,6 @@
             android:id="@+id/drawer_item_1"
             android:icon="@drawable/ic_nav_install"
             android:title="@string/nav_item_install" />
-        <item
-            android:id="@+id/nav_compat_list"
-            android:icon="@drawable/ic_local_hospital"
-            android:title="@string/nav_title_compat_list" />
         <item
             android:id="@+id/nav_black_list"
             android:icon="@drawable/ic_format_list_bulleted"

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -16,7 +16,6 @@
     <string-array name="default_view_texts" translatable="false">
         <item>@string/nav_item_install</item>
         <item>@string/nav_title_black_list</item>
-        <item>@string/nav_title_compat_list</item>
         <item>@string/nav_item_modules</item>
         <item>@string/nav_item_download</item>
         <item>@string/nav_item_logs</item>
@@ -34,7 +33,6 @@
         <item>2</item>
         <item>3</item>
         <item>4</item>
-        <item>5</item>
     </string-array>
 
     <string-array name="release_type_texts" translatable="false">