diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/auth/LoginScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/auth/LoginScreen.kt index fd62f55..df48b8c 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/auth/LoginScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/auth/LoginScreen.kt @@ -10,7 +10,9 @@ import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -27,6 +29,11 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.kazier.mobile.R +/** + * Premier écran : choix explicite entre compte serveur et mode local, puis + * formulaire de connexion. Le mode local est expliqué avant d'être choisi + * (pas un petit lien d'esquive sous le formulaire). + */ @Composable fun LoginScreen( viewModel: AuthViewModel = hiltViewModel(), @@ -35,6 +42,7 @@ fun LoginScreen( var username by rememberSaveable { mutableStateOf("") } var password by rememberSaveable { mutableStateOf("") } + var showForm by rememberSaveable { mutableStateOf(false) } Column( modifier = Modifier @@ -51,34 +59,59 @@ fun LoginScreen( color = MaterialTheme.colorScheme.primary, ) Spacer(Modifier.height(8.dp)) - Text( - text = stringResource(R.string.login_subtitle), - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Spacer(Modifier.height(32.dp)) - LoginForm( - username = username, - onUsernameChange = { username = it }, - password = password, - onPasswordChange = { password = it }, - submitting = loginUi.isSubmitting, - errorRes = loginUi.error?.let(::authErrorResFor), - submitLabel = stringResource(R.string.login_submit), - onSubmit = { viewModel.signIn(username, password) }, - modifier = Modifier.fillMaxWidth(), - ) + if (!showForm) { + Text( + text = stringResource(R.string.login_choice_subtitle), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(32.dp)) + Button( + onClick = { showForm = true }, + modifier = Modifier.fillMaxWidth(), + ) { + Text(stringResource(R.string.login_submit)) + } + Spacer(Modifier.height(12.dp)) + OutlinedButton( + onClick = viewModel::continueWithoutAccount, + modifier = Modifier.fillMaxWidth(), + ) { + Text(stringResource(R.string.login_skip)) + } + Spacer(Modifier.height(16.dp)) + Text( + text = stringResource(R.string.skip_message), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + } else { + Text( + text = stringResource(R.string.login_subtitle), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Spacer(Modifier.height(32.dp)) - Spacer(Modifier.height(16.dp)) - TextButton(onClick = viewModel::continueWithoutAccount) { - Text(stringResource(R.string.login_skip)) + LoginForm( + username = username, + onUsernameChange = { username = it }, + password = password, + onPasswordChange = { password = it }, + submitting = loginUi.isSubmitting, + errorRes = loginUi.error?.let(::authErrorResFor), + submitLabel = stringResource(R.string.login_submit), + onSubmit = { viewModel.signIn(username, password) }, + modifier = Modifier.fillMaxWidth(), + ) + + Spacer(Modifier.height(16.dp)) + TextButton(onClick = { showForm = false }) { + Text(stringResource(R.string.back)) + } } - Text( - text = stringResource(R.string.skip_message), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - textAlign = TextAlign.Center, - ) } } diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/HeaderStatusAction.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/HeaderStatusAction.kt new file mode 100644 index 0000000..4ca6a68 --- /dev/null +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/HeaderStatusAction.kt @@ -0,0 +1,331 @@ +package com.kazier.mobile.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.kazier.mobile.R +import com.kazier.mobile.features.connection.ConnectionStatusViewModel +import com.kazier.mobile.features.connection.ServerConnectionStatus +import com.kazier.mobile.features.sync.SyncViewModel +import com.kazier.mobile.ui.theme.PendingDark +import com.kazier.mobile.ui.theme.PendingLight +import com.kazier.mobile.ui.theme.PillShape +import com.kazier.mobile.ui.theme.SuccessDark +import com.kazier.mobile.ui.theme.SuccessLight +import com.kazier.mobile.ui.theme.SyncingDark +import com.kazier.mobile.ui.theme.SyncingLight + +/** + * Pastille de statut unique du header : un point coloré (ou spinner pendant + * une synchro) + un libellé. Un appui ouvre le bottom-sheet « état » : + * statut serveur, bouton de test, résumé de la file d'envoi et accès à son + * détail. + * + * En mode local il n'y a rien à pousser : la pastille affiche « Mode local » + * et le sheet l'explique sans proposer de test (le tap-à-vérifier serait + * une impasse). + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HeaderStatusAction( + syncViewModel: SyncViewModel, + connectionStatusViewModel: ConnectionStatusViewModel, + modifier: Modifier = Modifier, +) { + val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() + val syncStatus by syncViewModel.syncStatus.collectAsStateWithLifecycle() + var showSheet by rememberSaveable { mutableStateOf(false) } + var showQueue by rememberSaveable { mutableStateOf(false) } + + val isLocal = connectionStatus == ServerConnectionStatus.Local + val dark = isSystemInDarkTheme() + val onlineGreen = if (dark) SuccessDark else SuccessLight + val pendingAmber = if (dark) PendingDark else PendingLight + val syncingAccent = if (dark) SyncingDark else SyncingLight + + val (dotColor, label, showSpinner) = when { + isLocal -> Triple( + MaterialTheme.colorScheme.onSurfaceVariant, + stringResource(R.string.status_local), + false, + ) + connectionStatus == ServerConnectionStatus.Checking -> Triple( + pendingAmber, + stringResource(R.string.status_checking), + false, + ) + syncStatus.syncing -> Triple( + syncingAccent, + stringResource(R.string.sync_syncing), + true, + ) + syncStatus.pending > 0 -> { + val text = if (syncStatus.pending == 1) { + stringResource(R.string.sync_pending_count_one) + } else { + stringResource(R.string.sync_pending_count, syncStatus.pending) + } + val color = if (connectionStatus == ServerConnectionStatus.Offline) { + MaterialTheme.colorScheme.error + } else { + pendingAmber + } + Triple(color, text, false) + } + syncStatus.failed > 0 -> Triple( + MaterialTheme.colorScheme.error, + stringResource(R.string.sync_summary_failed, syncStatus.failed), + false, + ) + connectionStatus == ServerConnectionStatus.Offline -> Triple( + MaterialTheme.colorScheme.error, + stringResource(R.string.status_offline), + false, + ) + else -> Triple( + onlineGreen, + stringResource(R.string.status_online), + false, + ) + } + val tapLabel = stringResource(R.string.sync_tap_to_view) + + Row( + modifier = modifier + .clip(PillShape) + .clickable( + role = Role.Button, + onClickLabel = tapLabel, + onClick = { showSheet = true }, + ) + .padding(horizontal = 10.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp), + ) { + if (showSpinner) { + CircularProgressIndicator( + modifier = Modifier.size(12.dp), + strokeWidth = 2.dp, + color = dotColor, + ) + } else { + Box( + modifier = Modifier + .size(8.dp) + .background(dotColor, CircleShape), + ) + } + Text( + text = label, + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + if (showSheet) { + ModalBottomSheet( + onDismissRequest = { showSheet = false }, + sheetState = rememberModalBottomSheetState(), + ) { + StatusSheetContent( + connectionStatus = connectionStatus, + syncStatus = syncStatus, + onTest = connectionStatusViewModel::checkNow, + onViewQueue = { + showSheet = false + showQueue = true + }, + onDismiss = { showSheet = false }, + ) + } + } + + if (showQueue) { + SyncOperationsDialog( + status = syncStatus, + onDismiss = { showQueue = false }, + ) + } +} + +@Composable +private fun StatusSheetContent( + connectionStatus: ServerConnectionStatus, + syncStatus: SyncViewModel.SyncStatus, + onTest: () -> Unit, + onViewQueue: () -> Unit, + onDismiss: () -> Unit, +) { + val isLocal = connectionStatus == ServerConnectionStatus.Local + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp) + .padding(bottom = 32.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = stringResource(R.string.status_sheet_title), + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.SemiBold, + ) + StatusServerRow( + status = connectionStatus, + onTest = onTest, + ) + if (isLocal) { + Text( + text = stringResource(R.string.skip_message), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } else { + HorizontalDivider() + StatusSyncSection( + status = syncStatus, + onViewQueue = onViewQueue, + ) + } + TextButton( + onClick = onDismiss, + modifier = Modifier.align(Alignment.End), + ) { + Text(stringResource(R.string.settings_close)) + } + } +} + +@Composable +private fun StatusServerRow( + status: ServerConnectionStatus, + onTest: () -> Unit, +) { + val dark = isSystemInDarkTheme() + val dotColor = when (status) { + ServerConnectionStatus.Checking -> if (dark) PendingDark else PendingLight + ServerConnectionStatus.Online -> if (dark) SuccessDark else SuccessLight + ServerConnectionStatus.Offline -> MaterialTheme.colorScheme.error + ServerConnectionStatus.Local -> MaterialTheme.colorScheme.onSurfaceVariant + } + val label = stringResource( + when (status) { + ServerConnectionStatus.Checking -> R.string.status_checking + ServerConnectionStatus.Online -> R.string.status_online + ServerConnectionStatus.Offline -> R.string.status_offline + ServerConnectionStatus.Local -> R.string.status_local + }, + ) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + Box( + modifier = Modifier + .size(12.dp) + .background(dotColor, CircleShape), + ) + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.settings_server), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = label, + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + if (status != ServerConnectionStatus.Local) { + OutlinedButton( + onClick = onTest, + enabled = status != ServerConnectionStatus.Checking, + ) { + Text(stringResource(R.string.settings_test_connection)) + } + } + } +} + +@Composable +private fun StatusSyncSection( + status: SyncViewModel.SyncStatus, + onViewQueue: () -> Unit, +) { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text( + text = stringResource(R.string.dashboard_sync_title), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + when { + status.syncing -> { + Text( + text = stringResource(R.string.sync_syncing), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + status.pending > 0 -> { + Text( + text = if (status.pending == 1) { + stringResource(R.string.sync_pending_count_one) + } else { + stringResource(R.string.sync_pending_count, status.pending) + }, + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + status.failed > 0 -> { + Text( + text = stringResource(R.string.sync_summary_failed, status.failed), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.error, + ) + } + else -> { + Text( + text = stringResource(R.string.sync_idle), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + } + OutlinedButton(onClick = onViewQueue) { + Text(stringResource(R.string.status_sheet_view_queue)) + } + } +} diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/ReviewCtaCard.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/ReviewCtaCard.kt new file mode 100644 index 0000000..73f3452 --- /dev/null +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/ReviewCtaCard.kt @@ -0,0 +1,63 @@ +package com.kazier.mobile.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.unit.dp +import com.kazier.mobile.R + +/** + * CTA « documents à traiter » partagé (dashboard + écran Fichiers) : la + * file review reste joignable même sans passer par le dashboard. + */ +@Composable +fun ReviewCtaCard( + count: Int, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + val label = stringResource(R.string.dashboard_review_title, count) + KazierCard( + modifier = modifier.clickable( + role = Role.Button, + onClickLabel = label, + onClick = onClick, + ), + ) { + Row( + modifier = Modifier.padding(20.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = label, + style = MaterialTheme.typography.titleMedium, + ) + Text( + text = stringResource(R.string.dashboard_review_hint), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(top = 4.dp), + ) + } + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + } + } +} diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/ServerStatusBadge.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/ServerStatusBadge.kt deleted file mode 100644 index 9b63573..0000000 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/ServerStatusBadge.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.kazier.mobile.ui.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp -import com.kazier.mobile.R -import com.kazier.mobile.features.connection.ServerConnectionStatus -import com.kazier.mobile.ui.theme.PendingDark -import com.kazier.mobile.ui.theme.PendingLight -import com.kazier.mobile.ui.theme.PillShape -import com.kazier.mobile.ui.theme.SuccessDark -import com.kazier.mobile.ui.theme.SuccessLight - -/** - * Pilule de statut serveur affichée dans le header : cercle coloré + libellé. - * Un appui relance une vérification immédiate du serveur. - */ -@Composable -fun ServerStatusBadge( - status: ServerConnectionStatus, - onClick: () -> Unit, - modifier: Modifier = Modifier, -) { - val dark = isSystemInDarkTheme() - val onlineGreen = if (dark) SuccessDark else SuccessLight - val checkingAmber = if (dark) PendingDark else PendingLight - val (dotColor, labelRes) = when (status) { - ServerConnectionStatus.Checking -> checkingAmber to R.string.status_checking - ServerConnectionStatus.Online -> onlineGreen to R.string.status_online - ServerConnectionStatus.Offline -> MaterialTheme.colorScheme.error to R.string.status_offline - ServerConnectionStatus.Local -> MaterialTheme.colorScheme.onSurfaceVariant to R.string.status_local - } - val label = stringResource(labelRes) - val tapLabel = stringResource(R.string.status_tap_to_recheck) - val shape = PillShape - - Row( - modifier = modifier - .clip(shape) - .clickable( - role = Role.Button, - onClickLabel = tapLabel, - onClick = onClick, - ) - .padding(horizontal = 10.dp, vertical = 4.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp), - ) { - Box( - modifier = Modifier - .size(8.dp) - .background(dotColor, CircleShape), - ) - Text( - text = label, - style = MaterialTheme.typography.labelMedium, - fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} \ No newline at end of file diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/SyncStatusBadge.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/SyncStatusBadge.kt deleted file mode 100644 index aa5eb12..0000000 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/components/SyncStatusBadge.kt +++ /dev/null @@ -1,150 +0,0 @@ -package com.kazier.mobile.ui.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.kazier.mobile.R -import com.kazier.mobile.features.sync.SyncViewModel -import com.kazier.mobile.ui.theme.PendingDark -import com.kazier.mobile.ui.theme.PendingLight -import com.kazier.mobile.ui.theme.PillShape -import com.kazier.mobile.ui.theme.SyncingDark -import com.kazier.mobile.ui.theme.SyncingLight - -/** - * Pilule de statut de synchro affichée dans le header : spinner quand une marche - * SAF ou un drain outbox est en cours, compteur d'ops en attente sinon, coche - * quand tout est poussé. Un appui ouvre la « liste des sync » (dernières ops). - */ -@Composable -fun SyncStatusBadge( - status: SyncViewModel.SyncStatus, - onClick: () -> Unit, - modifier: Modifier = Modifier, -) { - val dark = isSystemInDarkTheme() - val syncingAccent = if (dark) SyncingDark else SyncingLight - val pendingAmber = if (dark) PendingDark else PendingLight - val (accent, label, showSpinner) = when { - status.syncing -> { - Triple(syncingAccent, stringResource(R.string.sync_syncing), true) - } - status.pending > 0 -> { - val label = if (status.pending == 1) { - stringResource(R.string.sync_pending_count_one) - } else { - stringResource(R.string.sync_pending_count, status.pending) - } - Triple(pendingAmber, label, false) - } - else -> Triple( - MaterialTheme.colorScheme.primary, - stringResource(R.string.sync_idle), - false, - ) - } - val shape = PillShape - val tapLabel = stringResource(R.string.sync_tap_to_view) - - Row( - modifier = modifier - .clip(shape) - .clickable( - role = Role.Button, - onClickLabel = tapLabel, - onClick = onClick, - ) - .padding(horizontal = 10.dp, vertical = 4.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp), - ) { - if (showSpinner) { - CircularProgressIndicator( - modifier = Modifier.size(12.dp), - strokeWidth = 2.dp, - color = accent, - ) - } else if (status.pending > 0) { - Box( - modifier = Modifier - .size(14.dp) - .background(accent, CircleShape), - contentAlignment = Alignment.Center, - ) { - Text( - text = status.pending.coerceAtMost(99).toString(), - style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.surface, - fontWeight = FontWeight.Bold, - ) - } - } else { - Icon( - imageVector = Icons.Filled.Check, - contentDescription = null, modifier = Modifier.size(12.dp), - tint = accent, - ) - } - Text( - text = label, - style = MaterialTheme.typography.labelMedium, - fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} - -/** - * Composable prêt-à-poser dans un header : badge + dialogue « liste des sync ». - * Le dialogue est géré localement (état `showList`), aucun wiring externe. - * En mode local (`isLocal`) il n'y a rien à pousser : ne rien afficher. - */ -@Composable -fun SyncStatusAction( - syncViewModel: SyncViewModel, - modifier: Modifier = Modifier, - isLocal: Boolean = false, -) { - if (isLocal) return - val status by syncViewModel.syncStatus.collectAsStateWithLifecycle() - var showList by rememberSaveable { mutableStateOf(false) } - - SyncStatusBadge( - status = status, - onClick = { showList = true }, - modifier = modifier, - ) - - if (showList) { - SyncOperationsDialog( - status = status, - onDismiss = { showList = false }, - ) - } -} \ No newline at end of file diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/dashboard/DashboardScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/dashboard/DashboardScreen.kt index d5b4438..878e8d0 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/dashboard/DashboardScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/dashboard/DashboardScreen.kt @@ -1,6 +1,5 @@ package com.kazier.mobile.ui.dashboard -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -10,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.DocumentScanner import androidx.compose.material.icons.filled.Sync @@ -22,12 +20,19 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.SmallFloatingActionButton import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar +import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults +import androidx.compose.material3.pulltorefresh.pullToRefresh +import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -36,9 +41,9 @@ import com.kazier.mobile.R import com.kazier.mobile.features.connection.ConnectionStatusViewModel import com.kazier.mobile.features.connection.ServerConnectionStatus import com.kazier.mobile.features.sync.SyncViewModel +import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.KazierCard -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction +import com.kazier.mobile.ui.components.ReviewCtaCard import com.kazier.mobile.ui.navigation.FloatingNavBar import com.kazier.mobile.ui.navigation.NavTab @@ -60,18 +65,22 @@ fun DashboardScreen( val isLocal = connectionStatus == ServerConnectionStatus.Local val showSyncCard = !isLocal && (syncStatus.syncing || syncStatus.pending > 0 || syncStatus.failed > 0) + // Tirer-pour-actualiser = revérifier le serveur (review + file sont déjà + // temps réel via les flows, il n'y a rien d'autre à recharger ici). + var userRefresh by rememberSaveable { mutableStateOf(false) } + val isRefreshing = userRefresh && connectionStatus == ServerConnectionStatus.Checking + LaunchedEffect(connectionStatus) { + if (connectionStatus != ServerConnectionStatus.Checking) userRefresh = false + } + Scaffold( topBar = { TopAppBar( title = { Text(stringResource(R.string.dashboard)) }, actions = { - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, - ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, + connectionStatusViewModel = connectionStatusViewModel, ) }, ) @@ -92,89 +101,71 @@ fun DashboardScreen( } }, ) { padding -> - Column( + val pullState = rememberPullToRefreshState() + Box( modifier = Modifier .fillMaxSize() .padding(padding) - .padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .pullToRefresh( + state = pullState, + // Mode local : rien à revérifier — geste désactivé, sinon + // l'indicateur resterait coincé (jamais de cycle vrai→faux). + enabled = !isLocal, + isRefreshing = isRefreshing, + onRefresh = { + userRefresh = true + connectionStatusViewModel.checkNow() + }, + ), ) { - if (unprocessed > 0) { - ReviewCard( - count = unprocessed, - onClick = onOpenReview, - modifier = Modifier.fillMaxWidth(), - ) - } - if (showSyncCard) { - SyncSummaryCard( - status = syncStatus, - modifier = Modifier.fillMaxWidth(), - ) - } - if (unprocessed == 0 && !showSyncCard) { - Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 16.dp), - contentAlignment = Alignment.Center, - ) { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - Icon( - imageVector = Icons.Filled.CheckCircle, - contentDescription = null, - tint = MaterialTheme.colorScheme.primary, - modifier = Modifier.size(48.dp), - ) - Text( - text = stringResource(R.string.dashboard_all_processed), - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onSurfaceVariant, - textAlign = TextAlign.Center, - modifier = Modifier.padding(top = 12.dp), + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + if (unprocessed > 0) { + ReviewCtaCard( + count = unprocessed, + onClick = onOpenReview, + modifier = Modifier.fillMaxWidth(), + ) + } + if (showSyncCard) { + SyncSummaryCard( + status = syncStatus, + modifier = Modifier.fillMaxWidth(), + ) + } + if (unprocessed == 0 && !showSyncCard) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 16.dp), + contentAlignment = Alignment.Center, + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Icon( + imageVector = Icons.Filled.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(48.dp), + ) + Text( + text = stringResource(R.string.dashboard_all_processed), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier.padding(top = 12.dp), ) } } } - } - } -} - -@Composable -private fun ReviewCard( - count: Int, - onClick: () -> Unit, - modifier: Modifier = Modifier, -) { - val label = stringResource(R.string.dashboard_review_title, count) - KazierCard( - modifier = modifier.clickable( - role = Role.Button, - onClickLabel = label, - onClick = onClick, - ), - ) { - Row( - modifier = Modifier.padding(20.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(16.dp), - ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = label, - style = MaterialTheme.typography.titleMedium, - ) - Text( - text = stringResource(R.string.dashboard_review_hint), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(top = 4.dp), - ) } - Icon( - imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, - contentDescription = null, - tint = MaterialTheme.colorScheme.primary, + PullToRefreshDefaults.Indicator( + state = pullState, + isRefreshing = isRefreshing, + modifier = Modifier.align(Alignment.TopCenter), ) } } diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/document/DocumentViewerScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/document/DocumentViewerScreen.kt index 0e3f5d0..95e639d 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/document/DocumentViewerScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/document/DocumentViewerScreen.kt @@ -80,14 +80,12 @@ import com.kazier.mobile.data.local.entity.FileStatus import com.kazier.mobile.data.remote.dto.OcrJobStatus import com.kazier.mobile.domain.FileCategory import com.kazier.mobile.features.connection.ConnectionStatusViewModel -import com.kazier.mobile.features.connection.ServerConnectionStatus import com.kazier.mobile.features.ocr.OcrViewModel import com.kazier.mobile.features.saf.FileDeleter import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.ui.components.DeleteConfirmDialog +import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.KazierCard -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction import com.kazier.mobile.ui.components.categoryValue import com.kazier.mobile.ui.components.formatFileSize import com.kazier.mobile.ui.document.content.DocumentContentViewer @@ -126,7 +124,6 @@ fun DocumentViewerScreen( val documents by viewModel.documents.collectAsStateWithLifecycle() val viewerState by viewModel.uiState.collectAsStateWithLifecycle() val ocrState by ocrViewModel.uiState.collectAsStateWithLifecycle() - val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val pagerState = rememberPagerState(pageCount = { documents.size }) // M30 : survit à la rotation (`rememberSaveable`) — `savedPage` mémorise @@ -255,13 +252,9 @@ fun DocumentViewerScreen( } }, actions = { - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, - ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, + connectionStatusViewModel = connectionStatusViewModel, ) }, ) diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderdetail/FolderDetailScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderdetail/FolderDetailScreen.kt index f6cc43a..ed09716 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderdetail/FolderDetailScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderdetail/FolderDetailScreen.kt @@ -53,18 +53,16 @@ import com.kazier.mobile.R import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FolderEntity import com.kazier.mobile.features.connection.ConnectionStatusViewModel -import com.kazier.mobile.features.connection.ServerConnectionStatus import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.ui.components.FilePendingReviewBadge import com.kazier.mobile.ui.components.FileSyncStatusIcon import com.kazier.mobile.ui.components.FileThumbnail import com.kazier.mobile.ui.components.FolderNameDialog import com.kazier.mobile.ui.components.KazierCard +import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.MoveFolderPickerDialog import com.kazier.mobile.ui.components.SelectionState import com.kazier.mobile.ui.components.SelectionStatusIcon -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction import com.kazier.mobile.ui.components.formatFileSize import com.kazier.mobile.ui.components.rememberSelectionState import com.kazier.mobile.features.saf.FileDeleter @@ -94,7 +92,6 @@ fun FolderDetailScreen( ) { val uiState by viewModel.uiState.collectAsStateWithLifecycle() val authState by authViewModel.authState.collectAsStateWithLifecycle() - val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val shareState by shareViewModel.uiState.collectAsStateWithLifecycle() val selection = rememberSelectionState() var showCreateDialog by rememberSaveable { mutableStateOf(false) } @@ -189,13 +186,9 @@ fun FolderDetailScreen( contentDescription = stringResource(R.string.create_folder), ) } - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, - ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, + connectionStatusViewModel = connectionStatusViewModel, ) Box { IconButton(onClick = { showMoreMenu = true }) { diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListScreen.kt index 04e41c2..f3508e3 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListScreen.kt @@ -32,7 +32,6 @@ import androidx.compose.material.icons.filled.DocumentScanner import androidx.compose.material.icons.filled.EditNote import androidx.compose.material.icons.filled.Folder import androidx.compose.material.icons.filled.MoreVert -import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Share import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button @@ -53,6 +52,9 @@ import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar +import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults +import androidx.compose.material3.pulltorefresh.pullToRefresh +import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -88,11 +90,11 @@ import com.kazier.mobile.ui.components.FilePendingReviewBadge import com.kazier.mobile.ui.components.FileSyncStatusIcon import com.kazier.mobile.ui.components.FileThumbnail import com.kazier.mobile.ui.components.FolderNameDialog +import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.KazierCard +import com.kazier.mobile.ui.components.ReviewCtaCard import com.kazier.mobile.ui.components.SelectionState import com.kazier.mobile.ui.components.SelectionStatusIcon -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction import com.kazier.mobile.ui.components.formatFileSize import com.kazier.mobile.ui.components.rememberSelectionState import com.kazier.mobile.ui.components.reviewDelete @@ -124,12 +126,14 @@ fun FolderListScreen( onOpenDocument: (String) -> Unit, onBuildPdf: (List) -> Unit, onOpenScan: () -> Unit, + onOpenReview: () -> Unit, syncViewModel: SyncViewModel, connectionStatusViewModel: ConnectionStatusViewModel, authViewModel: AuthViewModel, viewModel: FolderListViewModel = hiltViewModel(), ) { val uiState by viewModel.uiState.collectAsStateWithLifecycle() + val unprocessed by viewModel.unprocessedCount.collectAsStateWithLifecycle() val authState by authViewModel.authState.collectAsStateWithLifecycle() val shareViewModel: ShareViewModel = hiltViewModel() val shareState by shareViewModel.uiState.collectAsStateWithLifecycle() @@ -290,17 +294,10 @@ fun FolderListScreen( }, actions = { if (!uiState.moveMode && !selection.active) { - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, + connectionStatusViewModel = connectionStatusViewModel, ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, - ) - IconButton(onClick = viewModel::refresh) { - Icon(Icons.Filled.Refresh, contentDescription = stringResource(R.string.refresh)) - } if (uiState.view == HomeView.FOLDERS && connectionStatus != ServerConnectionStatus.Local) { Box { IconButton(onClick = { showShareMenu = true }) { @@ -459,11 +456,30 @@ fun FolderListScreen( }, snackbarHost = { SnackbarHost(hostState = snackbarHostState) }, ) { padding -> - Column( + // Mode local : le refresh serveur est no-op — geste désactivé, sinon + // l'indicateur resterait coincé (jamais de cycle vrai→faux). + val pullState = rememberPullToRefreshState() + Box( modifier = Modifier .padding(padding) - .fillMaxSize(), + .fillMaxSize() + .pullToRefresh( + state = pullState, + enabled = connectionStatus != ServerConnectionStatus.Local, + isRefreshing = uiState.isRefreshing, + onRefresh = viewModel::refresh, + ), ) { + Column(modifier = Modifier.fillMaxSize()) { + if (unprocessed > 0 && !selection.active && !uiState.moveMode) { + ReviewCtaCard( + count = unprocessed, + onClick = onOpenReview, + modifier = Modifier + .fillMaxWidth() + .padding(start = 16.dp, end = 16.dp, top = 12.dp), + ) + } if (!selection.active) { HomeViewSelector( selected = uiState.view, @@ -494,6 +510,12 @@ fun FolderListScreen( onOpenDocument = onOpenDocument, modifier = Modifier.weight(1f), ) + } + PullToRefreshDefaults.Indicator( + state = pullState, + isRefreshing = uiState.isRefreshing, + modifier = Modifier.align(Alignment.TopCenter), + ) } } diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListViewModel.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListViewModel.kt index b0ad8b3..5dfee8a 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListViewModel.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/folderlist/FolderListViewModel.kt @@ -23,11 +23,13 @@ import com.kazier.mobile.features.saf.SafFolderCreator import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext 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.flatMapLatest import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import timber.log.Timber @@ -60,6 +62,10 @@ class FolderListViewModel @Inject constructor( private val _defaultRootId = MutableStateFlow(defaultRootStore.get()) val defaultRootId: StateFlow = _defaultRootId.asStateFlow() + /** Documents locaux restant à traiter — CTA review persistant (même source que le dashboard). */ + val unprocessedCount: StateFlow = fileRepository.observeUnprocessedCount() + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), initialValue = 0) + /** Dossier courant de l'explorateur Dossiers (null = racine par défaut). */ private val _browseFolderId = MutableStateFlow(null) diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/navigation/NavGraph.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/navigation/NavGraph.kt index cd9cbc0..37e40d3 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/navigation/NavGraph.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/navigation/NavGraph.kt @@ -105,7 +105,7 @@ fun NavGraph( Box(modifier = Modifier.fillMaxSize()) { NavHost( navController = navController, - startDestination = Routes.FILES, + startDestination = Routes.DASHBOARD, // Pas de transition animée entre les vues : changement instantané. enterTransition = { EnterTransition.None }, exitTransition = { ExitTransition.None }, @@ -119,6 +119,7 @@ fun NavGraph( onOpenDocument = { id -> navController.navigate(Routes.document(id)) }, onBuildPdf = { ids -> navController.navigate(Routes.pdfBuilder(ids)) }, onOpenScan = { navController.navigate(Routes.SCAN) }, + onOpenReview = { navController.navigate(Routes.REVIEW) }, syncViewModel = syncViewModel, connectionStatusViewModel = connectionStatusViewModel, authViewModel = authViewModel, diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/review/SwipeReviewScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/review/SwipeReviewScreen.kt index b9068d5..debee88 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/review/SwipeReviewScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/review/SwipeReviewScreen.kt @@ -45,10 +45,8 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.kazier.mobile.R import com.kazier.mobile.features.connection.ConnectionStatusViewModel -import com.kazier.mobile.features.connection.ServerConnectionStatus import com.kazier.mobile.features.sync.SyncViewModel -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction +import com.kazier.mobile.ui.components.HeaderStatusAction import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @@ -60,7 +58,6 @@ fun SwipeReviewScreen( viewModel: SwipeReviewViewModel = hiltViewModel(), ) { val state by viewModel.uiState.collectAsStateWithLifecycle() - val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } val scope = rememberCoroutineScope() val openExternalErrorMsg = stringResource(R.string.document_open_error) @@ -94,13 +91,9 @@ fun SwipeReviewScreen( } }, actions = { - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, - ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, + connectionStatusViewModel = connectionStatusViewModel, ) }, ) diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/search/SearchScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/search/SearchScreen.kt index b75a69b..1eb50fb 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/search/SearchScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/search/SearchScreen.kt @@ -56,7 +56,6 @@ import com.kazier.mobile.R import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.domain.FileCategory import com.kazier.mobile.features.connection.ConnectionStatusViewModel -import com.kazier.mobile.features.connection.ServerConnectionStatus import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.features.saf.FileDeleter import com.kazier.mobile.ui.components.DeleteConfirmDialog @@ -66,11 +65,10 @@ import com.kazier.mobile.ui.components.FileCategoryIcon import com.kazier.mobile.ui.components.FilePendingReviewBadge import com.kazier.mobile.ui.components.FileSyncStatusIcon import com.kazier.mobile.ui.components.KazierCard +import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.MoveFolderPickerDialog import com.kazier.mobile.ui.components.SelectionState import com.kazier.mobile.ui.components.SelectionStatusIcon -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction import com.kazier.mobile.ui.components.formatFileSize import com.kazier.mobile.ui.components.label import com.kazier.mobile.ui.components.icon @@ -94,7 +92,6 @@ fun SearchScreen( viewModel: SearchViewModel = hiltViewModel(), ) { val uiState by viewModel.uiState.collectAsStateWithLifecycle() - val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val moveFolders by viewModel.moveFolders.collectAsStateWithLifecycle() val moveError by viewModel.moveError.collectAsStateWithLifecycle() val deleteError by viewModel.deleteError.collectAsStateWithLifecycle() @@ -159,13 +156,9 @@ fun SearchScreen( }, actions = { if (!selection.active) { - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, - ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, + connectionStatusViewModel = connectionStatusViewModel, ) } }, diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/settings/SettingsScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/settings/SettingsScreen.kt index 9c8d47c..e0061b0 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/settings/SettingsScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/settings/SettingsScreen.kt @@ -50,14 +50,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.kazier.mobile.R import com.kazier.mobile.domain.ThemePreference import com.kazier.mobile.features.connection.ConnectionStatusViewModel -import com.kazier.mobile.features.connection.ServerConnectionStatus import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.ui.auth.AuthState import com.kazier.mobile.ui.auth.AuthViewModel import com.kazier.mobile.ui.auth.LoginForm import com.kazier.mobile.ui.auth.authErrorResFor -import com.kazier.mobile.ui.components.ServerStatusBadge -import com.kazier.mobile.ui.components.SyncStatusAction +import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.WatchedFoldersBadge import com.kazier.mobile.ui.navigation.FloatingNavBar import com.kazier.mobile.ui.navigation.NavTab @@ -76,7 +74,6 @@ fun SettingsScreen( val theme by viewModel.theme.collectAsStateWithLifecycle() val serverUrl by viewModel.serverUrl.collectAsStateWithLifecycle() val testUiState by viewModel.testUiState.collectAsStateWithLifecycle() - val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val authState by authViewModel.authState.collectAsStateWithLifecycle() val loginUi by authViewModel.loginUiState.collectAsStateWithLifecycle() @@ -99,13 +96,9 @@ fun SettingsScreen( TopAppBar( title = { Text(stringResource(R.string.settings)) }, actions = { - SyncStatusAction( + HeaderStatusAction( syncViewModel = syncViewModel, - isLocal = connectionStatus == ServerConnectionStatus.Local, - ) - ServerStatusBadge( - status = connectionStatus, - onClick = connectionStatusViewModel::checkNow, + connectionStatusViewModel = connectionStatusViewModel, ) }, ) diff --git a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/watchedfolders/WatchedFoldersScreen.kt b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/watchedfolders/WatchedFoldersScreen.kt index f6fc01a..1577c69 100644 --- a/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/watchedfolders/WatchedFoldersScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/kazier/mobile/ui/watchedfolders/WatchedFoldersScreen.kt @@ -28,11 +28,16 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext @@ -64,6 +69,20 @@ fun WatchedFoldersScreen( val context = LocalContext.current val folderLabel = stringResource(R.string.folder) + val importDoneLabel = stringResource(R.string.settings_import_done) + val snackbarHostState = remember { SnackbarHostState() } + // Erreur d'import → snackbar (une fois par message, auto-dismiss). + LaunchedEffect(importState.error) { + importState.error?.let { snackbarHostState.showSnackbar(it) } + } + // Fin d'import sans erreur → confirmation (succès silencieux sinon). + var wasImporting by remember { mutableStateOf(false) } + LaunchedEffect(importState.isImporting) { + if (wasImporting && !importState.isImporting && importState.error == null) { + snackbarHostState.showSnackbar(importDoneLabel) + } + wasImporting = importState.isImporting + } val pickFolderLauncher = rememberLauncherForActivityResult( ActivityResultContracts.OpenDocumentTree(), ) { uri: Uri? -> @@ -95,6 +114,7 @@ fun WatchedFoldersScreen( }, ) }, + snackbarHost = { SnackbarHost(hostState = snackbarHostState) }, ) { padding -> LazyColumn( modifier = Modifier @@ -126,20 +146,6 @@ fun WatchedFoldersScreen( } } - importState.error?.let { message -> - item(key = "import-error") { - Text( - text = message, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.error, - textAlign = TextAlign.Center, - modifier = Modifier - .fillMaxWidth() - .padding(top = 12.dp), - ) - } - } - items(folders, key = { it.resourceId }) { root -> WatchedFolderRow( folder = root, diff --git a/mobile-kotlin/app/src/main/res/values-en/strings.xml b/mobile-kotlin/app/src/main/res/values-en/strings.xml index 287f661..b41aee3 100644 --- a/mobile-kotlin/app/src/main/res/values-en/strings.xml +++ b/mobile-kotlin/app/src/main/res/values-en/strings.xml @@ -136,6 +136,11 @@ Sign out from %1$s? Close Cancel + Import finished + + + Connection status + View queue 99+ @@ -166,6 +171,7 @@ Could not sign in right now Incorrect username or password Continue without account + Choose how to use Kazier Local mode — your folders stay on this device and are not synced. @@ -177,20 +183,20 @@ Syncing… - %1$d pending - 1 pending + %1$d to send + 1 to send Up to date - Sync — tap to view the operations list - Sync list - No operations yet. + Status — tap for details + Sync + Nothing here yet. Close - %1$d operations - %1$d pending + %1$d items + %1$d to send %1$d failed - Pending - Synced + To send + Sent Failed - Create resource + Added Move Delete Update diff --git a/mobile-kotlin/app/src/main/res/values/strings.xml b/mobile-kotlin/app/src/main/res/values/strings.xml index 946e9ac..afff075 100644 --- a/mobile-kotlin/app/src/main/res/values/strings.xml +++ b/mobile-kotlin/app/src/main/res/values/strings.xml @@ -136,6 +136,11 @@ Se déconnecter du compte %1$s ? Fermer Annuler + Import terminé + + + État de la connexion + Voir la file 99+ @@ -166,6 +171,7 @@ Impossible de se connecter pour le moment Nom d\'utilisateur ou mot de passe incorrect Continuer sans compte + Choisis comment utiliser Kazier Mode local — tes dossiers restent sur cet appareil et ne sont pas synchronisés. @@ -177,20 +183,20 @@ Synchro… - %1$d en attente - 1 en attente + %1$d à envoyer + 1 à envoyer À jour - Synchro — appuyer pour voir la liste des ops - Liste des sync - Aucune opération pour le moment. + État — appuyer pour voir le détail + Synchronisation + Aucun élément pour le moment. Fermer - %1$d opérations - %1$d en attente - %1$d échouée(s) - En attente - Poussée - Échouée - Création de ressource + %1$d éléments + %1$d à envoyer + %1$d en échec + À envoyer + Envoyé + En échec + Ajout Déplacement Suppression Mise à jour