Improve state model

Author: samiuelson

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/details/localcatalog/WooPosSettingsLocalCatalogState.kt

@@ -2,8 +2,7 @@ package com.woocommerce.android.ui.woopos.settings.details.localcatalog
 
 data class WooPosSettingsLocalCatalogState(
     val catalogStatus: CatalogStatus = CatalogStatus.Loading,
-    val allowCellularDataUpdate: Boolean = false,
-    val hasCellularCapability: Boolean = false,
+    val cellularCapability: CellularCapability = CellularCapability.None,
 ) {
     sealed class CatalogStatus {
         data class Available(
@@ -16,4 +15,9 @@ data class WooPosSettingsLocalCatalogState(
         object Loading : CatalogStatus()
         object RefreshingCatalog : CatalogStatus()
     }
+
+    sealed class CellularCapability {
+        object None : CellularCapability()
+        data class Available(val allowCellularDataUpdate: Boolean) : CellularCapability()
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/details/localcatalog/WooPosSettingsLocalCatalogViewModel.kt

@@ -48,10 +48,8 @@ class WooPosSettingsLocalCatalogViewModel @Inject constructor(
     }
 
     private fun checkCellularCapability() {
-        val hasCellular = cellularCapabilityDetector.hasCellularCapability()
-        _state.update { it.copy(hasCellularCapability = hasCellular) }
-
-        if (!hasCellular) {
+        if (!cellularCapabilityDetector.hasCellularCapability()) {
+            _state.update { it.copy(cellularCapability = WooPosSettingsLocalCatalogState.CellularCapability.None) }
             viewModelScope.launch {
                 preferencesRepository.setAllowCellularDataUpdate(false)
             }
@@ -105,8 +103,18 @@ class WooPosSettingsLocalCatalogViewModel @Inject constructor(
     private fun listenToCellularDataUpdateValue() {
         viewModelScope.launch {
             preferencesRepository.allowCellularDataUpdate.collect { allowCellularDataUpdate ->
-                _state.update {
-                    it.copy(allowCellularDataUpdate = allowCellularDataUpdate)
+                _state.update { currentState ->
+                    if (cellularCapabilityDetector.hasCellularCapability()) {
+                        currentState.copy(
+                            cellularCapability = WooPosSettingsLocalCatalogState.CellularCapability.Available(
+                                allowCellularDataUpdate = allowCellularDataUpdate
+                            )
+                        )
+                    } else {
+                        currentState.copy(
+                            cellularCapability = WooPosSettingsLocalCatalogState.CellularCapability.None
+                        )
+                    }
                 }
             }
         }