impl: support for Toolbox 2.6.0.38881 (4)

- fix compiler errors for the Settings page
- associated strings converted to LocalizedString instances
- observable properties are now moved to Kotlin's StateFlow

Author: fioan89

src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt

@@ -65,7 +65,8 @@ class CoderRemoteProvider(
     private val settingsService = CoderSettingsService(settingsStore)
     private val settings: CoderSettings = CoderSettings(settingsService)
     private val secrets: CoderSecretsService = CoderSecretsService(secretsStore)
-    private val settingsPage: CoderSettingsPage = CoderSettingsPage(settingsService)
+    private val settingsPage: CoderSettingsPage =
+        CoderSettingsPage(serviceLocator, settingsService, i18n.ptrl("Coder Settings"))
     private val dialogUi = DialogUi(serviceLocator, settings)
     private val linkHandler = LinkHandler(serviceLocator, settings, httpClient, dialogUi)
 

src/main/kotlin/com/coder/toolbox/views/CoderPage.kt

@@ -22,7 +22,7 @@ import java.util.function.Consumer
  *       to use the mouse.
  */
 abstract class CoderPage(
-    private val serviceLocator: ServiceLocator,
+    serviceLocator: ServiceLocator,
     title: LocalizableString,
     showIcon: Boolean = true,
 ) : UiPage(title) {

src/main/kotlin/com/coder/toolbox/views/CoderSettingsPage.kt

@@ -1,11 +1,16 @@
 package com.coder.toolbox.views
 
 import com.coder.toolbox.services.CoderSettingsService
+import com.jetbrains.toolbox.api.core.ServiceLocator
+import com.jetbrains.toolbox.api.localization.LocalizableString
+import com.jetbrains.toolbox.api.localization.LocalizableStringFactory
 import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
 import com.jetbrains.toolbox.api.ui.components.CheckboxField
 import com.jetbrains.toolbox.api.ui.components.TextField
 import com.jetbrains.toolbox.api.ui.components.TextType
 import com.jetbrains.toolbox.api.ui.components.UiField
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 
 /**
  * A page for modifying Coder settings.
@@ -14,49 +19,60 @@ import com.jetbrains.toolbox.api.ui.components.UiField
  * TODO@JB: There is no scroll, and our settings do not fit.  As a consequence,
  *          I have not been able to test this page.
  */
-class CoderSettingsPage(private val settings: CoderSettingsService) : CoderPage("Coder Settings", false) {
+class CoderSettingsPage(
+    serviceLocator: ServiceLocator,
+    private val settings: CoderSettingsService,
+    title: LocalizableString,
+) : CoderPage(serviceLocator, title, false) {
+    private val i18n = serviceLocator.getService(LocalizableStringFactory::class.java)
+
     // TODO: Copy over the descriptions, holding until I can test this page.
-    private val binarySourceField = TextField("Binary source", settings.binarySource, TextType.General)
-    private val binaryDirectoryField = TextField("Binary directory", settings.binaryDirectory, TextType.General)
-    private val dataDirectoryField = TextField("Data directory", settings.dataDirectory, TextType.General)
-    private val enableDownloadsField = CheckboxField(settings.enableDownloads, "Enable downloads")
+    private val binarySourceField = TextField(i18n.ptrl("Binary source"), settings.binarySource, TextType.General)
+    private val binaryDirectoryField =
+        TextField(i18n.ptrl("Binary directory"), settings.binaryDirectory, TextType.General)
+    private val dataDirectoryField = TextField(i18n.ptrl("Data directory"), settings.dataDirectory, TextType.General)
+    private val enableDownloadsField = CheckboxField(settings.enableDownloads, i18n.ptrl("Enable downloads"))
     private val enableBinaryDirectoryFallbackField =
-        CheckboxField(settings.enableBinaryDirectoryFallback, "Enable binary directory fallback")
-    private val headerCommandField = TextField("Header command", settings.headerCommand, TextType.General)
-    private val tlsCertPathField = TextField("TLS cert path", settings.tlsCertPath, TextType.General)
-    private val tlsKeyPathField = TextField("TLS key path", settings.tlsKeyPath, TextType.General)
-    private val tlsCAPathField = TextField("TLS CA path", settings.tlsCAPath, TextType.General)
+        CheckboxField(settings.enableBinaryDirectoryFallback, i18n.ptrl("Enable binary directory fallback"))
+    private val headerCommandField = TextField(i18n.ptrl("Header command"), settings.headerCommand, TextType.General)
+    private val tlsCertPathField = TextField(i18n.ptrl("TLS cert path"), settings.tlsCertPath, TextType.General)
+    private val tlsKeyPathField = TextField(i18n.ptrl("TLS key path"), settings.tlsKeyPath, TextType.General)
+    private val tlsCAPathField = TextField(i18n.ptrl("TLS CA path"), settings.tlsCAPath, TextType.General)
     private val tlsAlternateHostnameField =
-        TextField("TLS alternate hostname", settings.tlsAlternateHostname, TextType.General)
-    private val disableAutostartField = CheckboxField(settings.disableAutostart, "Disable autostart")
+        TextField(i18n.ptrl("TLS alternate hostname"), settings.tlsAlternateHostname, TextType.General)
+    private val disableAutostartField = CheckboxField(settings.disableAutostart, i18n.ptrl("Disable autostart"))
 
-    override val fields: MutableList<UiField> = mutableListOf(
-        binarySourceField,
-        enableDownloadsField,
-        binaryDirectoryField,
-        enableBinaryDirectoryFallbackField,
-        dataDirectoryField,
-        headerCommandField,
-        tlsCertPathField,
-        tlsKeyPathField,
-        tlsCAPathField,
-        tlsAlternateHostnameField,
-        disableAutostartField,
+    override val fields: StateFlow<List<UiField>> = MutableStateFlow(
+        listOf(
+            binarySourceField,
+            enableDownloadsField,
+            binaryDirectoryField,
+            enableBinaryDirectoryFallbackField,
+            dataDirectoryField,
+            headerCommandField,
+            tlsCertPathField,
+            tlsKeyPathField,
+            tlsCAPathField,
+            tlsAlternateHostnameField,
+            disableAutostartField
+        )
     )
 
-    override val actionButtons: MutableList<RunnableActionDescription> = mutableListOf(
-        Action("Save", closesPage = true) {
-            settings.binarySource = binarySourceField.text.value
-            settings.binaryDirectory = binaryDirectoryField.text.value
-            settings.dataDirectory = dataDirectoryField.text.value
-            settings.enableDownloads = enableDownloadsField.checked.value
-            settings.enableBinaryDirectoryFallback = enableBinaryDirectoryFallbackField.checked.value
-            settings.headerCommand = headerCommandField.text.value
-            settings.tlsCertPath = tlsCertPathField.text.value
-            settings.tlsKeyPath = tlsKeyPathField.text.value
-            settings.tlsCAPath = tlsCAPathField.text.value
-            settings.tlsAlternateHostname = tlsAlternateHostnameField.text.value
-            settings.disableAutostart = disableAutostartField.checked.value
-        },
+    override val actionButtons: StateFlow<List<RunnableActionDescription>> = MutableStateFlow(
+        listOf(
+            Action(i18n.ptrl("Save"), closesPage = true) {
+                settings.binarySource = binarySourceField.textState.value
+                settings.binaryDirectory = binaryDirectoryField.textState.value
+                settings.dataDirectory = dataDirectoryField.textState.value
+                settings.enableDownloads = enableDownloadsField.checkedState.value
+                settings.enableBinaryDirectoryFallback = enableBinaryDirectoryFallbackField.checkedState.value
+                settings.headerCommand = headerCommandField.textState.value
+                settings.tlsCertPath = tlsCertPathField.textState.value
+                settings.tlsKeyPath = tlsKeyPathField.textState.value
+                settings.tlsCAPath = tlsCAPathField.textState.value
+                settings.tlsAlternateHostname = tlsAlternateHostnameField.textState.value
+                settings.disableAutostart = disableAutostartField.checkedState.value
+            },
+        )
     )
 }

src/main/resources/localization/defaultMessages.po

@@ -25,6 +25,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -74,4 +77,42 @@ msgid "Update"
 msgstr ""
 
 msgid "Settings"
-msgstr ""
+msgstr ""
+
+msgid "Coder Settings"
+msgstr ""
+
+msgid "Binary source"
+msgstr ""
+
+msgid "Binary directory"
+msgstr ""
+
+msgid "Data directory"
+msgstr ""
+
+msgid "Enable downloads"
+msgstr ""
+
+msgid "Enable binary directory fallback"
+msgstr ""
+
+msgid "Header command"
+msgstr ""
+
+msgid "TLS cert path"
+msgstr ""
+
+msgid "TLS key path"
+msgstr ""
+
+msgid "TLS CA path"
+msgstr ""
+
+msgid "TLS alternate hostname"
+msgstr ""
+
+msgid "Disable autostart"
+msgstr ""
+
+