refactor: remove deprecated theme setting fields from data classes

osfans · Feb 20, 2025 · 8e8f8d3 · 8e8f8d3
1 parent 4ac5d7f
commit 8e8f8d3
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 82 deletions.
diff --git a/app/src/main/java/com/osfans/trime/data/theme/mapper/CompositionWindowStyleMapper.kt b/app/src/main/java/com/osfans/trime/data/theme/mapper/CompositionWindowStyleMapper.kt
diff --git a/app/src/main/java/com/osfans/trime/data/theme/mapper/GeneralStyleMapper.kt b/app/src/main/java/com/osfans/trime/data/theme/mapper/GeneralStyleMapper.kt
@@ -71,16 +71,6 @@ class GeneralStyleMapper(
                 LayoutStyleMapper(it).map()
             }
 
-        val window =
-            (getList("window")).map {
-                val compositionWindowStyleMapper = CompositionWindowStyleMapper(it.configMap)
-                compositionWindowStyleMapper.map()
-            }
-        val liquidKeyboardWindow =
-            (getList("liquid_keyboard_window")).map {
-                val mapper = CompositionWindowStyleMapper(it.configMap)
-                mapper.map()
-            }
         val keyFont = getStringList("key_font")
         val keyBorder = getInt("key_border")
 
@@ -184,8 +174,6 @@ class GeneralStyleMapper(
             keyboardPaddingLand,
             keyboardPaddingLandBottom,
             layout,
-            window,
-            liquidKeyboardWindow,
             keyFont,
             keyBorder,
             keyHeight,

diff --git a/app/src/main/java/com/osfans/trime/data/theme/model/CompositionComponent.kt b/app/src/main/java/com/osfans/trime/data/theme/model/CompositionComponent.kt
diff --git a/app/src/main/java/com/osfans/trime/data/theme/model/GeneralStyle.kt b/app/src/main/java/com/osfans/trime/data/theme/model/GeneralStyle.kt
@@ -33,8 +33,6 @@ data class GeneralStyle(
     val keyboardPaddingLand: Int,
     val keyboardPaddingLandBottom: Int,
     val layout: Layout,
-    val window: List<CompositionComponent>,
-    val liquidKeyboardWindow: List<CompositionComponent>,
     val keyFont: List<String>,
     val keyBorder: Int,
     val keyHeight: Int,

diff --git a/app/src/test/java/com/osfans/trime/data/theme/GeneralStyleTest.kt b/app/src/test/java/com/osfans/trime/data/theme/GeneralStyleTest.kt
@@ -64,14 +64,8 @@ class GeneralStyleTest :
                     generalStyle.enterLabel shouldNotBe null
                     generalStyle.enterLabel.go shouldBe "go"
 
-                    generalStyle.window shouldNotBe null
-                    generalStyle.window.size shouldBe 0
-
                     generalStyle.layout shouldNotBe null
 
-                    generalStyle.liquidKeyboardWindow shouldNotBe null
-                    generalStyle.liquidKeyboardWindow.size shouldBe 0
-
                     println("Error: " + mapper.errors.size + ", " + mapper.errors.joinToString(","))
                     mapper.errors.size shouldBeGreaterThan 0
                 }