Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

feat(app): WelcomeViewModel observe SyncProgressBus avec garde acceptingProgress

Celtiorecb7ebe004cd5
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
index 79e0983a..aded4686 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
@@ -33,29 +33,53 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.design.AppColors
+import com.streamvault.data.sync.SyncProgressBus
import com.streamvault.domain.repository.ProviderRepository
+import com.streamvault.domain.sync.SyncProgress
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
@HiltViewModel
class WelcomeViewModel @Inject constructor(
- private val providerRepository: ProviderRepository
+ private val providerRepository: ProviderRepository,
+ syncProgressBus: SyncProgressBus
) : ViewModel() {
private val _hasProviders = MutableStateFlow<Boolean?>(null)
val hasProviders: StateFlow<Boolean?> = _hasProviders.asStateFlow()
+ // D8 — garde anti-rebond : une fois `hasProviders` connu (true ou false),
+ // on cesse définitivement de relayer le bus pour ne pas afficher la
+ // progression d'un sync ultérieur (settings refresh, retry) sur Welcome.
+ private val acceptingProgress = MutableStateFlow(true)
+
+ val syncProgress: StateFlow<SyncProgress?> =
+ combine(syncProgressBus.flow, acceptingProgress) { progress, accept ->
+ if (accept) progress else null
+ }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), null)
+
init {
viewModelScope.launch {
providerRepository.getProviders()
.map { it.isNotEmpty() }
.collect { _hasProviders.value = it }
}
+ viewModelScope.launch {
+ _hasProviders
+ .filterNotNull()
+ .first()
+ acceptingProgress.value = false
+ }
}
}