Version 1.6(26). Android 12 support

BlueCat300 · May 21, 2022 · dabc5e5 · dabc5e5
1 parent 6184922
commit dabc5e5
Show file tree

Hide file tree

Showing 66 changed files with 1,275 additions and 1,740 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,32 +1,28 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    namespace 'ru.bluecat.android.xposed.mods.appsettings'
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "ru.bluecat.android.xposed.mods.appsettings"
-        minSdkVersion 21
-        targetSdkVersion 30
-        versionName "1.5.1"
-        versionCode 20
+        minSdkVersion 27
+        targetSdkVersion 32
+        versionName "1.6"
+        versionCode 26
         archivesBaseName = "App Settings Reborn v${versionName}"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    lintOptions {
-        disable 'MissingTranslation'
+        sourceCompatibility JavaVersion.VERSION_1_10
+        targetCompatibility JavaVersion.VERSION_1_10
     }
 
     buildTypes {
         debug {
             minifyEnabled false
+            shrinkResources false
             debuggable true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -38,16 +34,21 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    lint {
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation "com.github.topjohnwu.libsu:core:3.1.2"
-    implementation "io.reactivex.rxjava3:rxjava:3.0.12"
+    //noinspection GradleDependency
+    implementation 'com.mikepenz:materialdrawer:6.1.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+
+    implementation "io.reactivex.rxjava3:rxjava:3.1.4"
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+
     compileOnly 'de.robv.android.xposed:api:82'
     compileOnly 'de.robv.android.xposed:api:82:sources'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,5 +1,5 @@
 -dontobfuscate
--keep class ru.bluecat.android.xposed.mods.appsettings.hooks.XposedMod
+-keep class ru.bluecat.android.xposed.mods.appsettings.hooks.Core
 
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="ru.bluecat.android.xposed.mods.appsettings">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <permission-tree android:name="ru.bluecat.android.xposed.mods.appsettings" />
 
@@ -12,30 +11,34 @@
 
     <uses-permission android:name="ru.bluecat.android.xposed.mods.appsettings.BROADCAST_PERMISSION" />
     <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
 
     <application
-        android:theme="@style/Theme.Main.Dark"
+        android:theme="@style/Theme.Main"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:allowBackup="false">
+        android:allowBackup="false"
+        android:supportsRtl="false"
+        tools:ignore="DataExtractionRules">
         <activity
-            android:name=".ui.MainActivity"
-            android:configChanges="orientation|screenSize">
+            android:name=".MainActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.ApplicationsActivity"
+            android:name=".AppSettingsActivity"
             android:label="@string/settings_title"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
-            android:name=".ui.BackupActivity"
+            android:name=".BackupActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/Theme.AppCompat.Translucent"
             android:windowSoftInputMode="stateHidden" >
@@ -44,12 +47,9 @@
         <meta-data
             android:name="xposedmodule"
             android:value="true" />
-        <meta-data
-            android:name="xposedsharedprefs"
-            android:value="true" />
         <meta-data
             android:name="xposedminversion"
-            android:value="89" />
+            android:value="93" />
         <meta-data
             android:name="xposeddescription"
             android:value="@string/app_module_summary" />

diff --git a/app/src/main/assets/xposed_init b/app/src/main/assets/xposed_init
@@ -1 +1 @@
-ru.bluecat.android.xposed.mods.appsettings.hooks.XposedMod
+ru.bluecat.android.xposed.mods.appsettings.hooks.Core
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ru.bluecat.android.xposed.mods.appsettings.hooks.XposedMod
		ru.bluecat.android.xposed.mods.appsettings.hooks.Core