From a81201f368c690da503d8bb8bde4a69d7605b8f3 Mon Sep 17 00:00:00 2001 From: Light_summer <93428659+lightsummer233@users.noreply.github.com> Date: Sat, 30 Mar 2024 21:00:44 +0800 Subject: [PATCH] manager: Fix round corner for Module Info Card (#1565) | Before | After | | :----- | :----- | | ![Screenshot_20240330-183552](https://github.com/tiann/KernelSU/assets/93428659/b42b2e90-2d52-4d0f-964a-2288aeec3d8a) | ![Screenshot_20240330-183539](https://github.com/tiann/KernelSU/assets/93428659/8272cd5e-6bfc-4444-9bac-19d95cc4b9cb) | --- .../main/java/me/weishu/kernelsu/ui/screen/Flash.kt | 4 ++-- .../main/java/me/weishu/kernelsu/ui/screen/Module.kt | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Flash.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Flash.kt index 27d49e6f..aac12c36 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Flash.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Flash.kt @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Save import androidx.compose.material3.* @@ -175,7 +175,7 @@ private fun TopBar(onBack: () -> Unit = {}, onSave: () -> Unit = {}) { navigationIcon = { IconButton( onClick = onBack - ) { Icon(Icons.Filled.ArrowBack, contentDescription = null) } + ) { Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null) } }, actions = { IconButton(onClick = onSave) { diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt index b8690fd1..9812e87e 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt @@ -30,10 +30,10 @@ import androidx.compose.material.pullrefresh.pullRefresh import androidx.compose.material.pullrefresh.rememberPullRefreshState import androidx.compose.material3.Button import androidx.compose.material3.CardDefaults -import androidx.compose.material3.Divider import androidx.compose.material3.ElevatedCard import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold @@ -433,15 +433,13 @@ private fun ModuleItem( onClick: (ModuleViewModel.ModuleInfo) -> Unit ) { ElevatedCard( - modifier = Modifier - .fillMaxWidth() - .clickable { onClick(module) }, + modifier = Modifier.fillMaxWidth(), colors = CardDefaults.elevatedCardColors(containerColor = MaterialTheme.colorScheme.surface) ) { val textDecoration = if (!module.remove) null else TextDecoration.LineThrough - Column(modifier = Modifier.padding(24.dp, 16.dp, 24.dp, 0.dp)) { + Column(modifier = Modifier.clickable { onClick(module) }.padding(24.dp, 16.dp, 24.dp, 0.dp)) { Row( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, @@ -506,7 +504,7 @@ private fun ModuleItem( Spacer(modifier = Modifier.height(16.dp)) - Divider(thickness = Dp.Hairline) + HorizontalDivider(thickness = Dp.Hairline) Row( horizontalArrangement = Arrangement.SpaceBetween,