Add icons

mobile-app/src/main/kotlin/org/vivlaniv/nexohub/entities/DeviceUI.kt

@@ -1,14 +1,18 @@
 package org.vivlaniv.nexohub.entities
 
 import android.util.Log
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -20,6 +24,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
@@ -29,8 +34,9 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
@@ -45,30 +51,58 @@ import org.vivlaniv.nexohub.AppState
 import org.vivlaniv.nexohub.DeviceInfo
 import org.vivlaniv.nexohub.PropertyInfo
 import org.vivlaniv.nexohub.PutDevicePropertyTask
+import org.vivlaniv.nexohub.R
 import org.vivlaniv.nexohub.SavedDevice
 import org.vivlaniv.nexohub.SendDeviceSignalTask
 import org.vivlaniv.nexohub.SignalInfo
 import org.vivlaniv.nexohub.TAG
 import org.vivlaniv.nexohub.Type
 
+
+val typeImage = mapOf(
+    "Lamp" to R.drawable.lamp,
+    "Teapot" to R.drawable.teapot
+)
+
 @Composable
 fun DeviceCard(state: AppState, device: SavedDevice) {
     Card(
         modifier = Modifier
             .fillMaxWidth()
             .padding(8.dp)
     ) {
-        Text(
-            modifier = Modifier.padding(4.dp),
-            text = device.alias ?: device.type,
-            fontSize = 20.sp,
-            fontWeight = FontWeight.Bold
-        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Surface(
+                modifier = Modifier
+                    .size(100.dp)
+                    .padding(8.dp)
+                    .border(1.dp, Color.Gray, RoundedCornerShape(10.dp)),
+                color = Color.Transparent
+            ) {
+                Image(
+                    painter = painterResource(id = typeImage.getOrDefault(device.type, R.drawable.question)),
+                    contentDescription = device.type,
+                    modifier = Modifier.padding(8.dp)
+                )
+            }
+            Column {
+                Text(
+                    modifier = Modifier.padding(4.dp),
+                    text = device.alias ?: device.type,
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.Bold
+                )
 
-        Text(
-            modifier = Modifier.padding(4.dp),
-            text = device.type
-        )
+                Text(
+                    modifier = Modifier.padding(4.dp),
+                    text = device.type
+                )
+            }
+        }
 
         if (device.room != null) {
             Text(
@@ -139,7 +173,6 @@ fun DeviceProperty(state: AppState, device: String, propertyInfo: PropertyInfo)
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun TextFieldDeviceProperty(propertyInfo: PropertyInfo, putPropertyCallback: (Int) -> Unit) {
 

model-service/src/main/kotlin/org/vivlaniv/nexohub/Model.kt

@@ -60,7 +60,7 @@ class Lamp(
 
 class Teapot(
     private var volume: Int = 70,
-    private var temperature: Int = 0
+    private var temperature: Int = 20
 ) : AbstractDevice() {
     init {
         // TODO: coroutines