Update create/edit Case address fields and messages

CrisisCleanup · Aug 29, 2023 · e126055 · e126055
1 parent 839bc17
commit e126055
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,10 +13,10 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 136
+        val buildVersion = 139
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
-        versionName = "0.2.${buildVersion - 129}"
+        versionName = "0.5.${buildVersion - 136}"
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.crisiscleanup.core.testing.CrisisCleanupTestRunner"

diff --git a/.../caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/LocationInputData.kt b/.../caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/LocationInputData.kt
@@ -106,18 +106,18 @@ class LocationInputData(
         if (streetAddress.isBlank()) {
             translationKeys.add("caseForm.address_required")
         }
-        if (zipCode.isBlank()) {
-            translationKeys.add("caseForm.postal_code_required")
+        if (city.isBlank()) {
+            translationKeys.add("caseForm.city_required")
         }
         if (county.isBlank()) {
             translationKeys.add("caseForm.county_required")
         }
-        if (city.isBlank()) {
-            translationKeys.add("caseForm.city_required")
-        }
         if (state.isBlank()) {
             translationKeys.add("caseForm.state_required")
         }
+        if (zipCode.isBlank()) {
+            translationKeys.add("caseForm.postal_code_required")
+        }
 
         val message = translationKeys.joinToString("\n") { translator(it) }
         return Pair(isAddressError, message)
@@ -131,8 +131,8 @@ class LocationInputData(
             return false
         }
 
-        if (zipCode.isBlank()) {
-            zipCodeError = translator("caseForm.postal_code_required")
+        if (city.isBlank()) {
+            cityError = translator("caseForm.city_required")
             return false
         }
 
@@ -141,13 +141,13 @@ class LocationInputData(
             return false
         }
 
-        if (city.isBlank()) {
-            cityError = translator("caseForm.city_required")
+        if (state.isBlank()) {
+            stateError = translator("caseForm.state_required")
             return false
         }
 
-        if (state.isBlank()) {
-            stateError = translator("caseForm.state_required")
+        if (zipCode.isBlank()) {
+            zipCodeError = translator("caseForm.postal_code_required")
             return false
         }
 

diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseEditorScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseEditorScreen.kt
@@ -300,6 +300,7 @@ private fun ColumnScope.FullEditView(
     val sliderScrollToSectionItem = sectionSliderState.sliderScrollToSectionItem
     val sliderScrollToSection = sectionSliderState.sliderScrollToSection
     val editPropertyData = remember(viewModel) { { sliderScrollToSectionItem(0, 2) } }
+    // TODO Review this item index is correct
     val editLocation = remember(viewModel) { { sliderScrollToSectionItem(0, 3) } }
     val editLocationAddress = remember(viewModel) { { sliderScrollToSectionItem(0, 4) } }
     val editFormData = remember(viewModel) { { index: Int -> sliderScrollToSection(index) } }