android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Opt InfoCard component, add icon support, improve information presentation

Browse Source
This commit is contained in:
ShirkNeko
2025-04-23 22:23:02 +08:00
parent f669ad92b6
commit 8aef775474
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt
View File

@@ -49,6 +49,7 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
import androidx.compose.animation.shrinkVertically import androidx.compose.animation.shrinkVertically
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.graphics.vector.ImageVector
import com.sukisu.ultra.ui.theme.CardConfig import com.sukisu.ultra.ui.theme.CardConfig
import androidx.core.content.edit import androidx.core.content.edit
import java.io.BufferedReader import java.io.BufferedReader
@@ -573,7 +574,7 @@ private fun InfoCard() {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(start = 24.dp, top = 24.dp, end = 24.dp, bottom = 16.dp) .padding(start = 24.dp, top = 24.dp, end = 24.dp, bottom = 16.dp),
) withContext@{ ) withContext@{
val contents = StringBuilder() val contents = StringBuilder()
val uname = Os.uname() val uname = Os.uname()
@@ -582,40 +583,41 @@ private fun InfoCard() {
fun InfoCardItem( fun InfoCardItem(
label: String, label: String,
content: String, content: String,
icon: ImageVector = Icons.Default.Info
) { ) {
contents.appendLine(label).appendLine(content).appendLine() contents.appendLine(label).appendLine(content).appendLine()
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
imageVector = icon,
contentDescription = label,
modifier = Modifier.size(24.dp)
)
Spacer(modifier = Modifier.width(16.dp))
Column {
Text(text = label, style = MaterialTheme.typography.bodyLarge) Text(text = label, style = MaterialTheme.typography.bodyLarge)
Text(text = content, style = MaterialTheme.typography.bodyMedium) Text(text = content, style = MaterialTheme.typography.bodyMedium)
} }
}
}
InfoCardItem(stringResource(R.string.home_kernel), uname.release) InfoCardItem(stringResource(R.string.home_kernel), uname.release, icon = Icons.Default.Memory)
if (!isSimpleMode) { if (!isSimpleMode) {
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
val androidVersion = Build.VERSION.RELEASE val androidVersion = Build.VERSION.RELEASE
InfoCardItem(stringResource(R.string.home_android_version), androidVersion) InfoCardItem(stringResource(R.string.home_android_version), androidVersion, icon = Icons.Default.Android)
} }
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
val deviceModel = getDeviceModel(context) val deviceModel = getDeviceModel(context)
InfoCardItem(stringResource(R.string.home_device_model), deviceModel) InfoCardItem(stringResource(R.string.home_device_model), deviceModel, icon = Icons.Default.PhoneAndroid)
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
val managerVersion = getManagerVersion(context) val managerVersion = getManagerVersion(context)
InfoCardItem( InfoCardItem(stringResource(R.string.home_manager_version), "${managerVersion.first} (${managerVersion.second})", icon = Icons.Default.Settings)
stringResource(R.string.home_manager_version),
"${managerVersion.first} (${managerVersion.second})"
)
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
InfoCardItem(stringResource(R.string.home_selinux_status), getSELinuxStatus()) InfoCardItem(stringResource(R.string.home_selinux_status), getSELinuxStatus(), icon = Icons.Default.Security)
if (!isSimpleMode) { if (!isSimpleMode) {
if (lkmMode != true) { if (lkmMode != true) {
@@ -634,7 +636,7 @@ private fun InfoCard() {
displayVersion = "${stringResource(R.string.supported)} ($kpmVersion)" displayVersion = "${stringResource(R.string.supported)} ($kpmVersion)"
} }
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
InfoCardItem(stringResource(R.string.home_kpm_version), displayVersion) InfoCardItem(stringResource(R.string.home_kpm_version), displayVersion, icon = Icons.Default.Code)
} }
} }
@@ -660,9 +662,7 @@ private fun InfoCard() {
} }
} }
InfoCardItem( InfoCardItem(
stringResource(R.string.home_susfs_version), stringResource(R.string.home_susfs_version), infoText, icon = Icons.Default.Storage)
infoText
)
} }
} }
} }