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

fix some bugs in dark mode

Browse Source
This commit is contained in:
BinTianqi
2024-03-11 20:38:12 +08:00
parent 88630471b3
commit 38679507a4
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/binbin/androidowner/MainActivity.kt
View File

@@ -85,7 +85,7 @@ fun MyScaffold(){
modifier = Modifier modifier = Modifier
.statusBarsPadding() .statusBarsPadding()
.fillMaxSize() .fillMaxSize()
.background(color = if(isSystemInDarkTheme()) { colorScheme.background }else{ colorScheme.primary.copy(alpha = 0.05F) }) .background(color = if(isSystemInDarkTheme()) { Color(0xFF000000) }else{ colorScheme.primary.copy(alpha = 0.05F) })
.imePadding() .imePadding()
.pointerInput(Unit) {detectTapGestures(onTap = {focusMgr.clearFocus()})}, .pointerInput(Unit) {detectTapGestures(onTap = {focusMgr.clearFocus()})},
enterTransition = Animations().navHostEnterTransition, enterTransition = Animations().navHostEnterTransition,
@@ -128,14 +128,14 @@ private fun HomePage(navCtrl:NavHostController){
else if(myDpm.isAdminActive(myComponent)){"Device Admin"}else{""} else if(myDpm.isAdminActive(myComponent)){"Device Admin"}else{""}
Column(modifier = Modifier.verticalScroll(rememberScrollState())) { Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
Spacer(Modifier.padding(vertical = 18.dp)) Spacer(Modifier.padding(vertical = 18.dp))
Text(text = stringResource(R.string.app_name), style = typography.headlineLarge, modifier = Modifier.padding(start = 10.dp)) Text(text = stringResource(R.string.app_name), style = typography.headlineLarge, modifier = Modifier.padding(start = 10.dp), color = colorScheme.onBackground)
Spacer(Modifier.padding(vertical = 8.dp)) Spacer(Modifier.padding(vertical = 8.dp))
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 8.dp, horizontal = 8.dp) .padding(vertical = 8.dp, horizontal = 8.dp)
.clip(RoundedCornerShape(15)) .clip(RoundedCornerShape(15))
.background(color = colorScheme.primaryContainer) .background(color = colorScheme.primary)
.clickable(onClick = { navCtrl.navigate("Permissions") }) .clickable(onClick = { navCtrl.navigate("Permissions") })
.padding(vertical = 16.dp), .padding(vertical = 16.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
@@ -144,17 +144,17 @@ private fun HomePage(navCtrl:NavHostController){
Icon( Icon(
painter = painterResource(if(myDpm.isAdminActive(myComponent)){ R.drawable.check_circle_fill1 }else{ R.drawable.block_fill0 }), painter = painterResource(if(myDpm.isAdminActive(myComponent)){ R.drawable.check_circle_fill1 }else{ R.drawable.block_fill0 }),
contentDescription = null, contentDescription = null,
tint = colorScheme.primary tint = colorScheme.onPrimary
) )
Spacer(modifier = Modifier.fillMaxWidth(0.05F)) Spacer(modifier = Modifier.fillMaxWidth(0.05F))
Column { Column {
Text( Text(
text = if(myDpm.isAdminActive(myComponent)){"已激活"}else{"未激活"}, text = if(myDpm.isAdminActive(myComponent)){"已激活"}else{"未激活"},
style = typography.headlineSmall, style = typography.headlineSmall,
color = colorScheme.onPrimaryContainer, color = colorScheme.onPrimary,
modifier = Modifier.padding(bottom = 2.dp) modifier = Modifier.padding(bottom = 2.dp)
) )
if(activateType!=""){ Text(text = activateType, color = colorScheme.onPrimaryContainer, modifier = Modifier.padding(start = 2.dp)) } if(activateType!=""){ Text(text = activateType, color = colorScheme.onPrimary, modifier = Modifier.padding(start = 2.dp)) }
} }
} }
HomePageItem(R.string.device_ctrl, R.drawable.mobile_phone_fill0, "SystemManage", navCtrl) HomePageItem(R.string.device_ctrl, R.drawable.mobile_phone_fill0, "SystemManage", navCtrl)

12
app/src/main/java/com/binbin/androidowner/Setting.kt
View File

@@ -97,15 +97,14 @@ private fun About(){
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clickable { shareLink(myContext, "https://github.com/BinTianqi/AndroidOwner/blob/master/Guide.md") } .clickable { shareLink(myContext, "https://github.com/BinTianqi/AndroidOwner/blob/master/Guide.md") }
.padding(start = 8.dp, bottom = 4.dp) .padding(start = 8.dp, bottom = 8.dp)
){ ){
Icon( Icon(
painter = painterResource(id = R.drawable.open_in_new), painter = painterResource(id = R.drawable.open_in_new),
contentDescription = null, contentDescription = null,
modifier = Modifier.padding(start = 6.dp, end = 10.dp), modifier = Modifier.padding(start = 6.dp, end = 10.dp)
tint = colorScheme.primary
) )
Text(text = stringResource(R.string.user_guide), style = typography.titleLarge, color = colorScheme.onPrimaryContainer, modifier = Modifier.padding(bottom = 2.dp)) Text(text = stringResource(R.string.user_guide), style = typography.titleLarge, modifier = Modifier.padding(bottom = 2.dp))
} }
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@@ -117,10 +116,9 @@ private fun About(){
Icon( Icon(
painter = painterResource(id = R.drawable.open_in_new), painter = painterResource(id = R.drawable.open_in_new),
contentDescription = null, contentDescription = null,
modifier = Modifier.padding(start = 6.dp, end = 10.dp), modifier = Modifier.padding(start = 6.dp, end = 10.dp)
tint = colorScheme.primary
) )
Text(text = stringResource(R.string.source_code), style = typography.titleLarge, color = colorScheme.onPrimaryContainer, modifier = Modifier.padding(bottom = 2.dp)) Text(text = stringResource(R.string.source_code), style = typography.titleLarge, modifier = Modifier.padding(bottom = 2.dp))
} }
} }
} }