Merge branch 'feature/windows-os' into 'main'

Sunny Chung · Sunny Chung · commit 27f09dab5dea · 2023-11-01T16:18:11.000Z
Windows OS

See merge request products/hello-http!1
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/CodeEditorView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/CodeEditorView.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import com.sunnychung.application.multiplatform.hellohttp.extension.insert
 import com.sunnychung.application.multiplatform.hellohttp.util.log
+import com.sunnychung.application.multiplatform.hellohttp.ux.compose.TextField
 import com.sunnychung.application.multiplatform.hellohttp.ux.compose.TextFieldColors
 import com.sunnychung.application.multiplatform.hellohttp.ux.compose.TextFieldDefaults
 import com.sunnychung.application.multiplatform.hellohttp.ux.local.LocalColor
@@ -55,17 +56,18 @@ fun CodeEditorView(
 
     val themeColours = LocalColor.current
 
-    var textValue by remember { mutableStateOf(TextFieldValue(text = text)) }
-    if (textValue.text != text) {
-        textValue = textValue.copy(text = text)
-    }
+    // Replace "\r\n" by "\n" because to workaround the issue:
+    // https://github.com/JetBrains/compose-multiplatform/issues/3877
+    var textValue by remember(text) { mutableStateOf(TextFieldValue(text = text.replace("\r\n", "\n"))) }
+    log.d { "CodeEditorView recompose" }
 
     fun onPressEnterAddIndent() {
         val cursorPos = textValue.selection.min
         assert(textValue.selection.length == 0)
 
         log.d { "onPressEnterAddIndent" }
 
+        val text = textValue.text
         var lastLineStart = getLineStart(text, cursorPos)
         var spacesMatch = "^(\\s+)".toRegex().matchAt(text.substring(lastLineStart, cursorPos), 0)
         val newSpaces = "\n" + (spacesMatch?.groups?.get(1)?.value ?: "")
@@ -77,6 +79,7 @@ fun CodeEditorView(
     log.v { "cursor at ${textValue.selection}" }
     fun onPressTab(isShiftPressed: Boolean) {
         val selection = textValue.selection
+        val text = textValue.text
         if (selection.length == 0) {
             val cursorPos = selection.min
             val newSpaces = " ".repeat(4)
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/FileDialog.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/FileDialog.kt
@@ -2,32 +2,56 @@ package com.sunnychung.application.multiplatform.hellohttp.ux
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.window.AwtWindow
+import com.sunnychung.application.multiplatform.hellohttp.util.log
+import com.sunnychung.application.multiplatform.hellohttp.ux.viewmodel.FileDialogState
+import com.sunnychung.lib.multiplatform.kdatetime.KDuration
+import com.sunnychung.lib.multiplatform.kdatetime.KFixedTimeUnit
+import com.sunnychung.lib.multiplatform.kdatetime.KInstant
 import java.awt.FileDialog
 import java.awt.Frame
 import java.io.File
 
+/**
+ * Due to the bug stated in {@link FileDialogState}, result of onCloseRequest has 3 cases:
+ * 1. non-empty list -> user selected a file
+ * 2. empty list -> user clicked cancel
+ * 3. null -> internally cancel
+ */
 @Composable
 fun FileDialog(
     parent: Frame? = null,
+    state: FileDialogState,
     mode: Int = FileDialog.LOAD,
     filename: String? = null,
-    onCloseRequest: (result: List<File>) -> Unit
-) = AwtWindow(
-    create = {
-        object : FileDialog(parent, "Choose a file", mode) {
-            init {
-                if (filename != null) {
-                    file = filename
+    onCloseRequest: (result: List<File>?) -> Unit
+) {
+    log.d { "FileDialog 1" }
+    val lastCloseTime = state.lastCloseTime.value
+    if (lastCloseTime != null && KInstant.now() - lastCloseTime < KDuration.Companion.of(1, KFixedTimeUnit.Second)) {
+        onCloseRequest(null)
+        return
+    }
+    log.d { "FileDialog 2 $lastCloseTime" }
+    AwtWindow(
+        create = {
+            log.d { "FileDialog create" }
+            object : FileDialog(parent, "Choose a file", mode) {
+                init {
+                    if (filename != null) {
+                        file = filename
+                    }
                 }
-            }
 
-            override fun setVisible(b: Boolean) {
-                super.setVisible(b)
-                if (b) {
-                    onCloseRequest(this.files.toList())
+                override fun setVisible(b: Boolean) {
+                    super.setVisible(b)
+                    log.d { "FileDialog setVisible $b" }
+                    if (b) {
+                        onCloseRequest(this.files.toList())
+                        state.lastCloseTime.value = KInstant.now()
+                    }
                 }
             }
-        }
-    },
-    dispose = FileDialog::dispose
-)
+        },
+        dispose = FileDialog::dispose
+    )
+}
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/KeyValueEditorView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/KeyValueEditorView.kt
@@ -27,11 +27,13 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import com.sunnychung.application.multiplatform.hellohttp.model.FieldValueType
 import com.sunnychung.application.multiplatform.hellohttp.model.UserKeyValuePair
+import com.sunnychung.application.multiplatform.hellohttp.util.log
 import com.sunnychung.application.multiplatform.hellohttp.util.uuidString
 import com.sunnychung.application.multiplatform.hellohttp.ux.local.LocalColor
 import com.sunnychung.application.multiplatform.hellohttp.ux.transformation.EnvironmentVariableTransformation
 import com.sunnychung.application.multiplatform.hellohttp.ux.transformation.FunctionTransformation
 import com.sunnychung.application.multiplatform.hellohttp.ux.transformation.MultipleVisualTransformation
+import com.sunnychung.application.multiplatform.hellohttp.ux.viewmodel.rememberFileDialogState
 import java.io.File
 
 @Composable
@@ -54,12 +56,15 @@ fun KeyValueEditorView(
 
     var isShowFileDialog by remember { mutableStateOf(false) }
     var fileDialogRequest by remember { mutableStateOf<Int?>(null) }
+    val fileDialogState = rememberFileDialogState()
 
     if (isShowFileDialog) {
-        FileDialog {
+        FileDialog(state = fileDialogState) {
             println("File Dialog result = $it")
-            val index = fileDialogRequest!!
-            onItemChange(index, keyValues[index].copy(value = it.firstOrNull()?.absolutePath ?: ""))
+            if (it != null) {
+                val index = fileDialogRequest!!
+                onItemChange(index, keyValues[index].copy(value = it.firstOrNull()?.absolutePath ?: ""))
+            }
             isShowFileDialog = false
         }
     }
@@ -175,7 +180,7 @@ fun KeyValueEditorView(
                             text = file?.name ?: "Choose a File",
                             color = if (isEnabled) colors.primary else colors.disabled,
                             onClick = if (!isInheritedView) {
-                                { fileDialogRequest = index; isShowFileDialog = true }
+                                { log.d {"onClick file"}; fileDialogRequest = index; isShowFileDialog = true }
                             } else null,
                             modifier = Modifier.weight(0.6f).border(width = 1.dp, color = colors.placeholder)
                         )
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/RequestEditorView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/RequestEditorView.kt
@@ -58,6 +58,7 @@ import com.sunnychung.application.multiplatform.hellohttp.ux.local.LocalFont
 import com.sunnychung.application.multiplatform.hellohttp.ux.transformation.EnvironmentVariableTransformation
 import com.sunnychung.application.multiplatform.hellohttp.ux.transformation.JsonSyntaxHighlightTransformation
 import com.sunnychung.application.multiplatform.hellohttp.ux.viewmodel.EditNameViewModel
+import com.sunnychung.application.multiplatform.hellohttp.ux.viewmodel.rememberFileDialogState
 import java.io.File
 
 @Composable
@@ -696,10 +697,11 @@ fun BinaryFileInputView(modifier: Modifier = Modifier, filePath: String?, onFile
     val colours = LocalColor.current
 
     var isShowFileDialog by remember { mutableStateOf(false) }
+    val fileDialogState = rememberFileDialogState()
 
     if (isShowFileDialog) {
-        FileDialog {
-            if (it.isNotEmpty()) {
+        FileDialog(state = fileDialogState) {
+            if (it != null && it.isNotEmpty()) {
                 onFilePathUpdate(it.first().absolutePath)
             }
             isShowFileDialog = false
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/SettingDialogView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/SettingDialogView.kt
@@ -40,6 +40,7 @@ import com.sunnychung.application.multiplatform.hellohttp.model.ColourTheme
 import com.sunnychung.application.multiplatform.hellohttp.model.DEFAULT_BACKUP_RETENTION_DAYS
 import com.sunnychung.application.multiplatform.hellohttp.util.log
 import com.sunnychung.application.multiplatform.hellohttp.ux.local.LocalColor
+import com.sunnychung.application.multiplatform.hellohttp.ux.viewmodel.rememberFileDialogState
 import com.sunnychung.lib.multiplatform.kdatetime.KZonedInstant
 import kotlinx.coroutines.runBlocking
 import java.awt.Desktop
@@ -116,10 +117,13 @@ private fun DataTab(modifier: Modifier = Modifier, closeDialog: () -> Unit) {
 
             var isShowFileDialog by remember { mutableStateOf(false) }
             var file by remember { mutableStateOf<File?>(null) }
+            val fileDialogState = rememberFileDialogState()
             if (isShowFileDialog) {
-                FileDialog {
+                FileDialog(state = fileDialogState) {
                     println("File Dialog result = $it")
-                    file = it.firstOrNull()
+                    if (it != null) {
+                        file = it.firstOrNull()
+                    }
                     isShowFileDialog = false
                 }
             }
@@ -184,6 +188,7 @@ private fun DataTab(modifier: Modifier = Modifier, closeDialog: () -> Unit) {
             var exportFileFormat by remember { mutableStateOf(ExportFormat.values().first()) }
             var isShowDirectoryPicker by remember { mutableStateOf(false) }
             var isShowFileDialog by remember { mutableStateOf(false) }
+            val fileDialogState = rememberFileDialogState()
 
             Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                 AppText(text = "Choose project(s) to export")
@@ -241,9 +246,9 @@ private fun DataTab(modifier: Modifier = Modifier, closeDialog: () -> Unit) {
             }
             if (isShowFileDialog) {
                 val dateTimeString = KZonedInstant.nowAtLocalZoneOffset().format("yyyy-MM-dd--HH-mm-ss")
-                FileDialog(mode = java.awt.FileDialog.SAVE, filename = "Hello-HTTP_dump_$dateTimeString.dump") {
+                FileDialog(state = fileDialogState, mode = java.awt.FileDialog.SAVE, filename = "Hello-HTTP_dump_$dateTimeString.dump") {
                     isShowFileDialog = false
-                    val file = it.firstOrNull()
+                    val file = it?.firstOrNull()
 
                     file?.takeIf { exportFileFormat == ExportFormat.`Hello HTTP Data Dump` }?.let { file ->
                         // TODO suspend instead of runBlocking
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/StatusBarView.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/StatusBarView.kt
@@ -26,7 +26,7 @@ fun StatusBarView(modifier: Modifier = Modifier) {
 
     var isShowSettingDialog by remember { mutableStateOf(false) }
 
-    Box(modifier = modifier.fillMaxWidth().height(22.dp).background(colors.backgroundLight).padding(4.dp)) {
+    Box(modifier = modifier.fillMaxWidth().height(22.dp).background(colors.backgroundLight).padding(horizontal = 4.dp)) {
         AppText(
             text = "v${metadataManager.version} (${metadataManager.gitCommitHash})",
             fontSize = 12.sp,
diff --git a/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/viewmodel/FileDialogState.kt b/src/jvmMain/kotlin/com/sunnychung/application/multiplatform/hellohttp/ux/viewmodel/FileDialogState.kt
@@ -0,0 +1,17 @@
+package com.sunnychung.application.multiplatform.hellohttp.ux.viewmodel
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import com.sunnychung.lib.multiplatform.kdatetime.KInstant
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * This class exists as a workaround to the bug that
+ * "Modifier.clickable" is invoked twice in the Windows OS.
+ */
+class FileDialogState {
+    val lastCloseTime = MutableStateFlow<KInstant?>(null)
+}
+
+@Composable
+fun rememberFileDialogState() = remember { FileDialogState() }
