diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b168e19..9147885 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -65,6 +65,7 @@ android { } dependencies { + implementation(libs.kotlin.reflect) implementation(libs.lifecycle.runtime) implementation(libs.lifecycle.viewmodel) implementation(libs.activity.compose) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 984baf3..c2153b5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:windowSoftInputMode="adjustResize"> Column( modifier = Modifier - .padding(padding) + .consumeWindowInsets(padding) .fillMaxSize() .verticalScroll(rememberScrollState()) - .windowInsetsPadding(WindowInsets.allBars.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom)), + .padding(padding) + .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom)), horizontalAlignment = Alignment.CenterHorizontally ) { var testResult by remember { mutableStateOf?>(null) } @@ -108,6 +154,7 @@ class MainActivity : ComponentActivity() { ) }) } else { + Spacer(Modifier.height(20.dp)) Text( stringResource(R.string.unable_to_save_settings), modifier = Modifier.padding(horizontal = 20.dp) @@ -148,13 +195,14 @@ class MainActivity : ComponentActivity() { color = MaterialTheme.colorScheme.error ) } + Spacer(Modifier.height(20.dp)) if (testResult?.size == 3) { fun getString(on: String, off: String, input: List) = input.map { if (it) on else off }.toTypedArray() AlertDialog(onDismissRequest = { testResult = null }, confirmButton = { - Button(onClick = { testResult = null }) { + TextButton(onClick = { testResult = null }) { Text(stringResource(android.R.string.ok)) } }, title = { @@ -164,8 +212,8 @@ class MainActivity : ComponentActivity() { Text( stringResource( R.string.dialog_test_content, *getString( - stringResource(R.string.on), - stringResource(R.string.off), + stringResource(R.string.status_on), + stringResource(R.string.status_off), testResult ?: listOf(false, false, false) ) ) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 71bdaf2..d627673 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -6,8 +6,8 @@ Todas as alterações entrarão em vigor imediatamente Testar Status das opções do desenvolvedor: %1$s\nStatus da depuração USB: %2$s\nStatus da depuração por Wi-Fi: %3$s - Ativado - Desativado + Ativado + Desativado O módulo não está ativo Não foi possível salvar as configurações, todos os recursos estão ativados por padrão. Por favor, tente usar uma versão abaixo do Android 8.1 ou use o LSPosed para ativar o módulo. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2443437..4db65fb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -7,8 +7,8 @@ 所有更改将即时生效 测试 开发者模式状态:%1$s\nUSB 调试状态:%2$s\n无线调试状态:%3$s - 开启 - 关闭 + 开启 + 关闭 模块未激活 无法保存设置,默认启用全部功能。请尝试降低 Android 版本至 Android 8.1 以下或使用 LSPosed 框架并激活本模块。 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index a6b3dae..0000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5f1e7e1..d546dcb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,14 +1,14 @@ - IAmNotADeveloper + IAmNotADeveloper Hide development mode Hide USB debugging Hide wireless debugging All changes will take effect immediately Test Development mode status: %1$s\nUSB debugging status: %2$s\nWireless debugging status: %3$s - On - Off + On + Off Module not activated Unable to save settings, all features are enabled by default. Please try to lower your Android version to below Android 8.1 or use the LSPosed Framwork and activate this module. diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index aadbbf1..13daf34 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -4,7 +4,5 @@ \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4916688..38ab8d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ preference = "1.2.1" xposed-api = "82" [libraries] +kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }