兼容夜间模式 (#33)

* 兼容夜间模式 * fastlane * 修改键盘配色 --------- Co-authored-by: huangwenlong06 <[email protected]>
ssttkkl · Aug 26, 2024 · d4dcba4 · d4dcba4
1 parent fa1ff8d
commit d4dcba4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/...p/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/appscaffold/AppScaffold.kt b/...p/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/appscaffold/AppScaffold.kt
@@ -1,5 +1,6 @@
 package io.ssttkkl.mahjongutils.app.components.appscaffold
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -13,6 +14,7 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.NavigationDrawerItem
@@ -114,7 +116,7 @@ fun AppScaffold(
             TileImeHost {
                 if (!appState.useNavigationDrawer) {
                     with(Spacing.current) {
-                        Row {
+                        Row(Modifier.background(MaterialTheme.colorScheme.surface)) {
                             val menuScrollState = rememberScrollState()
                             ScrollBox(menuScrollState) {
                                 Column(Modifier.width(200.dp).verticalScroll(menuScrollState)) {

diff --git a/composeApp/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/tileime/TileIme.kt b/composeApp/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/tileime/TileIme.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.KeyboardArrowUp
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
@@ -20,7 +21,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.unit.dp
 import io.ssttkkl.mahjongutils.app.components.backhandler.BackHandler
 import io.ssttkkl.mahjongutils.app.components.clickableButNotFocusable
@@ -78,7 +79,7 @@ fun TileIme(
 
     Column(
         modifier
-            .background(Color.LightGray.copy(alpha = 0.4f)),
+            .background(MaterialTheme.colorScheme.surfaceContainer),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         headerContainer {
@@ -103,9 +104,11 @@ fun TileIme(
                         .size(24.dp, 24.dp)
                         .align(Alignment.CenterStart),
                     alignment = Alignment.Center,
+                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
                 )
 
-                Row(Modifier.align(Alignment.CenterEnd)) {
+                Row(Modifier.align(Alignment.CenterEnd)
+                    .padding(start = 8.dp)) {
                     Image(
                         painterResource(Res.drawable.icon_content_copy),
                         "",
@@ -116,6 +119,7 @@ fun TileIme(
                             }
                             .padding(4.dp)
                             .size(24.dp, 24.dp),
+                        colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
                     )
 
                     Image(
@@ -134,6 +138,7 @@ fun TileIme(
                             }
                             .padding(4.dp)
                             .size(24.dp, 24.dp),
+                        colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
                     )
                 }
             }

diff --git a/...seApp/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/tileime/TileImeHost.kt b/...seApp/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/tileime/TileImeHost.kt
@@ -80,7 +80,8 @@ private fun TileImeHostFloating(
                                 Icon(
                                     painterResource(Res.drawable.icon_drag_handle),
                                     "",
-                                    Modifier.align(Alignment.Center)
+                                    Modifier.align(Alignment.Center),
+                                    tint = MaterialTheme.colorScheme.onSurface
                                 )
                             }
                             it()

diff --git a/...oseApp/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/tileime/TileImeKey.kt b/...oseApp/src/commonMain/kotlin/io/ssttkkl/mahjongutils/app/components/tileime/TileImeKey.kt
@@ -15,7 +15,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
@@ -41,7 +40,7 @@ sealed class TileImeKey<T : TileImeKey<T>> : KeyboardKeyItem {
                     .fillMaxSize()
                     .padding(4.dp)
                     .clip(RoundedCornerShape(8.dp))
-                    .background(Color.White)
+                    .background(MaterialTheme.colorScheme.background)
                     .clickableButNotFocusable(interactionSource, onLongPress, onClick),
                 Alignment.Center
             ) {

diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
@@ -1,2 +1 @@
-Riichi Mahjong Calculator, supporting features such as hand
-efficiency, winning hand analysis, and more.
+Riichi Mahjong Calculator, featuring hand efficiency calculation, and more.