- Basically fully implemented device item with all details and icons.

- Attributes for all models are deserialized as Map<String, JsonPrimitive>.
- Removed redundant qualifier names

12 files changed, 93 insertions, 66 deletions

diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Calendar.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Calendar.kt
index 1718f0c..c528673 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Calendar.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Calendar.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -21,10 +23,10 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Calendar (
 
-    val id: kotlin.Int? = null,
-    val name: kotlin.String? = null,
+    val id: Int? = null,
+    val name: String? = null,
     /* base64 encoded in iCalendar format */
-    val `data`: kotlin.String? = null,
-    val attributes: kotlin.Any? = null
+    val `data`: String? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt
index e7e2716..c1c6a5d 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -22,10 +24,10 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Command (
 
-    val id: kotlin.Int? = null,
-    val deviceId: kotlin.Int? = null,
-    val description: kotlin.String? = null,
-    val type: kotlin.String? = null,
-    val attributes: kotlin.Any? = null
+    val id: Int? = null,
+    val deviceId: Int? = null,
+    val description: String? = null,
+    val type: String? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Device.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Device.kt
index f8a1642..4ea74e6 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Device.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Device.kt
@@ -13,6 +13,7 @@ package mx.trackermap.TrackerMap.client.models
 
 import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonPrimitive
 
 
 /**
@@ -48,6 +49,7 @@ data class Device (
     val model: String? = null,
     val contact: String? = null,
     val category: String? = null,
-    val geofenceIds: Array<Int>? = null
+    val geofenceIds: Array<Int>? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Driver.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Driver.kt
index 09d369b..c83543e 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Driver.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Driver.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -21,9 +23,9 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Driver (
 
-    val id: kotlin.Int? = null,
-    val name: kotlin.String? = null,
-    val uniqueId: kotlin.String? = null,
-    val attributes: kotlin.Any? = null
+    val id: Int? = null,
+    val name: String? = null,
+    val uniqueId: String? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt
index 701252f..e504600 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -25,14 +27,14 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Event (
 
-    val id: kotlin.Int? = null,
-    val type: kotlin.String? = null,
+    val id: Int? = null,
+    val type: String? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
     val eventTime: java.time.LocalDateTime? = null,
-    val deviceId: kotlin.Int? = null,
-    val positionId: kotlin.Int? = null,
-    val geofenceId: kotlin.Int? = null,
-    val maintenanceId: kotlin.Int? = null,
-    val attributes: kotlin.Any? = null
+    val deviceId: Int? = null,
+    val positionId: Int? = null,
+    val geofenceId: Int? = null,
+    val maintenanceId: Int? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Geofence.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Geofence.kt
index 783786a..f82ca07 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Geofence.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Geofence.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -23,11 +25,11 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Geofence (
 
-    val id: kotlin.Int? = null,
-    val name: kotlin.String? = null,
-    val description: kotlin.String? = null,
-    val area: kotlin.String? = null,
-    val calendarId: kotlin.Int? = null,
-    val attributes: kotlin.Any? = null
+    val id: Int? = null,
+    val name: String? = null,
+    val description: String? = null,
+    val area: String? = null,
+    val calendarId: Int? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Group.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Group.kt
index 6c9d3b8..b90e591 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Group.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Group.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -21,9 +23,9 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Group (
 
-    val id: kotlin.Int? = null,
-    val name: kotlin.String? = null,
-    val groupId: kotlin.Int? = null,
-    val attributes: kotlin.Any? = null
+    val id: Int? = null,
+    val name: String? = null,
+    val groupId: Int? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Maintenance.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Maintenance.kt
index 670d1e2..f9d4fcd 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Maintenance.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Maintenance.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -23,11 +25,11 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Maintenance (
 
-    val id: kotlin.Int? = null,
-    val name: kotlin.String? = null,
-    val type: kotlin.String? = null,
+    val id: Int? = null,
+    val name: String? = null,
+    val type: String? = null,
     val start: java.math.BigDecimal? = null,
     val period: java.math.BigDecimal? = null,
-    val attributes: kotlin.Any? = null
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Notification.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Notification.kt
index 50be5dd..2be5468 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Notification.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Notification.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -25,13 +27,13 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Notification (
 
-    val id: kotlin.Int? = null,
-    val type: kotlin.String? = null,
-    val always: kotlin.Boolean? = null,
-    val web: kotlin.Boolean? = null,
-    val mail: kotlin.Boolean? = null,
-    val sms: kotlin.Boolean? = null,
-    val calendarId: kotlin.Int? = null,
-    val attributes: kotlin.Any? = null
+    val id: Int? = null,
+    val type: String? = null,
+    val always: Boolean? = null,
+    val web: Boolean? = null,
+    val mail: Boolean? = null,
+    val sms: Boolean? = null,
+    val calendarId: Int? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt
index d765825..9a16615 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt
@@ -12,7 +12,11 @@
 package mx.trackermap.TrackerMap.client.models
 
 import kotlinx.datetime.LocalDateTime
+import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 
 
 /**
@@ -38,24 +42,25 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class Position (
 
-    val id: kotlin.Int? = null,
-    val deviceId: kotlin.Int? = null,
-    val protocol: kotlin.String? = null,
+    val id: Int? = null,
+    val deviceId: Int? = null,
+    val protocol: String? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
 //    val deviceTime: LocalDateTime? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
 //    val fixTime: LocalDateTime? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
 //    val serverTime: LocalDateTime? = null,
-    val outdated: kotlin.Boolean? = null,
-    val valid: kotlin.Boolean? = null,
+    val outdated: Boolean? = null,
+    val valid: Boolean? = null,
     val latitude: Double? = null,
     val longitude: Double? = null,
     val altitude: Double? = null,
     /* in knots */
     val speed: Double? = null,
     val course: Double? = null,
-    val address: kotlin.String? = null,
-    val accuracy: Double? = null
+    val address: String? = null,
+    val accuracy: Double? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Server.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Server.kt
index 24c7a20..d2ea44e 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Server.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Server.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.json.JsonPrimitive
+
 
 /**
  * 
@@ -34,22 +36,22 @@ package mx.trackermap.TrackerMap.client.models
  */
 data class Server (
 
-    val id: kotlin.Int? = null,
-    val registration: kotlin.Boolean? = null,
-    val readonly: kotlin.Boolean? = null,
-    val deviceReadonly: kotlin.Boolean? = null,
-    val limitCommands: kotlin.Boolean? = null,
-    val map: kotlin.String? = null,
-    val bingKey: kotlin.String? = null,
-    val mapUrl: kotlin.String? = null,
-    val poiLayer: kotlin.String? = null,
+    val id: Int? = null,
+    val registration: Boolean? = null,
+    val readonly: Boolean? = null,
+    val deviceReadonly: Boolean? = null,
+    val limitCommands: Boolean? = null,
+    val map: String? = null,
+    val bingKey: String? = null,
+    val mapUrl: String? = null,
+    val poiLayer: String? = null,
     val latitude: java.math.BigDecimal? = null,
     val longitude: java.math.BigDecimal? = null,
-    val zoom: kotlin.Int? = null,
-    val twelveHourFormat: kotlin.Boolean? = null,
-    val version: kotlin.String? = null,
-    val forceSettings: kotlin.Boolean? = null,
-    val coordinateFormat: kotlin.String? = null,
-    val attributes: kotlin.Any? = null
+    val zoom: Int? = null,
+    val twelveHourFormat: Boolean? = null,
+    val version: String? = null,
+    val forceSettings: Boolean? = null,
+    val coordinateFormat: String? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 ) {
 }
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/User.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/User.kt
index 1bda398..4906f09 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/User.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/User.kt
@@ -14,6 +14,7 @@ package mx.trackermap.TrackerMap.client.models
 import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonPrimitive
 
 
 /**
@@ -64,5 +65,6 @@ data class User (
     val deviceReadonly: Boolean? = null,
     val limitCommands: Boolean? = null,
     val poiLayer: String? = null,
-    val token: String? = null
+    val token: String? = null,
+    val attributes: Map<String, JsonPrimitive> = mapOf()
 )
\ No newline at end of file