refactor(dialog): extract character create dialog

xetra11 · Dec 17, 2020 · c117e59 · c117e59
1 parent 9627568
commit c117e59
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/...ra11/ck3workbench/app/view/CurrentView.kt → .../ck3workbench/app/view/CurrentMainView.kt b/...ra11/ck3workbench/app/view/CurrentView.kt → .../ck3workbench/app/view/CurrentMainView.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import com.github.xetra11.ck3workbench.app.ViewManager
 
 @Composable
-fun CurrentView() {
+fun CurrentMainView() {
     when (ViewManager.currentView.value) {
         ViewManager.View.CHARACTER_VIEW -> CharacterModuleView()
         ViewManager.View.OTHER_VIEW -> DynastieModuleView()

diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/app/view/DialogView.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/app/view/DialogView.kt
@@ -7,11 +7,17 @@ import com.github.xetra11.ck3workbench.app.DialogManager
 
 @Composable
 fun DialogView() {
-    if (DialogManager.currentDialog.value == DialogManager.Dialog.CREATE_CHARACTER) {
-        Dialog(onDismissRequest = {
-            DialogManager.currentDialog.value = DialogManager.Dialog.NO_DIALOG
-        }){
-            Text("Create New Character")
-        }
+    when (DialogManager.currentDialog.value) {
+        DialogManager.Dialog.CREATE_CHARACTER -> CreateCharacterDialog()
+        DialogManager.Dialog.NO_DIALOG -> {}
+    }
+}
+
+@Composable
+private fun CreateCharacterDialog(){
+    Dialog(onDismissRequest = {
+        DialogManager.currentDialog.value = DialogManager.Dialog.NO_DIALOG
+    }){
+        Text("Create New Character")
     }
 }
diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -6,14 +6,12 @@ import androidx.compose.foundation.shape.CutCornerShape
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Shapes
-import androidx.compose.material.Text
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.Menu
 import androidx.compose.ui.window.MenuBar
 import androidx.compose.ui.window.MenuItem
@@ -23,7 +21,7 @@ import com.github.xetra11.ck3workbench.app.notifications.NotificationPanel
 import com.github.xetra11.ck3workbench.app.ui.MainUiComponents
 import com.github.xetra11.ck3workbench.app.view.DialogView
 import com.github.xetra11.ck3workbench.module.character.importer.CharacterScriptImporter
-import com.github.xetra11.ck3workbench.module.character.view.CurrentView
+import com.github.xetra11.ck3workbench.module.character.view.CurrentMainView
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.awt.FileDialog
@@ -70,7 +68,7 @@ fun main() = invokeLater {
         ) {
             DialogView() // is only rendered when dialog is toggled true
             Column(Modifier.fillMaxSize()) {
-                MainUiComponents.MainLayoutRow { CurrentView() }
+                MainUiComponents.MainLayoutRow { CurrentMainView() }
                 MainUiComponents.NotificationPanelRow { NotificationPanel() }
             }
         }