Merge pull request #77 from canopas/megh/fix-null-journey-text-shown-to-user

Fix null journey text shown to user

Author: cp-megh-l

app/src/main/java/com/canopas/yourspace/ui/flow/journey/components/LocationHistory.kt

@@ -345,14 +345,14 @@ internal fun getFormattedLocationTimeForFirstItem(createdAt: Long): String {
 }
 
 fun Address.formattedTitle(toAddress: Address?): String {
-    val fromCity = this.locality
-    val toCity = toAddress?.locality ?: ""
+    val fromCity = this.locality ?: this.subAdminArea ?: this.adminArea ?: this.featureName ?: "Unknown"
+    val toCity = toAddress?.locality ?: toAddress?.subAdminArea ?: toAddress?.adminArea ?: toAddress?.featureName ?: "Unknown"
 
-    val fromArea = this.subLocality
-    val toArea = toAddress?.subLocality ?: ""
+    val fromArea = this.subLocality ?: this.thoroughfare ?: this.featureName ?: fromCity
+    val toArea = toAddress?.subLocality ?: toAddress?.thoroughfare ?: toAddress?.featureName ?: toCity
 
-    val fromState = this.adminArea
-    val toState = toAddress?.adminArea ?: ""
+    val fromState = this.adminArea ?: this.countryName ?: "Unknown"
+    val toState = toAddress?.adminArea ?: toAddress?.countryName ?: "Unknown"
 
     return when {
         toAddress == null -> "$fromArea, $fromCity"