Skip to content

Fixing paddings for scaffold #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandroBorgesFerreira merged 1 commit into from
Nov 28, 2025
Merged

Fixing paddings for scaffold #539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 48 additions & 44 deletions ...menu/src/commonMain/kotlin/io/writeopia/notemenu/ui/screen/menu/MobileChooseNoteScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -70,6 +71,10 @@ internal fun MobileChooseNoteScreen(
val hasSelectedNotes by chooseNoteViewModel.hasSelectedNotes.collectAsState()
val editState by chooseNoteViewModel.editState.collectAsState()

val folderEdit = chooseNoteViewModel.editFolderState.collectAsState().value

val showFab by derivedStateOf { !editState && !hasSelectedNotes }

Box(modifier = modifier.fillMaxSize()) {
Scaffold(
topBar = {
Expand All @@ -80,69 +85,68 @@ internal fun MobileChooseNoteScreen(
)
},
floatingActionButton = {
FloatingActionButton(onClick = chooseNoteViewModel::showAddMenu)
if (showFab) {
FloatingActionButton(onClick = chooseNoteViewModel::showAddMenu)
}
},
bottomBar = navigationBar
) { paddingValues ->
DraggableScreen {
DraggableScreen(modifier = Modifier.padding(paddingValues)) {
Content(
isDarkTheme = isDarkTheme,
chooseNoteViewModel = chooseNoteViewModel,
sharedTransitionScope = sharedTransitionScope,
animatedVisibilityScope = animatedVisibilityScope,
loadNote = navigateToNote,
selectionListener = chooseNoteViewModel::onDocumentSelected,
paddingValues = paddingValues,
paddingValues = PaddingValues(),
newNote = newNote,
navigateToNotes = navigateToNotes,
)
}
}

NotesSelectionMenu(
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(8.dp),
visibilityState = hasSelectedNotes,
onDelete = chooseNoteViewModel::requestPermissionToDeleteSelection,
onCopy = chooseNoteViewModel::copySelectedNotes,
onFavorite = chooseNoteViewModel::favoriteSelectedNotes,
onClose = chooseNoteViewModel::clearSelection,
shape = MaterialTheme.shapes.large
)

val selected = chooseNoteViewModel.notesArrangement.toNumberDesktop()
val selected = chooseNoteViewModel.notesArrangement.toNumberDesktop()

MobileConfigurationsMenu(
selected = selected,
visibilityState = editState,
outsideClick = chooseNoteViewModel::cancelEditMenu,
staggeredGridOptionClick = chooseNoteViewModel::staggeredGridArrangementSelected,
gridOptionClick = chooseNoteViewModel::gridArrangementSelected,
listOptionClick = chooseNoteViewModel::listArrangementSelected,
sortingSelected = chooseNoteViewModel::sortingSelected,
sortingState = chooseNoteViewModel.orderByState
)
MobileConfigurationsMenu(
selected = selected,
visibilityState = editState,
outsideClick = chooseNoteViewModel::cancelEditMenu,
staggeredGridOptionClick = chooseNoteViewModel::staggeredGridArrangementSelected,
gridOptionClick = chooseNoteViewModel::gridArrangementSelected,
listOptionClick = chooseNoteViewModel::listArrangementSelected,
sortingSelected = chooseNoteViewModel::sortingSelected,
sortingState = chooseNoteViewModel.orderByState
)

val titlesToDelete by chooseNoteViewModel.titlesToDelete.collectAsState()
val titlesToDelete by chooseNoteViewModel.titlesToDelete.collectAsState()

if (titlesToDelete.isNotEmpty()) {
DeleteConfirmationDialog(
onConfirmation = chooseNoteViewModel::deleteSelectedNotes,
onCancel = chooseNoteViewModel::cancelDeletion,
)
}
if (titlesToDelete.isNotEmpty()) {
DeleteConfirmationDialog(
onConfirmation = chooseNoteViewModel::deleteSelectedNotes,
onCancel = chooseNoteViewModel::cancelDeletion,
)
}

val folderEdit =
chooseNoteViewModel.editFolderState.collectAsState().value
if (folderEdit != null) {
EditFileScreen(
folderEdit = folderEdit,
onDismissRequest = chooseNoteViewModel::stopEditingFolder,
deleteFolder = chooseNoteViewModel::deleteFolder,
editFolder = chooseNoteViewModel::updateFolder
)
}

if (folderEdit != null) {
EditFileScreen(
folderEdit = folderEdit,
onDismissRequest = chooseNoteViewModel::stopEditingFolder,
deleteFolder = chooseNoteViewModel::deleteFolder,
editFolder = chooseNoteViewModel::updateFolder
)
NotesSelectionMenu(
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(8.dp),
visibilityState = hasSelectedNotes,
onDelete = chooseNoteViewModel::requestPermissionToDeleteSelection,
onCopy = chooseNoteViewModel::copySelectedNotes,
onFavorite = chooseNoteViewModel::favoriteSelectedNotes,
onClose = chooseNoteViewModel::clearSelection,
shape = MaterialTheme.shapes.large
)
}
}
}
}
Expand Down