merge branch '213' into 203

eitanliu · Jul 18, 2023 · 216713c · 216713c
1 parent c7f061d
commit 216713c
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/src/main/kotlin/com/eitanliu/dart/mappable/settings/SettingLayout.kt b/src/main/kotlin/com/eitanliu/dart/mappable/settings/SettingLayout.kt
@@ -30,19 +30,13 @@ class SettingLayout(private val settings: Settings) : UnnamedConfigurable {
             }
         }
         row { label("Configure dart data model files suffix.") }
-
-            rowComment("Configure dart data model files suffix.")
-        }
         row {
             checkBox(
-                "auto run build_runner"
-            ).bindSelected(
-                graph.autoBuildRunner
+                "auto run build_runner", graph.autoBuildRunner
             ).applyToComponent {
                 toolTipText = "auto run 'flutter pub run build_runner build --delete-conflicting-outputs'"
             }
         }
-        buttonGroup(graph.implement, "Implement") {
         row("Implement") {
             subRowIndent = 1
             val group = ButtonGroup()
@@ -67,6 +61,16 @@ class SettingLayout(private val settings: Settings) : UnnamedConfigurable {
             row {
                 buildMappable(mappablePredicate)
             }
+
+            val freezedPredicate = graph.implement.selected(Implements.FREEZED)
+            row {
+                radioButton("freezed")
+                    .bindSelected(graph.implement, Implements.FREEZED, group)
+            }
+            // panel {
+            row {
+                buildFreezed(freezedPredicate)
+            }
         }
 
     }
@@ -111,28 +115,27 @@ class SettingLayout(private val settings: Settings) : UnnamedConfigurable {
                         constraints(pushX)
                     }
                 }
-                // row {
-                //     checkBox("copyWith", graph.enableCopyWith)
-                //     textField(graph.mappableCopyWith).apply {
-                //         constraints(pushX)
-                //     }
-                // }
+                row {
+                    checkBox("copyWith", graph.enableCopyWith)
+                    textField(graph.mappableCopyWith).apply {
+                        constraints(pushX)
+                    }
+                }
             }
         }
 
     }
 
 
-    private fun Panel.buildFreezed() {
-        indent {
+    private fun Row.buildFreezed(visibility: ComponentPredicate? = null) = nestedPanel(null, visibility) {
+        row {
+            subRowIndent = 2
             row {
-                checkBox("fromJson/toJson")
-                    .bindSelected(graph.freezedEnableJson)
+                checkBox("fromJson/toJson", graph.freezedEnableJson)
             }
         }
     }
 
-    private fun Panel.rowPanel(
     private fun LayoutBuilder.rowRanger(
         title: String? = null,
         visibility: ComponentPredicate? = null,