Update UI weather elements

InkApplications · Sep 4, 2024 · e05696e · e05696e
1 parent 488a279
commit e05696e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ lifecycle-runtime-ktx = "2.8.2"
 activity-compose = "1.7.0"
 compose-bom = "2024.06.00"
 regolith = "1.6.0"
-ink-ui = "0.5.0"
+ink-ui = "0.6.0"
 
 [libraries.android-gradle]
 version = "8.2.0"

diff --git a/structures/src/commonMain/kotlin/com/inkapplications/glassconsole/structures/DisplayItem.kt b/structures/src/commonMain/kotlin/com/inkapplications/glassconsole/structures/DisplayItem.kt
@@ -48,7 +48,8 @@ sealed interface DisplayItem: Spanable, Positionable {
         val symbol: Symbol? = null,
         val temperature: String? = null,
         val condition: WeatherElement.Condition? = null,
-        val secondaryTemperature: String? = null,
+        val secondaryText: String? = null,
+        val daytime: Boolean? = null,
     )
 
     object Serializer: KSerializer<DisplayItem> {
@@ -147,7 +148,9 @@ sealed interface DisplayItem: Spanable, Positionable {
                         temperature = schema.temperature!!,
                         condition = schema.condition!!,
                         title = schema.text,
-                        secondaryTemperature = schema.secondaryTemperature,
+                        daytime = schema.daytime ?: false,
+                        sentiment = schema.sentiment.orDefault(),
+                        secondaryText = schema.secondaryText,
                     ),
                     position = schema.position,
                     span = schema.span,
@@ -211,6 +214,7 @@ sealed interface DisplayItem: Spanable, Positionable {
                         is StatusIndicatorElement -> value.element.sentiment
                         is ThrobberElement -> value.element.sentiment
                         is ProgressElement -> value.element.sentiment
+                        is WeatherElement -> value.element.sentiment
                         else -> Sentiment.Nominal
                     },
                     symbol = when (value.element) {
@@ -229,8 +233,12 @@ sealed interface DisplayItem: Spanable, Positionable {
                         is WeatherElement -> value.element.condition
                         else -> null
                     },
-                    secondaryTemperature = when (value.element) {
-                        is WeatherElement -> value.element.secondaryTemperature
+                    secondaryText = when (value.element) {
+                        is WeatherElement -> value.element.secondaryText
+                        else -> null
+                    },
+                    daytime = when (value.element) {
+                        is WeatherElement -> value.element.daytime
                         else -> null
                     },
                 )