Merge pull request #758 from enaboapps/iss757

Improve setup screen
enaboapps · Nov 7, 2024 · 810e83f · 810e83f
2 parents cbbda48 + a6c431d
commit 810e83f
Show file tree

Hide file tree

Showing 4 changed files with 265 additions and 123 deletions.
diff --git a/app/src/main/java/com/enaboapps/switchify/screens/settings/switches/SwitchesScreen.kt b/app/src/main/java/com/enaboapps/switchify/screens/settings/switches/SwitchesScreen.kt
@@ -87,19 +87,6 @@ fun SwitchesScreen(navController: NavController) {
                 }
             }
 
-            uiState.error != null -> {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
-                    Text(
-                        text = uiState.error!!,
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.error
-                    )
-                }
-            }
-
             else -> {
                 Column(
                     modifier = Modifier

diff --git a/...main/java/com/enaboapps/switchify/screens/settings/switches/models/SwitchesScreenModel.kt b/...main/java/com/enaboapps/switchify/screens/settings/switches/models/SwitchesScreenModel.kt
@@ -41,7 +41,6 @@ class SwitchesScreenModel(private val store: SwitchEventStore) : ViewModel() {
                 }
                 .onFailure { error ->
                     _uiState.value = _uiState.value.copy(
-                        error = error.message ?: "Failed to load remote switches",
                         isLoading = false
                     )
                 }
@@ -65,7 +64,6 @@ class SwitchesScreenModel(private val store: SwitchEventStore) : ViewModel() {
                 }
                 .onFailure { error ->
                     _uiState.value = _uiState.value.copy(
-                        error = error.message ?: "Failed to import switch",
                         importingSwitch = null
                     )
                 }
@@ -77,17 +75,13 @@ class SwitchesScreenModel(private val store: SwitchEventStore) : ViewModel() {
      */
     fun deleteRemoteSwitch(remoteSwitch: RemoteSwitchInfo) {
         viewModelScope.launch {
-            _uiState.value = _uiState.value.copy(
-                error = null
-            )
             store.removeRemote(remoteSwitch.code)
                 .onSuccess {
                     updateLocalSwitches()
                     loadEvents()
                 }
                 .onFailure { error ->
                     _uiState.value = _uiState.value.copy(
-                        error = error.message ?: "Failed to delete switch",
                         importingSwitch = null
                     )
                 }
@@ -102,13 +96,6 @@ class SwitchesScreenModel(private val store: SwitchEventStore) : ViewModel() {
             localSwitches = store.getSwitchEvents()
         )
     }
-
-    /**
-     * Clears the current error message.
-     */
-    fun clearError() {
-        _uiState.value = _uiState.value.copy(error = null)
-    }
 }
 
 /**
@@ -118,6 +105,5 @@ data class SwitchesUiState(
     val localSwitches: Set<SwitchEvent> = emptySet(),
     val remoteSwitches: List<RemoteSwitchInfo> = emptyList(),
     val isLoading: Boolean = false,
-    val importingSwitch: String? = null,
-    val error: String? = null
+    val importingSwitch: String? = null
 )