Merge branch 'zjyzip:main' into main

.gitignore

@@ -81,3 +81,6 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 # lint/reports/
+
+# Android IDE
+.androidide

app/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+/release

app/build.gradle.kts

@@ -5,6 +5,14 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("dev.rikka.tools.materialthemebuilder")
     id("com.google.devtools.ksp")
+    id("dev.rikka.tools.autoresconfig")
+}
+
+autoResConfig {
+    generateClass.set(true)
+    generateRes.set(false)
+    generatedClassFullName.set("com.close.hook.ads.util.LangList")
+    generatedArrayFirstItem.set("SYSTEM")
 }
 
 materialThemeBuilder {
@@ -47,6 +55,17 @@ android {
     namespace = "com.close.hook.ads"
     compileSdk = 34
 
+    signingConfigs {
+        create("keyStore") {
+            storeFile = file("AdClose.jks")
+            keyAlias = "AdClose"
+            keyPassword = "rikkati"
+            storePassword = "rikkati"
+            enableV2Signing = true
+            enableV3Signing = true
+        }
+    }
+
     defaultConfig {
         applicationId = "com.close.hook.ads"
         minSdk = 26
@@ -80,9 +99,11 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            signingConfig = signingConfigs.getByName("keyStore")
         }
         getByName("debug") {
             isDebuggable = true
+            signingConfig = signingConfigs.getByName("keyStore")
         }
     }
 
@@ -106,43 +127,31 @@ configurations.configureEach {
 
 dependencies {
     compileOnly("de.robv.android.xposed:api:82")
-
     implementation("org.luckypray:dexkit:2.0.0")
 
     implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("com.google.android.material:material:1.10.0")
+    implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
+    implementation("androidx.room:room-runtime:2.6.1")
+    ksp("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.6.1")
+    runtimeOnly("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.6.2")
 
-    implementation("com.drakeet.about:about:2.5.2")
 
+    implementation("com.google.android.material:material:1.10.0")
+    implementation("com.drakeet.about:about:2.5.2")
     implementation("me.zhanghai.android.fastscroll:library:1.3.0")
-
-    implementation("androidx.preference:preference-ktx:1.2.1")
-
     implementation("dev.rikka.rikkax.material:material:2.7.0")
     implementation("dev.rikka.rikkax.material:material-preference:2.0.0")
 
-    implementation("androidx.lifecycle:lifecycle-reactivestreams:2.7.0")
-
-    implementation("io.reactivex.rxjava3:rxjava:3.1.8")
-    implementation("io.reactivex.rxjava3:rxandroid:3.0.2")
-
     implementation("com.squareup.okhttp3:okhttp:4.12.0")
-
-    implementation("com.google.guava:guava:33.0.0-jre")
-
+    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("com.google.guava:guava:33.1.0-jre")
     implementation("com.github.bumptech.glide:glide:4.16.0")
     annotationProcessor("com.github.bumptech.glide:compiler:4.16.0")
-
     implementation("com.microsoft.appcenter:appcenter-analytics:5.0.4")
     implementation("com.microsoft.appcenter:appcenter-crashes:5.0.4")
 
-    implementation("com.google.code.gson:gson:2.10.1")
-
-    implementation("androidx.room:room-runtime:2.6.1")
-    ksp("androidx.room:room-compiler:2.6.1")
-
-    implementation("com.github.aitsuki:SwipeMenuRecyclerView:2.1.5")
-    implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
-
 }

app/proguard-rules.pro

@@ -20,4 +20,5 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+-keep class com.aitsuki.swipe.** { *; }
 -keep class com.close.hook.ads.** { *; }

app/src/main/AndroidManifest.xml

@@ -22,16 +22,17 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity
-            android:name=".ui.activity.BlockListActivity"
-            android:exported="false" />
 
         <provider
             android:name=".provider.UrlContentProvider"
             android:authorities="com.close.hook.ads.provider"
             android:enabled="true"
             android:exported="true" />
 
+        <activity
+            android:name=".ui.activity.RequestInfoActivity"
+            android:exported="true" />
+
         <activity
             android:name=".ui.activity.AboutActivity"
             android:exported="false"