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 index 15fc030..aa5eb12 100644 --- 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 @@ -123,12 +123,15 @@ fun SyncStatusBadge( /** * 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) } 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 f565a7d..d5b4438 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 @@ -34,6 +34,7 @@ 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.KazierCard import com.kazier.mobile.ui.components.ServerStatusBadge @@ -55,14 +56,19 @@ fun DashboardScreen( val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val unprocessed by viewModel.unprocessedCount.collectAsStateWithLifecycle() val syncStatus by syncViewModel.syncStatus.collectAsStateWithLifecycle() - val showSyncCard = syncStatus.syncing || syncStatus.pending > 0 || syncStatus.failed > 0 + // Mode local : rien n'est poussé vers le serveur, la carte sync est inutile. + val isLocal = connectionStatus == ServerConnectionStatus.Local + val showSyncCard = !isLocal && (syncStatus.syncing || syncStatus.pending > 0 || syncStatus.failed > 0) Scaffold( topBar = { TopAppBar( title = { Text(stringResource(R.string.dashboard)) }, actions = { - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow, 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 a6655e6..0e3f5d0 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,6 +80,7 @@ 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 @@ -254,7 +255,10 @@ fun DocumentViewerScreen( } }, actions = { - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow, 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 9762911..f6cc43a 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,6 +53,7 @@ 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 @@ -188,7 +189,10 @@ fun FolderDetailScreen( contentDescription = stringResource(R.string.create_folder), ) } - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow, 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 ba60641..04e41c2 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 @@ -290,7 +290,10 @@ fun FolderListScreen( }, actions = { if (!uiState.moveMode && !selection.active) { - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow, 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 79b63b8..b9068d5 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,6 +45,7 @@ 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 @@ -93,7 +94,10 @@ fun SwipeReviewScreen( } }, actions = { - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow, 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 3e400d3..b75a69b 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,6 +56,7 @@ 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 @@ -158,7 +159,10 @@ fun SearchScreen( }, actions = { if (!selection.active) { - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow, 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 13d47a1..9c8d47c 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,6 +50,7 @@ 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 @@ -98,7 +99,10 @@ fun SettingsScreen( TopAppBar( title = { Text(stringResource(R.string.settings)) }, actions = { - SyncStatusAction(syncViewModel = syncViewModel) + SyncStatusAction( + syncViewModel = syncViewModel, + isLocal = connectionStatus == ServerConnectionStatus.Local, + ) ServerStatusBadge( status = connectionStatus, onClick = connectionStatusViewModel::checkNow,