awfixer/OwnDroid
1
0
Fork 0
mirror of https://github.com/awfixers-stuff/OwnDroid.git synced 2026-03-23 11:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies, bump version to v6.6

Browse Source
This commit is contained in:
BinTianqi
2025-03-30 13:12:43 +08:00
parent 5f75f9c847
commit 576507a78d
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle.kts
View File

@@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose) alias(libs.plugins.compose)
kotlin("plugin.serialization") version "2.0.21" kotlin("plugin.serialization") version "2.1.20"
} }
android { android {
@@ -24,8 +24,8 @@ android {
applicationId = "com.bintianqi.owndroid" applicationId = "com.bintianqi.owndroid"
minSdk = 21 minSdk = 21
targetSdk = 35 targetSdk = 35
versionCode = 37 versionCode = 38
versionName = "6.5" versionName = "6.6"
multiDexEnabled = false multiDexEnabled = false
} }

21
app/src/main/java/com/bintianqi/owndroid/dpm/Users.kt
View File

@@ -64,15 +64,16 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogProperties
import com.bintianqi.owndroid.HorizontalPadding
import com.bintianqi.owndroid.R import com.bintianqi.owndroid.R
import com.bintianqi.owndroid.parseTimestamp import com.bintianqi.owndroid.parseTimestamp
import com.bintianqi.owndroid.showOperationResultToast import com.bintianqi.owndroid.showOperationResultToast
import com.bintianqi.owndroid.ui.InfoItem import com.bintianqi.owndroid.ui.FullWidthCheckBoxItem
import com.bintianqi.owndroid.ui.CheckBoxItem
import com.bintianqi.owndroid.ui.FunctionItem 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.ListItem
import com.bintianqi.owndroid.ui.MyScaffold import com.bintianqi.owndroid.ui.MyScaffold
import com.bintianqi.owndroid.ui.Notes
import com.bintianqi.owndroid.ui.SwitchItem import com.bintianqi.owndroid.ui.SwitchItem
import com.bintianqi.owndroid.uriToStream import com.bintianqi.owndroid.uriToStream
import com.bintianqi.owndroid.yesOrNo import com.bintianqi.owndroid.yesOrNo
@@ -343,26 +344,24 @@ fun CreateUserScreen(onNavigateUp: () -> Unit) {
var createdUserSerialNumber by remember { mutableLongStateOf(-1) } var createdUserSerialNumber by remember { mutableLongStateOf(-1) }
var flag by remember { mutableIntStateOf(0) } var flag by remember { mutableIntStateOf(0) }
val coroutine = rememberCoroutineScope() val coroutine = rememberCoroutineScope()
MyScaffold(R.string.create_user, onNavigateUp) { MyScaffold(R.string.create_user, onNavigateUp, 0.dp) {
OutlinedTextField( OutlinedTextField(
value = userName, userName, { userName= it }, Modifier.fillMaxWidth().padding(horizontal = HorizontalPadding),
onValueChange = { userName= it },
label = { Text(stringResource(R.string.username)) }, label = { Text(stringResource(R.string.username)) },
modifier = Modifier.fillMaxWidth(),
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = { focusMgr.clearFocus() }) keyboardActions = KeyboardActions(onDone = { focusMgr.clearFocus() })
) )
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
CheckBoxItem( FullWidthCheckBoxItem(
R.string.create_user_skip_wizard, R.string.create_user_skip_wizard,
flag and DevicePolicyManager.SKIP_SETUP_WIZARD != 0 flag and DevicePolicyManager.SKIP_SETUP_WIZARD != 0
) { flag = flag xor DevicePolicyManager.SKIP_SETUP_WIZARD } ) { flag = flag xor DevicePolicyManager.SKIP_SETUP_WIZARD }
if(VERSION.SDK_INT >= 28) { if(VERSION.SDK_INT >= 28) {
CheckBoxItem( FullWidthCheckBoxItem(
R.string.create_user_ephemeral_user, R.string.create_user_ephemeral_user,
flag and DevicePolicyManager.MAKE_USER_EPHEMERAL != 0 flag and DevicePolicyManager.MAKE_USER_EPHEMERAL != 0
) { flag = flag xor DevicePolicyManager.MAKE_USER_EPHEMERAL } ) { flag = flag xor DevicePolicyManager.MAKE_USER_EPHEMERAL }
CheckBoxItem( FullWidthCheckBoxItem(
R.string.create_user_enable_all_system_app, R.string.create_user_enable_all_system_app,
flag and DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED != 0 flag and DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED != 0
) { flag = flag xor DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED } ) { flag = flag xor DevicePolicyManager.LEAVE_ALL_SYSTEM_APPS_ENABLED }
@@ -384,7 +383,7 @@ fun CreateUserScreen(onNavigateUp: () -> Unit) {
withContext(Dispatchers.Main) { creating = false } withContext(Dispatchers.Main) { creating = false }
} }
}, },
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth().padding(horizontal = HorizontalPadding)
) { ) {
Text(stringResource(R.string.create)) Text(stringResource(R.string.create))
} }

8
gradle/libs.versions.toml
View File

@@ -1,9 +1,9 @@
[versions] [versions]
agp = "8.8.2" agp = "8.9.1"
kotlin = "2.0.21" kotlin = "2.1.20"
navigation-compose = "2.8.8" navigation-compose = "2.8.9"
composeBom = "2025.02.00" composeBom = "2025.03.01"
accompanist-drawablepainter = "0.35.0-alpha" accompanist-drawablepainter = "0.35.0-alpha"
accompanist-permissions = "0.37.0" accompanist-permissions = "0.37.0"
shizuku = "13.1.5" shizuku = "13.1.5"

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,8 +1,8 @@
#Fri Jan 12 20:22:20 CST 2024 #Fri Jan 12 20:22:20 CST 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/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.10.2-bin.zip #distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-8.13-bin.zip
#distributionUrl=https://mirrors.aliyun.com/gradle/gradle-8.10.2-bin.zip #distributionUrl=https://mirrors.aliyun.com/gradle/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists