mahefa/feufaro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve ux by back btn to hide ui before exit - Android

Browse source
This commit is contained in:
Hasinjato 2026-08-17 15:33:27 +03:00
parent b8b9eda836
commit 88b734cdc2
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt
View file

@ -56,7 +56,6 @@ object ScreenSolfa : Screen {
var showContextualMenu = false
var viewportHeight by remember { mutableStateOf(0) }
var isScanning by remember { mutableStateOf(false) }
var qrCodeResult by remember { mutableStateOf("Aucun code scanné") }
LaunchedEffect(Unit) {
DeepLinkHandler.onSongReceived = { content, filePath ->
@ -88,9 +87,6 @@ object ScreenSolfa : Screen {
solfaScreenModel,
sharedScreenModel,
qrCodeResult = qrCodeResult,
onScannerButtonClick = {
isScanning = true
},
solfaScrollState = scrollState
) { paddingValues ->
Box(

26
composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt
View file

@ -40,6 +40,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
import cafe.adriel.voyager.navigator.internal.BackHandler
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@ -53,13 +55,13 @@ import mg.dot.feufaro.solfa.Transpose
import mg.dot.feufaro.viewmodel.SolfaScreenModel
import java.io.File
@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, InternalVoyagerApi::class)
@Composable
fun MainScreenWithDrawer(
solfaScreenModel: SolfaScreenModel,
sharedScreenModel: SharedScreenModel,
qrCodeResult: String,
onScannerButtonClick: () -> Unit,
solfaScrollState: ScrollState,
content: @Composable (PaddingValues) -> Unit,
) {
@ -199,6 +201,22 @@ fun MainScreenWithDrawer(
val density = LocalDensity.current
var keyboardHeightDp by remember { mutableStateOf(0.dp) }
BackHandler(enabled = isSearchActive) {
sharedScreenModel.showSearchMenu(false)
}
BackHandler(enabled = showMidiCtrl) {
sharedScreenModel.setMidiCtrl(false)
}
BackHandler(enabled = isQrVisible) {
sharedScreenModel.toggleQRCodeVisibility()
}
BackHandler(enabled = (!showMidiCtrl && isExpanded)) {
sharedScreenModel.setExpandedFAB(!isExpanded)
}
BackHandler(enabled = drawerState.isOpen) {
scope.launch { drawerState.close() }
}
ModalNavigationDrawer(drawerState = drawerState, drawerContent = {
SimpleDrawerContent(
items,
@ -207,10 +225,6 @@ fun MainScreenWithDrawer(
currentActivePath,
drawerState,
scope,
onScannerButtonClick = {
scope.launch { drawerState.close() }
onScannerButtonClick()
},
onSongSelected = { newSong ->
sharedScreenModel.loadNewSong("$midiFile")
},

3
composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/SimpleDrawerContent.kt
View file

@ -45,7 +45,6 @@ fun SimpleDrawerContent(
activePath: String = Solfa.currentFile,
drawerState: DrawerState,
scope: CoroutineScope,
onScannerButtonClick: () -> Unit,
onSongSelected: (String) -> Unit,
onSettingsCheck: () -> Unit,
onAboutCheck: () -> Unit,
@ -195,7 +194,7 @@ fun SimpleDrawerContent(
stickyHeader {
DrawerHeaderSticky(
title = "Personnel",
title = "Fichiers locaux",
icon = Icons.Default.LibraryMusic,
isExpanded = externalExpanded,
onToggle = { externalExpanded = !externalExpanded },