Merge pull request #61 from n00b69/victorai

Victorai

- lord have mercy if this shows all commits

Author: n00b69

.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,36 +1,35 @@
 plugins {
     alias(libs.plugins.agp.app)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
-    namespace = "id.kuato.woahelper"
-    compileSdk = 34
+    namespace = "com.woa.helper"
+    compileSdk = 36
 
     defaultConfig {
-        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"
+        applicationId = "com.woa.helper"
+        minSdk = 25
+        targetSdk = 36
+        versionCode = 5
+        versionName = "1.8.4_BETA44"
+
+        val locales = listOf(
+            "ar", "az", "be", "cs", "de", "en", "es", "fa", "fr", "ind", "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", "-")}\"}")
+        androidResources.localeFilters += locales
     }
 
     buildTypes {
-        getByName("release") {
+        release {
             isShrinkResources = true
             isMinifyEnabled = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
             isDebuggable = false
             isJniDebuggable = false
         }
-        getByName("debug") {
+        debug {
             isDebuggable = true
         }
     }
@@ -44,9 +43,13 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
+    kotlin {
+        jvmToolchain(21)
+    }
 
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 }
 
@@ -55,9 +58,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

@@ -7,27 +7,48 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        android:minSdkVersion="22"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="21"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="21"/>
     <application
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
+        android:hardwareAccelerated="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"
         tools:targetApi="tiramisu">
-        <receiver android:name=".widgets.WidgetProvider" android:exported="true">
+        <receiver
+            android:name=".widgets.MountWidget"
+            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/mount_widget_info" />
+        </receiver>
+        <receiver
+            android:name=".widgets.QuickBootWidget"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="id.kuato.woahelper.ACTION_SET"/>
-                <action android:name="id.kuato.woahelper.ACTION_CLICK"/>
+                <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/widget_info" />
+                android:resource="@xml/quickboot_widget_info" />
         </receiver>
         <receiver
-            android:name=".main.automount"
+            android:name=".main.AutoMount"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -36,19 +57,19 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-		
+
         <service
-            android:name=".main.quickboot_tile"
+            android:name=".main.QuickBootTile"
             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.mount_tile"
+            android:name=".main.MountTile"
             android:exported="true"
             android:icon="@drawable/mnt2"
             android:label="Mount win"
@@ -65,18 +86,15 @@
                 android:name="autoStoreLocales"
                 android:value="true" />
         </service>
+
         <activity
             android:name=".widgets.WidgetActivity"
-            android:theme="@style/Theme.AppCompat.Dialog.Alert"
-            android:exported="true"
-            android:taskAffinity=""
             android:excludeFromRecents="true"
+            android:exported="true"
+            android:launchMode="singleInstance"
             android:noHistory="true"
-            android:launchMode="singleInstance" />
-        <activity
-            android:name=".main.WidgetConfigActivity"
-            android:exported="true">
-        </activity>
+            android:taskAffinity=""
+            android:theme="@style/TransparentTheme" />
         <activity
             android:name=".main.MainActivity"
             android:configChanges="orientation|screenSize"