GUI: list all tools

Author: cofcool

desktop-gui/compose/src/main/kotlin/Main.kt

@@ -1,16 +1,19 @@
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.Row
 import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
+import request.Request
 import view.ContentView
 import view.ToolsView
 
+
+val G_REQUEST = Request()
+
 @Composable
 @Preview
 fun App() {
-    var tool by remember { mutableStateOf("tool") }
 
     MaterialTheme {
         Row {

desktop-gui/compose/src/main/kotlin/request/network.kt

@@ -6,7 +6,6 @@ import io.ktor.client.plugins.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
-import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.json.Json
 import org.slf4j.LoggerFactory
@@ -55,9 +54,9 @@ class Request {
         }
     }
 
-    suspend fun getAllTools(): Set<String> {
+    suspend fun getAllTools(): List<String> {
         val r = client.get("/")
-        return r.body<Set<String>>()
+        return r.body<List<String>>()
     }
 
     suspend fun invokeTool(tools: Tools, input: Params): String {

desktop-gui/compose/src/main/kotlin/view/ContentView.kt

@@ -1,15 +1,15 @@
 package view
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Divider
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 
 @Preview
 @Composable
@@ -24,12 +24,7 @@ fun ContentView() {
         ) {
             Text("Contents")
         }
-        Row(modifier = Modifier.padding(2.dp)) {
-            Divider(
-                color = Color.LightGray,
-                modifier = Modifier.fillMaxWidth().height(1.dp)
-            )
-        }
+        grayDivider()
         Row {
             Text("Content")
         }

desktop-gui/compose/src/main/kotlin/view/ToolsView.kt

@@ -1,41 +1,61 @@
 package view
 
+import G_REQUEST
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Button
 import androidx.compose.material.Divider
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+import org.slf4j.LoggerFactory
+
+val logger = LoggerFactory.getLogger("tools")
 
 @Composable
 @Preview
 fun ToolsView() {
+    var tools by remember  { mutableStateOf(listOf<String>()) }
+    val scope = rememberCoroutineScope()
+    LaunchedEffect(true) {
+        scope.launch {
+            tools = try {
+                G_REQUEST.getAllTools()
+            } catch (e: Exception) {
+                logger.error("tools error",e)
+                listOf()
+            }
+        }
+    }
     Column {
         Row {
             Row {
-                Column(modifier = Modifier.width(120.dp)) {
+                Column(modifier = Modifier.width(150.dp)) {
                     Row {
                         Text(
                             "Tools",
                             textAlign = TextAlign.Center,
-                            modifier = Modifier.fillMaxWidth()
+                            modifier = Modifier.height(Dp(30F)).fillMaxWidth()
                         )
 
                     }
+                    grayDivider()
                     Row {
                         LazyColumn {
-                            items(5) {
+                            items(tools.size) {
+                                val d = tools[it % tools.size]
                                 Row(
                                     Modifier.fillMaxWidth(),
                                     horizontalArrangement = Arrangement.SpaceEvenly
                                 ) {
                                     Button(onClick = { println("$it") }) {
-                                        Text("Hello, $it")
+                                        Text(d)
                                     }
                                 }
                             }

desktop-gui/compose/src/main/kotlin/view/common.kt

@@ -0,0 +1,21 @@
+package view
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Divider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun grayDivider() {
+    Row(modifier = Modifier.padding(2.dp)) {
+        Divider(
+            color = Color.LightGray,
+            modifier = Modifier.fillMaxWidth().height(1.dp)
+        )
+    }
+}