feat: added connect/disconnect button in charge point screen

monta-app · Sep 8, 2024 · 02c555a · 02c555a
1 parent dcc7b65
commit 02c555a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 36 deletions.
diff --git a/common/src/jvmMain/kotlin/com/monta/ocpp/emulator/common/components/TextTooltip.kt b/common/src/jvmMain/kotlin/com/monta/ocpp/emulator/common/components/TextTooltip.kt
@@ -14,9 +14,11 @@ import androidx.compose.ui.unit.dp
 @Composable
 fun TextTooltip(
     text: String,
+    modifier: Modifier = Modifier,
     content: @Composable () -> Unit
 ) {
     TooltipArea(
+        modifier = modifier,
         tooltip = {
             Card(
                 modifier = Modifier.padding(8.dp),

diff --git a/...src/jvmMain/kotlin/com/monta/ocpp/emulator/chargepoint/view/components/ChargePointCard.kt b/...src/jvmMain/kotlin/com/monta/ocpp/emulator/chargepoint/view/components/ChargePointCard.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.unit.sp
 import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
 import com.monta.ocpp.emulator.common.components.MontaIcon
 import com.monta.ocpp.emulator.common.components.MontaStateIcon
-import com.monta.ocpp.emulator.common.components.TextTooltip
 import com.monta.ocpp.emulator.common.components.getCardStyle
 import com.monta.ocpp.emulator.common.components.toKilowattString
 import com.monta.ocpp.emulator.common.idValue
@@ -123,41 +122,6 @@ fun TextWithLabel(
     }
 }
 
-/**
- * Displays the state of a charge point,
- * and allows the user to connect or disconnect the charge point quickly
- */
-@Composable
-private fun ChargePointConnectionButton(
-    chargePoint: ChargePointDAO
-) {
-    val connectionManager: ConnectionManager by injectAnywhere()
-
-    TextTooltip(
-        text = if (chargePoint.connected) {
-            "Disconnect charge point"
-        } else {
-            "Connect charge point"
-        }
-    ) {
-        IconButton(
-            onClick = {
-                if (chargePoint.connected) {
-                    connectionManager.disconnect(chargePoint.idValue)
-                } else {
-                    connectionManager.connect(chargePoint.idValue)
-                }
-            }
-        ) {
-            MontaStateIcon(
-                state = chargePoint.connected,
-                onState = "stop_circle",
-                offState = "play_circle"
-            )
-        }
-    }
-}
-
 @Composable
 private fun ChargePointEditButton(
     chargePoint: ChargePointDAO

diff --git a/...vmMain/kotlin/com/monta/ocpp/emulator/chargepoint/view/components/ChargePointComponent.kt b/...vmMain/kotlin/com/monta/ocpp/emulator/chargepoint/view/components/ChargePointComponent.kt
@@ -52,6 +52,10 @@ fun chargePointComponent(
                     text = "Charge Point",
                     style = MaterialTheme.typography.h5
                 )
+                ChargePointConnectionButton(
+                    chargePoint = chargePoint,
+                    modifier = Modifier.align(Alignment.CenterEnd)
+                )
             }
 
             Text(

diff --git a/...kotlin/com/monta/ocpp/emulator/chargepoint/view/components/ChargePointConnectionButton.kt b/...kotlin/com/monta/ocpp/emulator/chargepoint/view/components/ChargePointConnectionButton.kt
@@ -0,0 +1,48 @@
+package com.monta.ocpp.emulator.chargepoint.view.components
+
+import androidx.compose.material.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
+import com.monta.ocpp.emulator.common.components.MontaStateIcon
+import com.monta.ocpp.emulator.common.components.TextTooltip
+import com.monta.ocpp.emulator.common.idValue
+import com.monta.ocpp.emulator.common.util.injectAnywhere
+import com.monta.ocpp.emulator.v16.connection.ConnectionManager
+
+/**
+ * Displays the state of a charge point,
+ * and allows the user to connect or disconnect the charge point quickly
+ */
+@Composable
+fun ChargePointConnectionButton(
+    chargePoint: ChargePointDAO,
+    modifier: Modifier = Modifier
+) {
+    val connectionManager: ConnectionManager by injectAnywhere()
+
+    TextTooltip(
+        modifier = modifier,
+        text = if (chargePoint.connected) {
+            "Disconnect charge point"
+        } else {
+            "Connect charge point"
+        }
+    ) {
+        IconButton(
+            onClick = {
+                if (chargePoint.connected) {
+                    connectionManager.disconnect(chargePoint.idValue)
+                } else {
+                    connectionManager.connect(chargePoint.idValue)
+                }
+            }
+        ) {
+            MontaStateIcon(
+                state = chargePoint.connected,
+                onState = "stop_circle",
+                offState = "play_circle"
+            )
+        }
+    }
+}