english version #28

qhy040404 · Dec 9, 2024 · e5ae055 · e5ae055
1 parent 07e5d5c
commit e5ae055
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 31 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.qhy040404.fxxkmiuiad"
         minSdk = 29
         targetSdk = 35
-        versionCode = 10
-        versionName = "1.4.0"
+        versionCode = 11
+        versionName = "1.4.1"
 
         resourceConfigurations.addAll(
             setOf(
@@ -47,11 +47,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_21.toString()
     }
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <application
+        android:name=".FxxkMIUIAdApp"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"

diff --git a/app/src/main/java/com/qhy040404/fxxkmiuiad/FxxkMIUIAdApp.kt b/app/src/main/java/com/qhy040404/fxxkmiuiad/FxxkMIUIAdApp.kt
@@ -0,0 +1,14 @@
+package com.qhy040404.fxxkmiuiad
+
+import android.app.Application
+
+class FxxkMIUIAdApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        app = this
+    }
+
+    companion object {
+        lateinit var app: FxxkMIUIAdApp
+    }
+}
diff --git a/app/src/main/java/com/qhy040404/fxxkmiuiad/MainComposeActivity.kt b/app/src/main/java/com/qhy040404/fxxkmiuiad/MainComposeActivity.kt
@@ -28,6 +28,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
@@ -50,9 +51,9 @@ class MainComposeActivity : ComponentActivity() {
         } else {
             runCatching {
                 PackageUtils.startLaunchAppActivity(this, SHIZUKU)
-                Toast.makeText(this, "授权失败，跳转到 Shizuku 手动授权", Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.permission_result_failed), Toast.LENGTH_LONG).show()
             }.onFailure {
-                Toast.makeText(this, "未检测到 Shizuku, 请手动前往 Sui 授权", Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.permission_manual_sui), Toast.LENGTH_LONG).show()
             }
         }
     }
@@ -69,7 +70,7 @@ class MainComposeActivity : ComponentActivity() {
         setContent {
             DayNightTheme {
                 Scaffold(topBar = {
-                    TopAppBar(title = { Text("FxxkMIUIAd") })
+                    TopAppBar(title = { Text(stringResource(R.string.app_name)) })
                 }) { innerPadding ->
                     Box(
                         modifier = Modifier
@@ -79,7 +80,7 @@ class MainComposeActivity : ComponentActivity() {
                         val context = LocalContext.current
                         if (!OsUtils.isMiui(context)) {
                             Text(
-                                "非 MIUI 或 澎湃 OS",
+                                stringResource(R.string.invalid_system),
                                 textAlign = TextAlign.Center,
                                 style = MaterialTheme.typography.bodyLarge
                             )
@@ -92,16 +93,16 @@ class MainComposeActivity : ComponentActivity() {
                             Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround) {
                                 Text(
                                     text = when (shizukuStatus) {
-                                        Ok, Outdated, NotAuthorized -> "Shizuku 已运行"
-                                        NotRunning, NotInstalled -> "Shizuku 未运行"
+                                        Ok, Outdated, NotAuthorized -> stringResource(R.string.shizuku_running)
+                                        NotRunning, NotInstalled -> stringResource(R.string.shizuku_not_running)
                                         else -> throw IllegalStateException()
                                     }, textAlign = TextAlign.Center
                                 )
 
                                 Text(
                                     text = when (shizukuStatus) {
-                                        Ok, Outdated -> "Shizuku 已授权"
-                                        NotRunning, NotAuthorized, NotInstalled -> "Shizuku 未授权"
+                                        Ok, Outdated -> stringResource(R.string.shizuku_authed)
+                                        NotRunning, NotAuthorized, NotInstalled -> stringResource(R.string.shizuku_not_authed)
                                         else -> throw IllegalStateException()
                                     }, textAlign = TextAlign.Center
                                 )
@@ -118,8 +119,8 @@ class MainComposeActivity : ComponentActivity() {
                                         packageManager.getApplicationEnableStateAsString(it)
                                     }.entries.joinToString("\n") { (name, state) -> "$name: $state" }
 
-                                    Outdated -> "Shizuku 版本过低，请更新"
-                                    NotInstalled -> "Shizuku 未安装"
+                                    Outdated -> stringResource(R.string.shizuku_low_version)
+                                    NotInstalled -> stringResource(R.string.shizuku_not_found)
                                     NotRunning, NotAuthorized -> ""
                                     else -> throw IllegalStateException()
                                 }, textAlign = TextAlign.Center)
@@ -173,12 +174,12 @@ fun EnableBtn() {
 
         showToast.value = true
     }) {
-        Text("启用")
+        Text(stringResource(R.string.enable))
     }
 
     LaunchedEffect(showToast.value) {
         if (showToast.value) {
-            Toast.makeText(context, "已启用", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, context.getString(R.string.enabled), Toast.LENGTH_SHORT).show()
             trigger.value = !trigger.value
             showToast.value = false
         }
@@ -204,12 +205,12 @@ fun DisableBtn() {
 
         showToast.value = true
     }) {
-        Text("禁用")
+        Text(stringResource(R.string.disable))
     }
 
     LaunchedEffect(showToast.value) {
         if (showToast.value) {
-            Toast.makeText(context, "已禁用", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, context.getString(R.string.disabled), Toast.LENGTH_SHORT).show()
             trigger.value = !trigger.value
             showToast.value = false
         }
@@ -226,7 +227,7 @@ fun InstallBtn() {
             })
         }
     }) {
-        Text("安装 Shizuku")
+        Text(stringResource(R.string.install_shizuku))
     }
 }
 
@@ -238,7 +239,7 @@ fun JumpBtn() {
             PackageUtils.startLaunchAppActivity(context, SHIZUKU)
         }
     }) {
-        Text("跳转到 Shizuku")
+        Text(stringResource(R.string.jump_to_shizuku))
     }
 }
 
@@ -249,7 +250,7 @@ fun RequestPermissionBtn() {
             Shizuku.requestPermission(0)
         }
     }) {
-        Text("申请 Shizuku 授权")
+        Text(stringResource(R.string.request_shizuku_auth))
     }
 }
 

diff --git a/app/src/main/java/com/qhy040404/fxxkmiuiad/utils/PackageUtils.kt b/app/src/main/java/com/qhy040404/fxxkmiuiad/utils/PackageUtils.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.IPackageManager
 import android.content.pm.PackageManager
+import com.qhy040404.fxxkmiuiad.R
 import org.lsposed.hiddenapibypass.HiddenApiBypass
 import rikka.shizuku.ShizukuBinderWrapper
 import rikka.shizuku.SystemServiceHelper
@@ -14,16 +15,19 @@ object PackageUtils {
             PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, PackageManager.COMPONENT_ENABLED_STATE_ENABLED -> {
                 try {
                     if (isPackageSuspended(pkg)) {
-                        "禁用 (suspend)"
+                        ResourceUtils.getString(R.string.package_disabled_by_suspend)
                     } else {
-                        "启用"
+                        ResourceUtils.getString(R.string.package_enabled)
                     }
-                } catch (e: PackageManager.NameNotFoundException) {
-                    "未安装"
+                } catch (_: PackageManager.NameNotFoundException) {
+                    ResourceUtils.getString(R.string.package_not_found)
                 }
             }
 
-            PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED -> "禁用"
+            PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED -> ResourceUtils.getString(
+                R.string.package_disabled
+            )
+
             else -> throw IllegalStateException()
         }
     }

diff --git a/app/src/main/java/com/qhy040404/fxxkmiuiad/utils/ResourceUtils.kt b/app/src/main/java/com/qhy040404/fxxkmiuiad/utils/ResourceUtils.kt
@@ -0,0 +1,10 @@
+package com.qhy040404.fxxkmiuiad.utils
+
+import androidx.annotation.StringRes
+import com.qhy040404.fxxkmiuiad.FxxkMIUIAdApp
+
+object ResourceUtils {
+    fun getString(@StringRes resId: Int): String {
+        return FxxkMIUIAdApp.app.getString(resId)
+    }
+}
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,22 @@
+<resources>
+    <string name="shizuku_not_found">Shizuku is not installed</string>
+    <string name="enable">Enable</string>
+    <string name="enabled">Enabled</string>
+    <string name="disable">Disable</string>
+    <string name="disabled">Disabled</string>
+    <string name="install_shizuku">Install Shizuku</string>
+    <string name="request_shizuku_auth">Request Shizuku authorization</string>
+    <string name="package_disabled_by_suspend">Disabled (suspend)</string>
+    <string name="package_enabled">Enabled</string>
+    <string name="package_not_found">Not Installed</string>
+    <string name="package_disabled">Disabled</string>
+    <string name="permission_result_failed">Authorization failed. Jump to Shizuku for manual authorization</string>
+    <string name="permission_manual_sui">Shizuku not detected, please go to Sui for authorization manually</string>
+    <string name="invalid_system">Not MIUI or HyperOS</string>
+    <string name="shizuku_running">Shizuku is running</string>
+    <string name="shizuku_not_running">Shizuku is not running</string>
+    <string name="shizuku_authed">Shizuku authorized</string>
+    <string name="shizuku_not_authed">Shizuku not authorized</string>
+    <string name="shizuku_low_version">Shizuku is outdated, please update</string>
+    <string name="jump_to_shizuku">Jump to Shizuku</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,23 @@
 <resources>
     <string name="app_name" translatable="false">FxxkMIUIAd</string>
+    <string name="permission_result_failed">授权失败，跳转到 Shizuku 手动授权</string>
+    <string name="permission_manual_sui">未检测到 Shizuku, 请手动前往 Sui 授权</string>
+    <string name="invalid_system">非 MIUI 或 澎湃 OS</string>
+    <string name="shizuku_running">Shizuku 已运行</string>
+    <string name="shizuku_not_running">Shizuku 未运行</string>
+    <string name="shizuku_authed">Shizuku 已授权</string>
+    <string name="shizuku_not_authed">Shizuku 未授权</string>
+    <string name="shizuku_low_version">Shizuku 版本过低，请更新</string>
+    <string name="shizuku_not_found">Shizuku 未安装</string>
+    <string name="enable">启用</string>
+    <string name="enabled">已启用</string>
+    <string name="disable">禁用</string>
+    <string name="disabled">已禁用</string>
+    <string name="install_shizuku">安装 Shizuku</string>
+    <string name="jump_to_shizuku">跳转到 Shizuku</string>
+    <string name="request_shizuku_auth">申请 Shizuku 授权</string>
+    <string name="package_disabled_by_suspend">禁用 (suspend)</string>
+    <string name="package_enabled">启用</string>
+    <string name="package_not_found">未安装</string>
+    <string name="package_disabled">禁用</string>
 </resources>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.7.2" apply false
-    id("com.android.library") version "8.7.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
+    id("com.android.application") version "8.7.3" apply false
+    id("com.android.library") version "8.7.3" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
     id("com.qhy04.gradle.android.res_opt") version "1.0.3" apply false
 }