Skip to content

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

feat(onboarding): add Drive import CTA + progress bar in sync dialog

Celtiore6b233412fa0b
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
index 0392202a..1ad483d1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Switch
import androidx.compose.material3.TextButton
@@ -64,6 +65,7 @@ import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
+import com.streamvault.app.ui.components.extractProgressFraction
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.screens.settings.BackupImportPreviewDialog
import com.streamvault.app.ui.theme.*
@@ -165,6 +167,10 @@ fun ProviderSetupScreen(
contract = ActivityResultContracts.OpenDocument()
) { uri: android.net.Uri? -> uri?.let { viewModel.inspectBackup(it.toString()) } }
+ val driveSignInLauncher = rememberLauncherForActivityResult(
+ contract = ActivityResultContracts.StartActivityForResult()
+ ) { result -> viewModel.completeDriveSignIn(result.data) }
+
// ?? Effects ???????????????????????????????????????????????????????????????
LaunchedEffect(knownLocalM3uUrls) {
cleanupOldImportedM3uFilesAsync(context.filesDir, knownLocalM3uUrls, 20)
@@ -321,6 +327,9 @@ fun ProviderSetupScreen(
showImportBackupButton = !uiState.isEditing,
isImportingBackup = uiState.isImportingBackup || uiState.syncProgress != null,
onImportBackup = { backupImportLauncher.launch(arrayOf("application/json")) },
+ driveSignedIn = uiState.driveSignedIn,
+ onImportFromDrive = { viewModel.importBackupFromDrive() },
+ onDriveSignIn = { viewModel.beginDriveSignIn(driveSignInLauncher) },
modifier = Modifier.weight(1f).fillMaxHeight()
)
}
@@ -360,6 +369,9 @@ fun ProviderSetupScreen(
showImportBackupButton = !uiState.isEditing,
isImportingBackup = uiState.isImportingBackup || uiState.syncProgress != null,
onImportBackup = { backupImportLauncher.launch(arrayOf("application/json")) },
+ driveSignedIn = uiState.driveSignedIn,
+ onImportFromDrive = { viewModel.importBackupFromDrive() },
+ onDriveSignIn = { viewModel.beginDriveSignIn(driveSignInLauncher) },
modifier = Modifier.weight(1f).fillMaxWidth()
)
}
@@ -510,6 +522,9 @@ private fun ProviderFormContent(
showImportBackupButton: Boolean,
isImportingBackup: Boolean,
onImportBackup: () -> Unit,
+ driveSignedIn: Boolean,
+ onImportFromDrive: () -> Unit,
+ onDriveSignIn: () -> Unit,
modifier: Modifier = Modifier
) {
val scrollState = rememberScrollState()
@@ -731,6 +746,19 @@ private fun ProviderFormContent(
isLoading = isImportingBackup,
onClick = onImportBackup
)
+ if (driveSignedIn) {
+ SmallActionButton(
+ text = androidx.compose.ui.res.stringResource(R.string.setup_import_from_drive),
+ isLoading = isImportingBackup,
+ onClick = onImportFromDrive
+ )
+ } else {
+ SmallActionButton(
+ text = androidx.compose.ui.res.stringResource(R.string.settings_drive_signin),
+ isLoading = false,
+ onClick = onDriveSignIn
+ )
+ }
}
}
}
@@ -1629,6 +1657,12 @@ private fun PasswordVisibilityGlyph(
@Composable
fun SyncProgressDialog(message: String) {
+ val fraction = extractProgressFraction(message)
+ val animatedFraction by animateFloatAsState(
+ targetValue = fraction ?: 0f,
+ animationSpec = tween(durationMillis = 400),
+ label = "syncFraction"
+ )
PremiumDialog(
title = androidx.compose.ui.res.stringResource(R.string.settings_syncing_title),
subtitle = androidx.compose.ui.res.stringResource(R.string.settings_syncing_subtitle),
@@ -1646,6 +1680,18 @@ fun SyncProgressDialog(message: String) {
label = androidx.compose.ui.res.stringResource(R.string.settings_syncing_btn),
containerColor = PrimaryGlow
)
+ if (fraction != null) {
+ LinearProgressIndicator(
+ progress = { animatedFraction },
+ color = Primary,
+ modifier = Modifier.fillMaxWidth()
+ )
+ } else {
+ LinearProgressIndicator(
+ color = Primary,
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
Text(
text = message,
style = MaterialTheme.typography.bodyMedium,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
index 671912ca..11023564 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
@@ -9,6 +9,9 @@ import com.streamvault.data.remote.xtream.XtreamRequestException
import com.streamvault.data.remote.xtream.XtreamResponseTooLargeException
import com.streamvault.data.security.CredentialDecryptionException
import com.streamvault.domain.manager.BackupConflictStrategy
+import com.streamvault.domain.manager.DriveAuthState
+import com.streamvault.domain.manager.DriveBackupSyncManager
+import com.streamvault.domain.model.Result as DomainResult
import com.streamvault.domain.manager.BackupImportPlan
import com.streamvault.domain.manager.BackupPreview
import com.streamvault.domain.model.ActiveLiveSource
@@ -49,7 +52,8 @@ class ProviderSetupViewModel @Inject constructor(
private val providerRepository: ProviderRepository,
private val combinedM3uRepository: CombinedM3uRepository,
private val validateAndAddProvider: ValidateAndAddProvider,
- private val importBackup: ImportBackup
+ private val importBackup: ImportBackup,
+ private val driveBackupSyncManager: DriveBackupSyncManager
) : ViewModel() {
enum class OnboardingCompletion {
@@ -86,6 +90,73 @@ class ProviderSetupViewModel @Inject constructor(
.toSet()
}
}
+ viewModelScope.launch {
+ driveBackupSyncManager.authState.collect { state ->
+ _uiState.update {
+ it.copy(driveSignedIn = state is DriveAuthState.SignedIn)
+ }
+ }
+ }
+ }
+
+ fun beginDriveSignIn(launcher: androidx.activity.result.ActivityResultLauncher<android.content.Intent>) {
+ viewModelScope.launch {
+ when (val request = driveBackupSyncManager.beginSignIn()) {
+ is DomainResult.Success -> {
+ val intent = request.data.intent as? android.content.Intent ?: return@launch
+ runCatching { launcher.launch(intent) }
+ }
+ is DomainResult.Error -> {
+ _uiState.update {
+ it.copy(error = "Drive sign-in unavailable: ${request.message}")
+ }
+ }
+ is DomainResult.Loading -> Unit
+ }
+ }
+ }
+
+ fun completeDriveSignIn(intentData: android.content.Intent?) {
+ viewModelScope.launch {
+ when (val signIn = driveBackupSyncManager.completeSignIn(intentData)) {
+ is DomainResult.Success -> Unit
+ is DomainResult.Error -> {
+ _uiState.update {
+ it.copy(error = "Drive sign-in failed: ${signIn.message}")
+ }
+ }
+ is DomainResult.Loading -> Unit
+ }
+ }
+ }
+
+ fun importBackupFromDrive() {
+ viewModelScope.launch {
+ _uiState.update {
+ it.copy(
+ isImportingBackup = true,
+ syncProgress = "Downloading from Drive...",
+ validationError = null,
+ error = null
+ )
+ }
+ when (val pullResult = driveBackupSyncManager.pullBackup()) {
+ is DomainResult.Success -> {
+ _uiState.update { it.copy(isImportingBackup = false) }
+ inspectBackup(pullResult.data.localUriString)
+ }
+ is DomainResult.Error -> {
+ _uiState.update {
+ it.copy(
+ isImportingBackup = false,
+ syncProgress = null,
+ error = "Drive pull failed: ${pullResult.message}"
+ )
+ }
+ }
+ is DomainResult.Loading -> Unit
+ }
+ }
}
fun loadProvider(id: Long) {
@@ -710,6 +781,7 @@ data class ProviderSetupState(
val backupPreview: BackupPreview? = null,
val pendingBackupUri: String? = null,
val backupImportPlan: BackupImportPlan = BackupImportPlan(),
+ val driveSignedIn: Boolean = false,
val epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND,
val xtreamLiveSyncMode: ProviderXtreamLiveSyncMode = ProviderXtreamLiveSyncMode.AUTO,
val hasCustomizedEpgSyncMode: Boolean = false,
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b0c0cee3..d16d28f1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1437,4 +1437,5 @@
<string name="settings_drive_last_push">Envoyé : %1$s</string>
<string name="settings_drive_last_pull">Récupéré : %1$s</string>
<string name="settings_drive_never_synced">Jamais synchronisé</string>
+ <string name="setup_import_from_drive">Importer depuis Drive</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c1f8d857..5656b5aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1510,5 +1510,6 @@
<string name="settings_drive_last_push">Pushed: %1$s</string>
<string name="settings_drive_last_pull">Pulled: %1$s</string>
<string name="settings_drive_never_synced">Never synced yet</string>
+ <string name="setup_import_from_drive">Import from Drive</string>
</resources>