Revert "Victorai (#56)" (#57)

This reverts commit 20fc24a.

Author: remtrik

.github/workflows/android.yml

@@ -13,30 +13,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: gradle
+    - uses: actions/checkout@v4
+    - name: set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew assembleRelease -x lint
-      - name: Sign app APK
-        uses: ilharp/sign-android-release@v1.0.4
-        with:
-          releaseDir: app/build/outputs/apk/release
-          signingKey: ${{ secrets.ANDROID_SIGNING_KEY }}
-          keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
-          keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
-          buildToolsVersion: 34.0.0
-      - name: move apk
-        run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk woahelper.apk
-      - uses: actions/upload-artifact@v4
-        with:
-          name: woahelper
-          path: woahelper.apk
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew assembleRelease -x lint
+    - name: Sign app APK
+      uses: ilharp/sign-android-release@v1.0.4
+      with:
+        releaseDir: app/build/outputs/apk/release
+        signingKey: ${{ secrets.ANDROID_SIGNING_KEY }}
+        keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
+        keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+        keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        buildToolsVersion: 34.0.0
+    - name: move apk
+      run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk woahelper.apk
+    - uses: actions/upload-artifact@v4
+      with:
+        name: woahelper
+        path: woahelper.apk

Helper-dark.png

@@ -1,35 +1,36 @@
 plugins {
     alias(libs.plugins.agp.app)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
-    namespace = "com.woa.helper"
-    compileSdk = 35
+    namespace = "id.kuato.woahelper"
+    compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.woa.helper"
-        minSdk = 25
-        targetSdk = 35
-        versionCode = 5
-        versionName = "1.8.4_BETA42"
-
-        val locales = listOf(
-            "ar", "az", "be", "cs", "de", "en", "es", "fa", "fr", "in", "ja", "ka", "ko", "ms", "nl", "pl", "pt", "ru", "ro", "ro-rMD", "th", "tr", "uk", "vi", "zh", "zh-rCN", "zh-rHK", "zh-rMO", "zh-rSG", "zh-rTW"
+        applicationId = "id.kuato.woahelper"
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 3
+        versionName = "1.8.4_BETA41"
+
+        val locales =listOf(
+            "ar", "az", "be", "cs", "de", "en", "es", "fa", "fr", "in", "ja", "ka", "ko", "ms", "nl", "pl", "pt", "ru", "ro","ro-rMD", "th", "tr", "uk", "vi", "zh", "zh-rCN", "zh-rHK", "zh-rMO", "zh-rSG", "zh-rTW"
         )
-        buildConfigField("String[]", "LOCALES", "{\"${locales.toString().trim('[').trim(']').replace(", ", "\",\"").replace("zh-", "zh-Hans-").replace("-r", "-")}\"}")
-        resourceConfigurations += locales
+        buildConfigField("String[]","LOCALES","{\"${locales.toString().trim('[').trim(']').replace(", ","\",\"").replace("zh-","zh-Hans-").replace("-r","-")}\"}");
+        resourceConfigurations +=locales;
     }
 
     buildTypes {
-        release {
+        getByName("release") {
             isShrinkResources = true
             isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+            )
             isDebuggable = false
             isJniDebuggable = false
         }
-        debug {
+        getByName("debug") {
             isDebuggable = true
         }
     }
@@ -43,14 +44,9 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlinOptions {
-
-        jvmTarget = "21"
-    }
 
     buildFeatures {
         viewBinding = true
-        buildConfig = true
     }
 }
 
@@ -59,9 +55,9 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.preference.preference)
     implementation(libs.com.intuit.sdp.sdp.android)
-    implementation(libs.com.intuit.ssp.ssp.android)
     implementation(libs.com.github.topjohnwu.libsu.core)
     implementation(libs.com.github.topjohnwu.libsu.service)
     implementation(libs.com.github.topjohnwu.libsu.nio)
     implementation(libs.realtimeblurview)
+    //implementation(libs.blurry)
 }

Helper-light.png

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app/build.gradle.kts

@@ -8,41 +8,26 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:hardwareAccelerated="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:localeConfig="@xml/languages"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
         android:theme="@style/Theme.MyApplication"
-        android:enableOnBackInvokedCallback="true"
         tools:targetApi="tiramisu">
-        <receiver
-            android:name=".widgets.MountWidget"
-            android:exported="true">
+        <receiver android:name=".widgets.WidgetProvider" android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.ACTION_CLICK" />
-                <action android:name="android.appwidget.action.UPDATE" />
+                <action android:name="id.kuato.woahelper.ACTION_SET"/>
+                <action android:name="id.kuato.woahelper.ACTION_CLICK"/>
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/mount_widget_info" />
+                android:resource="@xml/widget_info" />
         </receiver>
         <receiver
-            android:name=".widgets.QuickBootWidget"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.ACTION_CLICK" />
-                <action android:name="android.appwidget.action.UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/quickboot_widget_info" />
-        </receiver>
-        <receiver
-            android:name=".main.AutoMount"
+            android:name=".main.automount"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -51,19 +36,19 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-
+		
         <service
-            android:name=".main.QuickBootTile"
+            android:name=".main.quickboot_tile"
             android:exported="true"
             android:icon="@drawable/qs_tile"
-            android:label="QuickBoot"
+            android:label="Quickboot"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
         <service
-            android:name=".main.MountTile"
+            android:name=".main.mount_tile"
             android:exported="true"
             android:icon="@drawable/mnt2"
             android:label="Mount win"
@@ -80,15 +65,18 @@
                 android:name="autoStoreLocales"
                 android:value="true" />
         </service>
-
         <activity
             android:name=".widgets.WidgetActivity"
-            android:theme="@style/TransparentTheme"
+            android:theme="@style/Theme.AppCompat.Dialog.Alert"
             android:exported="true"
             android:taskAffinity=""
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".main.WidgetConfigActivity"
+            android:exported="true">
+        </activity>
         <activity
             android:name=".main.MainActivity"
             android:configChanges="orientation|screenSize"