Fix app crash

Popalay · Aug 14, 2020 · aad6d7a · aad6d7a
1 parent 54857e3
commit aad6d7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/java/com/popalay/tracktor/model/TrackableUnit.kt b/app/src/main/java/com/popalay/tracktor/model/TrackableUnit.kt
@@ -8,7 +8,8 @@ data class TrackableUnit(
     val symbol: String,
     val valueType: UnitValueType
 ) {
-    val displayName: String get() = listOfNotNull(name, symbol.ifBlank { null }).joinToString()
+    @Transient
+    val displayName: String = listOfNotNull(name, symbol.ifBlank { null }).joinToString()
 
     companion object {
         val None = TrackableUnit(name = "", symbol = "", UnitValueType.NONE)
@@ -23,13 +24,15 @@ data class TrackableUnit(
     }
 }
 
+@JsonClass(generateAdapter = false)
 enum class UnitValueType(val displayName: String) {
     NONE(""),
     TEXT("Text"),
     DOUBLE("Double"),
     INTEGER("Integer")
 }
 
+@JsonClass(generateAdapter = false)
 enum class ProgressDirection(val displayName: String) {
     ASCENDING("Ascending"),
     DESCENDING("Descending")

diff --git a/app/src/main/java/com/popalay/tracktor/ui/createtracker/CreateTrackerWorkflow.kt b/app/src/main/java/com/popalay/tracktor/ui/createtracker/CreateTrackerWorkflow.kt
@@ -30,17 +30,17 @@ class CreateTrackerWorkflow(
     @JsonClass(generateAdapter = true)
     data class State(
         val title: String = "",
-        @Transient val units: List<TrackableUnit> = emptyList(),
         val selectedUnit: TrackableUnit = TrackableUnit.None,
         val selectedProgressDirection: ProgressDirection = ProgressDirection.ASCENDING,
         val initialValue: String = "",
-        val initialValueKeyboardType: KeyboardType = KeyboardType.Number,
         val isUnitsVisible: Boolean = false,
         val isInitialValueVisible: Boolean = false,
         val isCustomUnitCreating: Boolean = false,
         val customUnit: TrackableUnit = TrackableUnit.None,
         val isCustomUnitValueTypeDropdownShown: Boolean = false,
         val isCustomUnitValid: Boolean = false,
+        @Transient val units: List<TrackableUnit> = emptyList(),
+        @Transient val initialValueKeyboardType: KeyboardType = KeyboardType.Number,
         @Transient val currentAction: Action? = null
     ) {
         val isValidToSave: Boolean