feat: 修改设置页面

Greatwallcorner · Jun 22, 2024 · f142994 · f142994
1 parent 3caa186
commit f142994
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/composeApp/src/commonMain/kotlin/com/corner/ui/Settings.kt b/composeApp/src/commonMain/kotlin/com/corner/ui/Settings.kt
@@ -40,6 +40,7 @@ import com.corner.catvodcore.util.Paths
 import com.corner.database.Db
 import com.corner.init.initConfig
 import com.corner.ui.decompose.component.DefaultSettingComponent
+import com.corner.ui.decompose.component.getSetting
 import com.corner.ui.scene.BackRow
 import com.corner.ui.scene.Dialog
 import com.corner.ui.scene.HoverableText
@@ -51,22 +52,22 @@ import java.awt.Desktop
 import java.net.URI
 
 @Composable
-fun SettingItem(modifier: Modifier, label: String, value: String?, onClick: () -> Unit) {
+fun SettingItem(modifier: Modifier, setting: Setting, onClick: (Setting) -> Unit) {
     Row(
         modifier
             .clickable {
-                onClick()
+                onClick(setting)
             }.shadow(3.dp)
             .background(MaterialTheme.colorScheme.background, shape = RoundedCornerShape(4.dp))
             .padding(start = 20.dp, end = 20.dp)
     ) {
         Text(
-            label,
+            setting.label,
             modifier = Modifier.padding(vertical = 8.dp, horizontal = 15.dp),
             color = MaterialTheme.colorScheme.onBackground
         )
         Text(
-            text = if (StringUtil.isBlank(value)) "无" else value ?: "",
+            text = if (StringUtil.isBlank(setting.value)) "无" else setting.value ?: "",
             modifier = Modifier.padding(vertical = 8.dp, horizontal = 15.dp)
                 .weight(0.5f),
             color = MaterialTheme.colorScheme.onBackground
@@ -113,10 +114,24 @@ fun SettingScene(component: DefaultSettingComponent, onClickBack: () -> Unit) {
 //                IconButton(modifier = Modifier.align(Alignment.End), onClick = {showAboutDialog = true}){ Icon(Icons.Default.Info, "About", tint = MaterialTheme.colorScheme.onSecondary) }
             }
             LazyColumn {
-                items(model.value.settingList) {
-                    SettingItem(
-                        Modifier, it.label, it.value
-                    ) {
+//                items(model.value.settingList) {
+//                    SettingItem(
+//                        Modifier, it.label, it.value
+//                    ) {
+//                        showEditDialog = true
+//                        currentChoose = it
+//                    }
+//                }
+                item {
+                    val setting = model.value.settingList.getSetting(SettingType.VOD)
+                    SettingItem(Modifier, setting!!){
+                        showEditDialog = true
+                        currentChoose = it
+                    }
+                }
+                item {
+                    val setting = model.value.settingList.getSetting(SettingType.LOG)
+                    SettingItem(Modifier, setting!!){
                         showEditDialog = true
                         currentChoose = it
                     }

diff --git a/...oseApp/src/commonMain/kotlin/com/corner/ui/decompose/component/DefaultSettingComponent.kt b/...oseApp/src/commonMain/kotlin/com/corner/ui/decompose/component/DefaultSettingComponent.kt
@@ -3,7 +3,9 @@ package com.corner.ui.decompose.component
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.value.MutableValue
 import com.arkivanov.decompose.value.update
+import com.corner.bean.Setting
 import com.corner.bean.SettingStore
+import com.corner.bean.SettingType
 import com.corner.ui.decompose.SettingComponent
 
 class DefaultSettingComponent(componentContext: ComponentContext):SettingComponent, ComponentContext by componentContext {
@@ -13,4 +15,8 @@ class DefaultSettingComponent(componentContext: ComponentContext):SettingCompone
     override fun sync() {
         _model.update { it.copy(settingList = SettingStore.getSettingList(), version = _model.value.version + 1) }
     }
+}
+
+fun List<Setting>.getSetting(type:SettingType):Setting?{
+    return this.find { it.id == type.id }
 }