Added "Open" function in menu bar

NickP0is0n · Jul 5, 2021 · 5d668af · 5d668af
1 parent 4a15e93
commit 5d668af
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/main/kotlin/me/nickp0is0n/easylocalize/main.kt b/src/main/kotlin/me/nickp0is0n/easylocalize/main.kt
@@ -8,6 +8,7 @@ fun main() = Window (
     resizable = false,
     size = IntSize(780, 455)
 ) {
+    System.setProperty("apple.laf.useScreenMenuBar", "true")
     val currentView = MainWindowView()
     MaterialTheme {
         currentView.MainUI()

diff --git a/src/main/kotlin/me/nickp0is0n/easylocalize/ui/MainWindowView.kt b/src/main/kotlin/me/nickp0is0n/easylocalize/ui/MainWindowView.kt
@@ -13,9 +13,10 @@ import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Notifier
+import androidx.compose.ui.window.*
 import me.nickp0is0n.easylocalize.models.LocalizedString
 import me.nickp0is0n.easylocalize.utils.LocalizeParser
 import java.awt.FileDialog
@@ -25,10 +26,15 @@ class MainWindowView {
     private lateinit var fieldValuesModel: FieldValuesViewModel
     private var selectedID = -1
     private val controller = MainWindowController()
+    private val waitForFile = mutableStateOf(false)
 
     @Composable
     fun MainUI() {
         val window = LocalAppWindow.current
+        window.setMenuBar(
+            AppMenuBar()
+        )
+
         Box(modifier = Modifier
             .background(color = Color(255, 255, 255))
             .fillMaxSize())
@@ -58,6 +64,7 @@ class MainWindowView {
                     Text(text ="Export translations to file...", color = Color.White)
                 }
             }
+            checkIfOpenButtonClicked()
         }
     }
 
@@ -184,6 +191,34 @@ class MainWindowView {
         val openDialog = FileDialog(window.window)
         openDialog.isVisible = true
         val stringFile = openDialog.files[0]
+        waitForFile.value = false
         return parser.fromFile(stringFile)
     }
+
+    @Composable
+    private fun checkIfOpenButtonClicked() {
+        if (waitForFile.value) {
+            val newList = retrieveStringList()
+            if (newList.isNotEmpty()) {
+                stringList.clear()
+                newList.forEach { stringList.add(it) }
+            }
+            //println("called")
+        }
+    }
+
+    @Composable
+    private fun AppMenuBar(): MenuBar =
+        MenuBar(
+            Menu(
+                name = "File",
+                MenuItem(
+                    name = "Open...",
+                    onClick = {
+                        waitForFile.value = true
+                    },
+                    shortcut = KeyStroke(Key.O)
+                )
+            )
+        )
 }