feat: add logging for config changes and refactor setting selection to use radio buttons

Author: purofle

NMSLCore/src/main/kotlin/com/github/purofle/nmsl/config/Config.kt

@@ -3,6 +3,8 @@ package com.github.purofle.nmsl.config
 import com.github.purofle.nmsl.utils.json.JsonUtils.toJsonObject
 import com.github.purofle.nmsl.utils.json.JsonUtils.toJsonString
 import com.github.purofle.nmsl.utils.os.OS
+import org.apache.log4j.LogManager
+import org.slf4j.LoggerFactory
 import kotlin.io.path.createDirectories
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
@@ -25,6 +27,7 @@ object Config {
     }
 
     operator fun setValue(nothing: Nothing?, property: KProperty<*>, nmslConfig: NmslConfig) {
+        LogManager.getLogger(this::class.java).info("Config has been changed to ${nmslConfig.toJsonString()}")
         createConfig(nmslConfig)
     }
 }

src/main/kotlin/com/github/purofle/nmsl/main.kt

@@ -15,7 +15,6 @@ fun main() {
         Config.createConfig(NmslConfig())
     }
 
-
     application {
         Window(
             title = "NMSLauncher",

src/main/kotlin/com/github/purofle/nmsl/pages/SettingPage.kt

@@ -1,18 +1,12 @@
 package com.github.purofle.nmsl.pages
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material3.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.DpOffset
-import androidx.compose.ui.unit.dp
 import com.github.purofle.nmsl.config.Config
 import com.github.purofle.nmsl.config.LauncherConfig
 import com.github.purofle.nmsl.download.DownloadProvider
@@ -25,69 +19,23 @@ class SettingPage : Page {
         var gameSource by remember { mutableStateOf("${config.launcherConfig.provider}源") }
 
         Scaffold {
-            LazyColumn {
-                item {
-                    SettingSelectItem(
-                        title = "游戏资源下载源",
-                        items = DownloadProvider.providers.keys.map {
-                            SettingItem("${it}源") {
-                                gameSource = "${it}源"
-                                config = config.copy(launcherConfig = LauncherConfig(provider = it))
-                            }
-                        },
-                        defaultItem = gameSource
-                    )
+            Column {
+                Text("游戏下载源")
+                Row {
+                    DownloadProvider.providers.keys.forEach {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            Text("${it}源")
+                            RadioButton(
+                                selected = gameSource == "${it}源",
+                                onClick = {
+                                    gameSource = "${it}源"
+                                    config = config.copy(launcherConfig = LauncherConfig(provider = it))
+                                },
+                            )
+                        }
+                    }
                 }
             }
         }
     }
-}
-
-data class SettingItem(
-    val title: String,
-    val onClick: () -> Unit
-)
-
-@Composable
-fun SettingSelectItem(
-    title: String,
-    items: List<SettingItem>,
-    defaultItem: String
-) {
-
-    var expanded by remember { mutableStateOf(false) }
-
-    Column(modifier = Modifier.padding(12.dp)) {
-        Text(title)
-        Spacer(modifier = Modifier.height(6.dp))
-        Row(
-            modifier = Modifier
-                .height(32.dp)
-                .background(MaterialTheme.colorScheme.secondaryContainer, RoundedCornerShape(2.dp))
-                .clickable { expanded = !expanded },
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Text(defaultItem, modifier = Modifier.padding(start = 12.dp))
-            Icon(
-                imageVector = Icons.Default.ArrowDropDown,
-                contentDescription = null,
-                modifier = Modifier.padding(start = 48.dp, end = 12.dp)
-            )
-        }
-    }
-    DropdownMenu(
-        expanded = expanded,
-        onDismissRequest = { expanded = false },
-        offset = DpOffset(12.dp, 0.dp)
-    ) {
-        items.forEach {
-            DropdownMenuItem(
-                text = { Text(it.title) },
-                onClick = {
-                    expanded = false
-                    it.onClick()
-                }
-            )
-        }
-    }
 }