chage floatting footer into scanned files
CI / lint-backend (push) Successful in 1m19s
CI / lint-mobile (push) Successful in 8m44s
CI / test-backend (push) Successful in 1m21s
CI / test-mobile (push) Successful in 8m55s
CI / build-backend (push) Successful in 45s
CI / docker (push) Successful in 9s
CI / lint-backend (push) Successful in 1m19s
CI / lint-mobile (push) Successful in 8m44s
CI / test-backend (push) Successful in 1m21s
CI / test-mobile (push) Successful in 8m55s
CI / build-backend (push) Successful in 45s
CI / docker (push) Successful in 9s
This commit is contained in:
@@ -13,10 +13,13 @@ import androidx.compose.foundation.layout.padding
|
|||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.widthIn
|
import androidx.compose.foundation.layout.widthIn
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.Add
|
||||||
import androidx.compose.material.icons.filled.Dashboard
|
import androidx.compose.material.icons.filled.Dashboard
|
||||||
import androidx.compose.material.icons.filled.DriveFileMove
|
import androidx.compose.material.icons.filled.DriveFileMove
|
||||||
import androidx.compose.material.icons.filled.Folder
|
import androidx.compose.material.icons.filled.Folder
|
||||||
import androidx.compose.material.icons.filled.MergeType
|
import androidx.compose.material.icons.filled.MergeType
|
||||||
|
import androidx.compose.material.icons.filled.PictureAsPdf
|
||||||
|
import androidx.compose.material.icons.filled.Save
|
||||||
import androidx.compose.material.icons.filled.Search
|
import androidx.compose.material.icons.filled.Search
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.material.icons.filled.Share
|
import androidx.compose.material.icons.filled.Share
|
||||||
@@ -201,6 +204,41 @@ fun FolderSelectionNavBar(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Barre d'actions de l'étape « pages scannées » : même pilule flottante que le reste de l'app. */
|
||||||
|
@Composable
|
||||||
|
fun ScanSessionNavBar(
|
||||||
|
onAddPage: () -> Unit,
|
||||||
|
onExportPdf: () -> Unit,
|
||||||
|
onExport: () -> Unit,
|
||||||
|
canExport: Boolean,
|
||||||
|
actionsEnabled: Boolean = true,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
|
FloatingPillContainer(modifier = modifier) {
|
||||||
|
SelectionAction(
|
||||||
|
label = stringResource(R.string.scan_add_page),
|
||||||
|
icon = Icons.Filled.Add,
|
||||||
|
enabled = actionsEnabled,
|
||||||
|
onClick = onAddPage,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
SelectionAction(
|
||||||
|
label = stringResource(R.string.scan_export_pdf),
|
||||||
|
icon = Icons.Filled.PictureAsPdf,
|
||||||
|
enabled = actionsEnabled && canExport,
|
||||||
|
onClick = onExportPdf,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
SelectionAction(
|
||||||
|
label = stringResource(R.string.scan_export),
|
||||||
|
icon = Icons.Filled.Save,
|
||||||
|
enabled = actionsEnabled && canExport,
|
||||||
|
onClick = onExport,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Barre du mode déplacement : bouton « Déplacer ici (N) » vers le dossier courant. */
|
/** Barre du mode déplacement : bouton « Déplacer ici (N) » vers le dossier courant. */
|
||||||
@Composable
|
@Composable
|
||||||
fun MoveTargetBar(
|
fun MoveTargetBar(
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ import androidx.core.content.ContextCompat
|
|||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
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.ui.navigation.ScanSessionNavBar
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Route unique du scanner — gère la permission caméra, le basculement entre
|
* Route unique du scanner — gère la permission caméra, le basculement entre
|
||||||
@@ -157,6 +158,19 @@ fun ScanFlowScreen(
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
snackbarHost = { SnackbarHost(snackbarHostState) },
|
snackbarHost = { SnackbarHost(snackbarHostState) },
|
||||||
|
bottomBar = {
|
||||||
|
if (stage == ScanStage.SESSION) {
|
||||||
|
ScanSessionNavBar(
|
||||||
|
onAddPage = viewModel::openCamera,
|
||||||
|
onExportPdf = viewModel::exportPdf,
|
||||||
|
onExport = viewModel::export,
|
||||||
|
canExport = pages.isNotEmpty(),
|
||||||
|
// Le voile `busy` ne couvre que le contenu : sans ça la
|
||||||
|
// barre resterait cliquable pendant l'export.
|
||||||
|
actionsEnabled = !busy,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
) { padding ->
|
) { padding ->
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
@@ -11,12 +11,9 @@ import androidx.compose.foundation.layout.size
|
|||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.foundation.lazy.itemsIndexed
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Add
|
|
||||||
import androidx.compose.material.icons.filled.Delete
|
import androidx.compose.material.icons.filled.Delete
|
||||||
import androidx.compose.material.icons.filled.KeyboardArrowDown
|
import androidx.compose.material.icons.filled.KeyboardArrowDown
|
||||||
import androidx.compose.material.icons.filled.KeyboardArrowUp
|
import androidx.compose.material.icons.filled.KeyboardArrowUp
|
||||||
import androidx.compose.material.icons.filled.PictureAsPdf
|
|
||||||
import androidx.compose.material.icons.filled.Save
|
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
@@ -29,19 +26,17 @@ import androidx.compose.ui.layout.ContentScale
|
|||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|
||||||
import coil.compose.AsyncImage
|
import coil.compose.AsyncImage
|
||||||
import com.kazier.mobile.R
|
import com.kazier.mobile.R
|
||||||
import com.kazier.mobile.data.local.entity.ScanPageEntity
|
import com.kazier.mobile.data.local.entity.ScanPageEntity
|
||||||
import com.kazier.mobile.ui.components.KazierCard
|
import com.kazier.mobile.ui.components.KazierCard
|
||||||
import com.kazier.mobile.ui.components.VerticalActionButton
|
|
||||||
import com.kazier.mobile.ui.theme.ThumbShape
|
import com.kazier.mobile.ui.theme.ThumbShape
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Étape « session » : pages capturées (miniatures), réordonnancement,
|
* Étape « session » : pages capturées (miniatures), réordonnancement et
|
||||||
* suppression, ajout d'une page et export vers le dossier Kazier
|
* suppression. Les actions (ajouter, exporter PDF, exporter) vivent dans la
|
||||||
* (1 fichier JPEG = 1 `create_resource` outbox).
|
* pilule flottante du [ScanFlowScreen] (même style que Fichiers/Dashboard).
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun SessionStage(
|
fun SessionStage(
|
||||||
@@ -85,38 +80,6 @@ fun SessionStage(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(12.dp),
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
|
||||||
) {
|
|
||||||
VerticalActionButton(
|
|
||||||
icon = Icons.Filled.Add,
|
|
||||||
label = stringResource(R.string.scan_add_page),
|
|
||||||
onClick = viewModel::openCamera,
|
|
||||||
enabled = true,
|
|
||||||
outlined = true,
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
VerticalActionButton(
|
|
||||||
icon = Icons.Filled.PictureAsPdf,
|
|
||||||
label = stringResource(R.string.scan_export_pdf),
|
|
||||||
onClick = viewModel::exportPdf,
|
|
||||||
enabled = pages.isNotEmpty(),
|
|
||||||
outlined = true,
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
VerticalActionButton(
|
|
||||||
icon = Icons.Filled.Save,
|
|
||||||
label = stringResource(R.string.scan_export),
|
|
||||||
onClick = viewModel::export,
|
|
||||||
enabled = pages.isNotEmpty(),
|
|
||||||
outlined = false,
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user