feat: override toString() method of custom config types

So they will perform like other Java / Kotlin type when calling `toString()`
osfans · Apr 25, 2024 · d11dcf8 · d11dcf8
1 parent cd91ded
commit d11dcf8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt
@@ -188,7 +188,7 @@ class Keyboard() {
             keyboardConfig!!["keys"]!!.configList
                 .map {
                     it!!.configMap.entries.associate { (k, v) ->
-                        k to v!!.configValue.getString()
+                        k to v!!
                     }
                 }
         horizontalGap =
@@ -425,7 +425,7 @@ class Keyboard() {
                 Configuration.ORIENTATION_LANDSCAPE -> keyboardHeightLand.takeIf { it > 0 } ?: keyboardHeight
                 else -> keyboardHeight
             }
-        return appContext.dp(value).toInt()
+        return appContext.dp(value)
     }
 
     private fun getKeyboardHeightFromKeyboardConfig(keyboardConfig: Map<String, Any?>?): Int {

diff --git a/app/src/main/java/com/osfans/trime/util/CollectionUtils.kt b/app/src/main/java/com/osfans/trime/util/CollectionUtils.kt
@@ -4,8 +4,6 @@
 
 package com.osfans.trime.util
 
-import com.osfans.trime.util.config.ConfigValue
-
 object CollectionUtils {
     @JvmStatic
     fun <K, V> getOrDefault(
@@ -42,10 +40,7 @@ object CollectionUtils {
     ): String {
         if (map.isNullOrEmpty() || key.isEmpty()) return defValue
         val v = obtainValue(map, key)
-        return when (v) {
-            is ConfigValue? -> v?.getString()
-            else -> v?.toString()
-        } ?: defValue
+        return v?.toString() ?: defValue
     }
 
     @JvmStatic

diff --git a/app/src/main/java/com/osfans/trime/util/config/ConfigTypes.kt b/app/src/main/java/com/osfans/trime/util/config/ConfigTypes.kt
@@ -56,7 +56,7 @@ abstract class ConfigItem(val node: YamlNode) {
         item: ConfigItem,
         expectedType: String,
     ): Nothing {
-        throw IllegalArgumentException("Expected element to be $expectedType bus is ${item::class.simpleName}")
+        throw IllegalArgumentException("Expected element to be $expectedType but is ${item::class.simpleName}")
     }
 }
 
@@ -75,6 +75,8 @@ class ConfigValue(private val scalar: YamlScalar) : ConfigItem(scalar) {
     override fun isEmpty() = scalar.content.isEmpty()
 
     override fun contentToString(): String = scalar.contentToString()
+
+    override fun toString(): String = scalar.content
 }
 
 /** The wrapper of [YamlList] */
@@ -111,6 +113,9 @@ class ConfigList(private val list: YamlList) : ConfigItem(list), List<ConfigItem
     override fun indexOf(element: ConfigItem?): Int = items.indexOf(element)
 
     fun getValue(index: Int) = get(index)?.configValue
+
+    // just like other Java / Kotlin collection type
+    override fun toString(): String = items.joinToString(prefix = "[", postfix = "]")
 }
 
 class ConfigMap(private val map: YamlMap) : ConfigItem(map), Map<String, ConfigItem?> {
@@ -140,4 +145,7 @@ class ConfigMap(private val map: YamlMap) : ConfigItem(map), Map<String, ConfigI
     override operator fun get(key: String): ConfigItem? = entries.firstOrNull { it.key == key }?.value
 
     fun getValue(key: String): ConfigValue? = get(key)?.configValue
+
+    // just like other Java / Kotlin map type
+    override fun toString(): String = entries.joinToString(prefix = "{", postfix = "}") { (key, value) -> "$key=$value" }
 }