Add ToastHost interface + override keyword to the 3 ViewModels that declared clearToast() without implementing the interface. This aligns them with the other 17 ViewModels and enables polymorphic substitution where ToastHost is expected. Fixes #614 Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
1 parent
3030e431f2
commit
dc1d5f2c7c
3 files changed
+9
-6
No files matched your search
@@ -5,6 +5,7 @@ import com.m57.hermescontrol.data.model.Achievement
|
|||||||
import com.m57.hermescontrol.data.model.RecentUnlock
|
import com.m57.hermescontrol.data.model.RecentUnlock
|
||||||
import com.m57.hermescontrol.data.remote.ApiClient
|
import com.m57.hermescontrol.data.remote.ApiClient
|
||||||
import com.m57.hermescontrol.data.remote.safeApiCall
|
import com.m57.hermescontrol.data.remote.safeApiCall
|
||||||
|
import com.m57.hermescontrol.ui.common.ToastHost
|
||||||
import com.m57.hermescontrol.ui.common.safeLaunchLoad
|
import com.m57.hermescontrol.ui.common.safeLaunchLoad
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
@@ -38,7 +39,7 @@ data class AchievementsUiState(
|
|||||||
val toastMessage: String? = null,
|
val toastMessage: String? = null,
|
||||||
)
|
)
|
||||||
|
|
||||||
class AchievementsViewModel : ViewModel() {
|
class AchievementsViewModel : ViewModel(), ToastHost {
|
||||||
private val _uiState = MutableStateFlow(AchievementsUiState())
|
private val _uiState = MutableStateFlow(AchievementsUiState())
|
||||||
val uiState: StateFlow<AchievementsUiState> = _uiState.asStateFlow()
|
val uiState: StateFlow<AchievementsUiState> = _uiState.asStateFlow()
|
||||||
|
|
||||||
@@ -191,7 +192,7 @@ class AchievementsViewModel : ViewModel() {
|
|||||||
_uiState.update { it.copy(activeState = state) }
|
_uiState.update { it.copy(activeState = state) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun clearToast() {
|
override fun clearToast() {
|
||||||
_uiState.update { it.copy(toastMessage = null) }
|
_uiState.update { it.copy(toastMessage = null) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,7 @@ import com.m57.hermescontrol.data.model.ProcessInfo
|
|||||||
import com.m57.hermescontrol.data.session.ActiveSessionHolder
|
import com.m57.hermescontrol.data.session.ActiveSessionHolder
|
||||||
import com.m57.hermescontrol.data.ws.HermesWsClient
|
import com.m57.hermescontrol.data.ws.HermesWsClient
|
||||||
import com.m57.hermescontrol.data.ws.WsMethods
|
import com.m57.hermescontrol.data.ws.WsMethods
|
||||||
|
import com.m57.hermescontrol.ui.common.ToastHost
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
import kotlinx.coroutines.flow.asStateFlow
|
import kotlinx.coroutines.flow.asStateFlow
|
||||||
@@ -23,7 +24,7 @@ data class ProcessesUiState(
|
|||||||
val sessionId: String? = null,
|
val sessionId: String? = null,
|
||||||
)
|
)
|
||||||
|
|
||||||
class ProcessesViewModel : ViewModel() {
|
class ProcessesViewModel : ViewModel(), ToastHost {
|
||||||
private val _uiState = MutableStateFlow(ProcessesUiState())
|
private val _uiState = MutableStateFlow(ProcessesUiState())
|
||||||
val uiState: StateFlow<ProcessesUiState> = _uiState.asStateFlow()
|
val uiState: StateFlow<ProcessesUiState> = _uiState.asStateFlow()
|
||||||
|
|
||||||
@@ -123,7 +124,7 @@ class ProcessesViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun clearToast() {
|
override fun clearToast() {
|
||||||
_uiState.update { it.copy(toastMessage = null) }
|
_uiState.update { it.copy(toastMessage = null) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import com.m57.hermescontrol.data.model.SessionSearchResult
|
|||||||
import com.m57.hermescontrol.data.remote.ApiClient
|
import com.m57.hermescontrol.data.remote.ApiClient
|
||||||
import com.m57.hermescontrol.data.remote.NetworkResult
|
import com.m57.hermescontrol.data.remote.NetworkResult
|
||||||
import com.m57.hermescontrol.data.remote.safeApiCall
|
import com.m57.hermescontrol.data.remote.safeApiCall
|
||||||
|
import com.m57.hermescontrol.ui.common.ToastHost
|
||||||
import com.m57.hermescontrol.ui.common.safeLaunchLoad
|
import com.m57.hermescontrol.ui.common.safeLaunchLoad
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
@@ -52,7 +53,7 @@ data class SessionsUiState(
|
|||||||
val isSearchMode: Boolean get() = searchQuery.isNotBlank()
|
val isSearchMode: Boolean get() = searchQuery.isNotBlank()
|
||||||
}
|
}
|
||||||
|
|
||||||
class SessionsViewModel : ViewModel() {
|
class SessionsViewModel : ViewModel(), ToastHost {
|
||||||
private val _uiState = MutableStateFlow(SessionsUiState())
|
private val _uiState = MutableStateFlow(SessionsUiState())
|
||||||
val uiState: StateFlow<SessionsUiState> = _uiState.asStateFlow()
|
val uiState: StateFlow<SessionsUiState> = _uiState.asStateFlow()
|
||||||
|
|
||||||
@@ -471,7 +472,7 @@ class SessionsViewModel : ViewModel() {
|
|||||||
|
|
||||||
// ── Toast ────────────────────────────────────────────────────────────
|
// ── Toast ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
fun clearToast() {
|
override fun clearToast() {
|
||||||
_uiState.update { it.copy(toastMessage = null) }
|
_uiState.update { it.copy(toastMessage = null) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user