vrr/liseur
2
0
Fork 0
mirror of https://github.com/chmouel/liseur.git synced 2026-10-19 09:13:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: keep note actions reachable

Browse source
This commit is contained in:
Chmouel Boudjnah 2026-09-08 09:41:12 +02:00
parent 947b5eae53
commit 19cc68316d
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/kotlin/com/chmouel/liseur/reader/ReaderScreen.kt
View file

@ -2789,9 +2789,10 @@ fun ReaderScreen(
?.takeIf { viewedImage == null }
?.let { active ->
val existing = active.existing ?: return@let
val passage = existing.text?.takeIf { it.isNotBlank() } ?: active.text
NoteSheet(
annotation = existing,
passage = active.text,
passage = passage,
theme = readingTheme,
palette = highlightPalette,
actions = remember(active) {
@ -2805,7 +2806,7 @@ fun ReaderScreen(
},
onShare = {
context.shareText(
NoteText.share(active.text, existing.note),
NoteText.share(passage, existing.note),
publication.metadata.title,
)
dismissSelection()

25
app/src/main/kotlin/com/chmouel/liseur/reader/annotations/NoteSheet.kt
View file

@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.selection.SelectionContainer
@ -95,6 +96,7 @@ fun NoteSheet(
Column(
Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
.padding(horizontal = 24.dp)
.padding(bottom = 16.dp),
) {
@ -157,17 +159,22 @@ fun NoteSheet(
.fillMaxWidth()
.padding(top = 16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp),
) {
palette.chipsFor(tint).forEach { chip ->
TintChip(
tint = chip,
selected = chip == tint,
onClick = { actions.onRecolour(chip) },
ringColor = ink,
)
Row(
Modifier
.weight(1f)
.horizontalScroll(rememberScrollState()),
horizontalArrangement = Arrangement.spacedBy(6.dp),
) {
palette.chipsFor(tint).forEach { chip ->
TintChip(
tint = chip,
selected = chip == tint,
onClick = { actions.onRecolour(chip) },
ringColor = ink,
)
}
}
Spacer(Modifier.weight(1f))
IconButton(onClick = actions.onShare) {
Icon(
Icons.Outlined.Share,