manager: Modify the display logic of safe_mode (#125)
Signed-off-by: WenHao2130 <wenhao2130@outlook.com>
This commit is contained in:
@@ -375,6 +375,11 @@ private fun StatusCard(
|
|||||||
systemStatus.ksuVersion != null -> {
|
systemStatus.ksuVersion != null -> {
|
||||||
|
|
||||||
val workingModeText = when {
|
val workingModeText = when {
|
||||||
|
Natives.isSafeMode == true -> stringResource(id = R.string.safe_mode)
|
||||||
|
else -> stringResource(id = R.string.home_working)
|
||||||
|
}
|
||||||
|
|
||||||
|
val workingModeSurfaceText = when {
|
||||||
systemStatus.lkmMode == true -> "LKM"
|
systemStatus.lkmMode == true -> "LKM"
|
||||||
systemStatus.lkmMode == null && systemStatus.kernelVersion.isGKI1() -> "GKI-1.0"
|
systemStatus.lkmMode == null && systemStatus.kernelVersion.isGKI1() -> "GKI-1.0"
|
||||||
systemStatus.lkmMode == false || systemStatus.kernelVersion.isGKI() -> "GKI-2.0"
|
systemStatus.lkmMode == false || systemStatus.kernelVersion.isGKI() -> "GKI-2.0"
|
||||||
@@ -394,7 +399,7 @@ private fun StatusCard(
|
|||||||
modifier = Modifier.fillMaxWidth()
|
modifier = Modifier.fillMaxWidth()
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(id = R.string.home_working),
|
text = workingModeText,
|
||||||
style = MaterialTheme.typography.titleMedium,
|
style = MaterialTheme.typography.titleMedium,
|
||||||
color = MaterialTheme.colorScheme.onSurface
|
color = MaterialTheme.colorScheme.onSurface
|
||||||
)
|
)
|
||||||
@@ -408,7 +413,7 @@ private fun StatusCard(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = workingModeText,
|
text = workingModeSurfaceText,
|
||||||
style = MaterialTheme.typography.labelMedium,
|
style = MaterialTheme.typography.labelMedium,
|
||||||
color = MaterialTheme.colorScheme.onSecondary,
|
color = MaterialTheme.colorScheme.onSecondary,
|
||||||
modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
|
modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||||
@@ -417,20 +422,13 @@ private fun StatusCard(
|
|||||||
|
|
||||||
Spacer(Modifier.width(6.dp))
|
Spacer(Modifier.width(6.dp))
|
||||||
|
|
||||||
// 机器架构标签或者安全模式标签
|
|
||||||
val labelText = if (Natives.isSafeMode) {
|
|
||||||
stringResource(id = R.string.safe_mode)
|
|
||||||
} else {
|
|
||||||
Os.uname().machine
|
|
||||||
}
|
|
||||||
|
|
||||||
Surface(
|
Surface(
|
||||||
shape = RoundedCornerShape(4.dp),
|
shape = RoundedCornerShape(4.dp),
|
||||||
color = MaterialTheme.colorScheme.primary,
|
color = MaterialTheme.colorScheme.primary,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = labelText,
|
text = Os.uname().machine,
|
||||||
style = MaterialTheme.typography.labelMedium,
|
style = MaterialTheme.typography.labelMedium,
|
||||||
color = MaterialTheme.colorScheme.onSecondary,
|
color = MaterialTheme.colorScheme.onSecondary,
|
||||||
modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
|
modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||||
|
|||||||
Reference in New Issue
Block a user