From 576507a78d4056f5577dabfb43f4dde65665af7a Mon Sep 17 00:00:00 2001 From: BinTianqi Date: Sun, 30 Mar 2025 13:12:43 +0800 Subject: [PATCH] Update dependencies, bump version to v6.6 --- app/build.gradle.kts | 6 +++--- .../java/com/bintianqi/owndroid/dpm/Users.kt | 21 +++++++++---------- gradle/libs.versions.toml | 8 +++---- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ecc2839..b316e78 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) - kotlin("plugin.serialization") version "2.0.21" + kotlin("plugin.serialization") version "2.1.20" } android { @@ -24,8 +24,8 @@ android { applicationId = "com.bintianqi.owndroid" minSdk = 21 targetSdk = 35 - versionCode = 37 - versionName = "6.5" + versionCode = 38 + versionName = "6.6" multiDexEnabled = false } diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Users.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Users.kt index be03ff3..4731ca5 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/Users.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Users.kt @@ -64,15 +64,16 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties +import com.bintianqi.owndroid.HorizontalPadding import com.bintianqi.owndroid.R import com.bintianqi.owndroid.parseTimestamp import com.bintianqi.owndroid.showOperationResultToast -import com.bintianqi.owndroid.ui.InfoItem -import com.bintianqi.owndroid.ui.CheckBoxItem +import com.bintianqi.owndroid.ui.FullWidthCheckBoxItem import com.bintianqi.owndroid.ui.FunctionItem -import com.bintianqi.owndroid.ui.Notes +import com.bintianqi.owndroid.ui.InfoItem import com.bintianqi.owndroid.ui.ListItem import com.bintianqi.owndroid.ui.MyScaffold +import com.bintianqi.owndroid.ui.Notes import com.bintianqi.owndroid.ui.SwitchItem import com.bintianqi.owndroid.uriToStream import com.bintianqi.owndroid.yesOrNo @@ -343,26 +344,24 @@ fun CreateUserScreen(onNavigateUp: () -> Unit) { var createdUserSerialNumber by remember { mutableLongStateOf(-1) } var flag by remember { mutableIntStateOf(0) } val coroutine = rememberCoroutineScope() - MyScaffold(R.string.create_user, onNavigateUp) { + MyScaffold(R.string.create_user, onNavigateUp, 0.dp) { OutlinedTextField( - value = userName, - onValueChange = { userName= it }, + userName, { userName= it }, Modifier.fillMaxWidth().padding(horizontal = HorizontalPadding), label = { Text(stringResource(R.string.username)) }, - modifier = Modifier.fillMaxWidth(), keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), keyboardActions = KeyboardActions(onDone = { focusMgr.clearFocus() }) ) Spacer(Modifier.padding(vertical = 5.dp)) - CheckBoxItem( + FullWidthCheckBoxItem( R.string.create_user_skip_wizard, flag and DevicePolicyManager.SKIP_SETUP_WIZARD != 0 ) { flag = flag xor DevicePolicyManager.SKIP_SETUP_WIZARD } if(VERSION.SDK_INT >= 28) { - CheckBoxItem( + FullWidthCheckBoxItem( R.string.create_user_ephemeral_user, flag and DevicePolicyManager.MAKE_USER_EPHEMERAL != 0 ) { flag = flag xor DevicePolicyManager.MAKE_USER_EPHEMERAL } - CheckBoxItem( + FullWidthCheckBoxItem( R.string.create_user_enable_all_system_app, flag and DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED != 0 ) { flag = flag xor DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED } @@ -384,7 +383,7 @@ fun CreateUserScreen(onNavigateUp: () -> Unit) { withContext(Dispatchers.Main) { creating = false } } }, - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth().padding(horizontal = HorizontalPadding) ) { Text(stringResource(R.string.create)) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a62d83c..07c0b3d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -agp = "8.8.2" -kotlin = "2.0.21" +agp = "8.9.1" +kotlin = "2.1.20" -navigation-compose = "2.8.8" -composeBom = "2025.02.00" +navigation-compose = "2.8.9" +composeBom = "2025.03.01" accompanist-drawablepainter = "0.35.0-alpha" accompanist-permissions = "0.37.0" shizuku = "13.1.5" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09b077f..3ac8cd1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,8 @@ #Fri Jan 12 20:22:20 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip -#distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-8.10.2-bin.zip -#distributionUrl=https://mirrors.aliyun.com/gradle/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +#distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-8.13-bin.zip +#distributionUrl=https://mirrors.aliyun.com/gradle/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists