hide sync status is local mode app
CI / lint-backend (push) Successful in 1m21s
CI / lint-mobile (push) Successful in 20m43s
CI / test-backend (push) Successful in 1m50s
CI / test-mobile (push) Successful in 8m49s
CI / build-backend (push) Successful in 45s
CI / docker (push) Successful in 3m50s

This commit is contained in:
venture
2026-09-25 12:09:14 +02:00
parent 25bab43b21
commit 25aedb431e
8 changed files with 40 additions and 8 deletions
@@ -123,12 +123,15 @@ fun SyncStatusBadge(
/** /**
* Composable prêt-à-poser dans un header : badge + dialogue « liste des sync ». * Composable prêt-à-poser dans un header : badge + dialogue « liste des sync ».
* Le dialogue est géré localement (état `showList`), aucun wiring externe. * 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 @Composable
fun SyncStatusAction( fun SyncStatusAction(
syncViewModel: SyncViewModel, syncViewModel: SyncViewModel,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
isLocal: Boolean = false,
) { ) {
if (isLocal) return
val status by syncViewModel.syncStatus.collectAsStateWithLifecycle() val status by syncViewModel.syncStatus.collectAsStateWithLifecycle()
var showList by rememberSaveable { mutableStateOf(false) } var showList by rememberSaveable { mutableStateOf(false) }
@@ -34,6 +34,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.kazier.mobile.R import com.kazier.mobile.R
import com.kazier.mobile.features.connection.ConnectionStatusViewModel 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.sync.SyncViewModel
import com.kazier.mobile.ui.components.KazierCard import com.kazier.mobile.ui.components.KazierCard
import com.kazier.mobile.ui.components.ServerStatusBadge import com.kazier.mobile.ui.components.ServerStatusBadge
@@ -55,14 +56,19 @@ fun DashboardScreen(
val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle() val connectionStatus by connectionStatusViewModel.status.collectAsStateWithLifecycle()
val unprocessed by viewModel.unprocessedCount.collectAsStateWithLifecycle() val unprocessed by viewModel.unprocessedCount.collectAsStateWithLifecycle()
val syncStatus by syncViewModel.syncStatus.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( Scaffold(
topBar = { topBar = {
TopAppBar( TopAppBar(
title = { Text(stringResource(R.string.dashboard)) }, title = { Text(stringResource(R.string.dashboard)) },
actions = { actions = {
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,
@@ -80,6 +80,7 @@ import com.kazier.mobile.data.local.entity.FileStatus
import com.kazier.mobile.data.remote.dto.OcrJobStatus import com.kazier.mobile.data.remote.dto.OcrJobStatus
import com.kazier.mobile.domain.FileCategory import com.kazier.mobile.domain.FileCategory
import com.kazier.mobile.features.connection.ConnectionStatusViewModel 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.ocr.OcrViewModel
import com.kazier.mobile.features.saf.FileDeleter import com.kazier.mobile.features.saf.FileDeleter
import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.features.sync.SyncViewModel
@@ -254,7 +255,10 @@ fun DocumentViewerScreen(
} }
}, },
actions = { actions = {
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,
@@ -53,6 +53,7 @@ import com.kazier.mobile.R
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.local.entity.FolderEntity import com.kazier.mobile.data.local.entity.FolderEntity
import com.kazier.mobile.features.connection.ConnectionStatusViewModel 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.sync.SyncViewModel
import com.kazier.mobile.ui.components.FilePendingReviewBadge import com.kazier.mobile.ui.components.FilePendingReviewBadge
import com.kazier.mobile.ui.components.FileSyncStatusIcon import com.kazier.mobile.ui.components.FileSyncStatusIcon
@@ -188,7 +189,10 @@ fun FolderDetailScreen(
contentDescription = stringResource(R.string.create_folder), contentDescription = stringResource(R.string.create_folder),
) )
} }
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,
@@ -290,7 +290,10 @@ fun FolderListScreen(
}, },
actions = { actions = {
if (!uiState.moveMode && !selection.active) { if (!uiState.moveMode && !selection.active) {
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,
@@ -45,6 +45,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.kazier.mobile.R import com.kazier.mobile.R
import com.kazier.mobile.features.connection.ConnectionStatusViewModel 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.sync.SyncViewModel
import com.kazier.mobile.ui.components.ServerStatusBadge import com.kazier.mobile.ui.components.ServerStatusBadge
import com.kazier.mobile.ui.components.SyncStatusAction import com.kazier.mobile.ui.components.SyncStatusAction
@@ -93,7 +94,10 @@ fun SwipeReviewScreen(
} }
}, },
actions = { actions = {
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,
@@ -56,6 +56,7 @@ import com.kazier.mobile.R
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.domain.FileCategory import com.kazier.mobile.domain.FileCategory
import com.kazier.mobile.features.connection.ConnectionStatusViewModel 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.sync.SyncViewModel
import com.kazier.mobile.features.saf.FileDeleter import com.kazier.mobile.features.saf.FileDeleter
import com.kazier.mobile.ui.components.DeleteConfirmDialog import com.kazier.mobile.ui.components.DeleteConfirmDialog
@@ -158,7 +159,10 @@ fun SearchScreen(
}, },
actions = { actions = {
if (!selection.active) { if (!selection.active) {
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,
@@ -50,6 +50,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.kazier.mobile.R import com.kazier.mobile.R
import com.kazier.mobile.domain.ThemePreference import com.kazier.mobile.domain.ThemePreference
import com.kazier.mobile.features.connection.ConnectionStatusViewModel 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.sync.SyncViewModel
import com.kazier.mobile.ui.auth.AuthState import com.kazier.mobile.ui.auth.AuthState
import com.kazier.mobile.ui.auth.AuthViewModel import com.kazier.mobile.ui.auth.AuthViewModel
@@ -98,7 +99,10 @@ fun SettingsScreen(
TopAppBar( TopAppBar(
title = { Text(stringResource(R.string.settings)) }, title = { Text(stringResource(R.string.settings)) },
actions = { actions = {
SyncStatusAction(syncViewModel = syncViewModel) SyncStatusAction(
syncViewModel = syncViewModel,
isLocal = connectionStatus == ServerConnectionStatus.Local,
)
ServerStatusBadge( ServerStatusBadge(
status = connectionStatus, status = connectionStatus,
onClick = connectionStatusViewModel::checkNow, onClick = connectionStatusViewModel::checkNow,