From 19bea75e5cc16545ee1c27e6056fcb1e41639809 Mon Sep 17 00:00:00 2001
From: kaleidot725 <hakodate.katsuragawa.yusuke@gmail.com>
Date: Tue, 28 May 2024 22:31:52 +0900
Subject: [PATCH] feat: fix theme style

---
 .../jp/kaleidot725/adbpad/view/common/resource/Color.kt     | 6 +-----
 .../adbpad/view/component/command/CommandItem.kt            | 2 +-
 .../adbpad/view/component/language/LanguageDropButton.kt    | 3 ++-
 .../jp/kaleidot725/adbpad/view/component/menu/MenuItem.kt   | 2 ++
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/common/resource/Color.kt b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/common/resource/Color.kt
index 5cbf3dcb..29e469e9 100644
--- a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/common/resource/Color.kt
+++ b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/common/resource/Color.kt
@@ -19,9 +19,5 @@ fun Modifier.selectedBackground(isSelected: Boolean): Modifier {
 
 @Composable
 fun Modifier.selectorBorder(): Modifier {
-    return this.border(
-        width = 2.dp,
-        color = MaterialTheme.colors.primary.copy(alpha = 0.5f),
-        shape = RoundedCornerShape(8.dp),
-    )
+    return this.border(shape = RoundedCornerShape(8.dp), color = MaterialTheme.colors.primary, width = 1.dp)
 }
diff --git a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/command/CommandItem.kt b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/command/CommandItem.kt
index f8943a83..7197d7dd 100644
--- a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/command/CommandItem.kt
+++ b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/command/CommandItem.kt
@@ -30,7 +30,7 @@ fun CommandItem(
     Card(modifier, elevation = 1.dp) {
         Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxHeight().padding(8.dp)) {
             Text(text = title, fontWeight = FontWeight.Bold)
-            Text(text = detail, modifier = Modifier.weight(0.9f, true))
+            Text(text = detail)
             Button(onClick = { onExecute() }, enabled = canExecute, modifier = Modifier.align(Alignment.End)) {
                 when {
                     isRunning -> RunningIndicator()
diff --git a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/language/LanguageDropButton.kt b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/language/LanguageDropButton.kt
index e08b2186..cf5f7e42 100644
--- a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/language/LanguageDropButton.kt
+++ b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/language/LanguageDropButton.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import jp.kaleidot725.adbpad.domain.model.language.Language
+import jp.kaleidot725.adbpad.view.common.resource.selectorBorder
 
 @Composable
 fun LanguageDropButton(
@@ -38,7 +39,7 @@ fun LanguageDropButton(
             modifier =
                 Modifier
                     .width(200.dp)
-                    .border(shape = RoundedCornerShape(8.dp), color = MaterialTheme.colors.primary, width = 1.dp)
+                    .selectorBorder()
                     .clickable { expanded = true }
                     .padding(vertical = 8.dp, horizontal = 12.dp),
         ) {
diff --git a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/menu/MenuItem.kt b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/menu/MenuItem.kt
index c0041d4b..f809adee 100644
--- a/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/menu/MenuItem.kt
+++ b/src/jvmMain/kotlin/jp/kaleidot725/adbpad/view/component/menu/MenuItem.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 
 @Composable
 fun MenuItem(
@@ -35,6 +36,7 @@ fun MenuItem(
         Text(
             text = text,
             style = MaterialTheme.typography.subtitle2,
+            lineHeight = 20.sp,
             modifier = Modifier.align(Alignment.CenterVertically),
         )
     }