Put initializer of EditCustomUnitViewModel at the bottom to make sure…

… all fields are accessible there
isaakhanimann · Dec 18, 2024 · 4de4f98 · 4de4f98
1 parent 9c44643
commit 4de4f98
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/...va/com/isaakhanimann/journal/ui/tabs/settings/customunits/edit/EditCustomUnitViewModel.kt b/...va/com/isaakhanimann/journal/ui/tabs/settings/customunits/edit/EditCustomUnitViewModel.kt
@@ -47,30 +47,6 @@ class EditCustomUnitViewModel @Inject constructor(
 ) : ViewModel() {
 
     private var customUnit: CustomUnit? = null
-    init {
-        val customUnitRoute: EditCustomUnitRoute = state.toRoute()
-        val customUnitId = customUnitRoute.customUnitId
-        viewModelScope.launch {
-            val customUnit = experienceRepo.getCustomUnit(customUnitId)
-            this@EditCustomUnitViewModel.customUnit = customUnit
-            if (customUnit != null) {
-                substanceName = customUnit.substanceName
-                administrationRoute = customUnit.administrationRoute
-                val substance = substanceRepository.getSubstance(customUnit.substanceName)
-                roaDose = substance?.getRoa(customUnit.administrationRoute)?.roaDose
-                originalUnit = customUnit.originalUnit
-                name = customUnit.name
-                val pluralizableUnit = customUnit.getPluralizableUnit()
-                unit = customUnit.unit
-                unitPlural = pluralizableUnit.plural
-                doseText = customUnit.dose?.toReadableString() ?: ""
-                estimatedDoseDeviationText = customUnit.estimatedDoseStandardDeviation?.toReadableString() ?: ""
-                isEstimate = customUnit.isEstimate
-                isArchived = customUnit.isArchived
-                note = customUnit.note
-            }
-        }
-    }
 
     var roaDose: RoaDose? = null
 
@@ -161,4 +137,29 @@ class EditCustomUnitViewModel @Inject constructor(
             }
         }
     }
+
+    init {
+        val customUnitRoute: EditCustomUnitRoute = state.toRoute()
+        val customUnitId = customUnitRoute.customUnitId
+        viewModelScope.launch {
+            val customUnit = experienceRepo.getCustomUnit(customUnitId)
+            this@EditCustomUnitViewModel.customUnit = customUnit
+            if (customUnit != null) {
+                substanceName = customUnit.substanceName
+                administrationRoute = customUnit.administrationRoute
+                val substance = substanceRepository.getSubstance(customUnit.substanceName)
+                roaDose = substance?.getRoa(customUnit.administrationRoute)?.roaDose
+                originalUnit = customUnit.originalUnit
+                name = customUnit.name
+                val pluralizableUnit = customUnit.getPluralizableUnit()
+                unit = customUnit.unit
+                unitPlural = pluralizableUnit.plural
+                doseText = customUnit.dose?.toReadableString() ?: ""
+                estimatedDoseDeviationText = customUnit.estimatedDoseStandardDeviation?.toReadableString() ?: ""
+                isEstimate = customUnit.isEstimate
+                isArchived = customUnit.isArchived
+                note = customUnit.note
+            }
+        }
+    }
 }