Skip to content

feat(message-list): item UI improvements #9804

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
rafaeltonholo merged 3 commits into from
Sep 16, 2025
Merged

feat(message-list): item UI improvements #9804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b7c54
feat(message-list): add long click support to MessageItem
wmontwe Sep 10, 2025
8e4b846
feat(message-list): change MessageListItem to expose onLeadingClick
wmontwe Sep 11, 2025
0de7fcc
fix: detekt errors
wmontwe Sep 16, 2025
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
126 changes: 108 additions & 18 deletions ...n/kotlin/net/thunderbird/ui/catalog/ui/page/organism/items/message/CatalogMessageItems.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -29,11 +30,14 @@ import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleMedium
import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleSmall
import app.k9mail.core.ui.compose.designsystem.atom.textfield.TextFieldOutlined
import app.k9mail.core.ui.compose.designsystem.molecule.input.CheckboxInput
import app.k9mail.core.ui.compose.designsystem.organism.snackbar.SnackbarHost
import app.k9mail.core.ui.compose.designsystem.organism.snackbar.rememberSnackbarHostState
import app.k9mail.core.ui.compose.theme2.MainTheme
import kotlin.math.roundToInt
import kotlin.random.Random
import kotlin.time.Clock
import kotlin.time.ExperimentalTime
import kotlinx.coroutines.launch
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime
import net.thunderbird.core.ui.compose.designsystem.organism.message.ActiveMessageItem
Expand Down Expand Up @@ -99,6 +103,7 @@ private data class MessageItemConfiguration(
val maxPreviewLines: Int,
)

@Suppress("LongMethod")
@Composable
private fun MessageItemConfiguration(
config: MessageItemConfiguration,
Expand Down Expand Up @@ -141,21 +146,27 @@ private fun MessageItemConfiguration(
label = "Sender",
onValueChange = onSenderChange,
isSingleLine = true,
modifier = Modifier.fillMaxWidth().padding(horizontal = MainTheme.spacings.double),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = MainTheme.spacings.double),
)
TextFieldOutlined(
value = config.subject,
label = "Subject",
onValueChange = onSubjectChange,
isSingleLine = true,
modifier = Modifier.fillMaxWidth().padding(horizontal = MainTheme.spacings.double),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = MainTheme.spacings.double),
)
TextFieldOutlined(
value = config.preview,
label = "Preview",
onValueChange = onPreviewChange,
isSingleLine = false,
modifier = Modifier.fillMaxWidth().padding(horizontal = MainTheme.spacings.double),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = MainTheme.spacings.double),
)
Column(modifier = Modifier.padding(horizontal = MainTheme.spacings.double)) {
TextLabelSmall(text = "Preview lines: ${config.maxPreviewLines}")
Expand All @@ -181,12 +192,17 @@ private fun CatalogMessageItems(config: MessageItemConfiguration, modifier: Modi
}

@Composable
private fun ColumnScope.CatalogNewMessageItem(config: MessageItemConfiguration) {
private fun ColumnScope.CatalogNewMessageItem(
config: MessageItemConfiguration,
) {
if (!config.hideSection) {
Section(text = "New Message", modifier = Modifier.padding(vertical = MainTheme.spacings.double))
}
var selected by remember { mutableStateOf(false) }
var favourite by remember { mutableStateOf(false) }
val snackbarHostState = rememberSnackbarHostState()
val coroutineScope = rememberCoroutineScope()

NewMessageItem(
sender = config.sender,
subject = config.subject,
Expand All @@ -204,10 +220,18 @@ private fun ColumnScope.CatalogNewMessageItem(config: MessageItemConfiguration)
}
},
onClick = {
if (selected) {
selected = false
coroutineScope.launch {
snackbarHostState.showSnackbar("Clicked!")
}
},
onLongClick = {
coroutineScope.launch {
snackbarHostState.showSnackbar("Long clicked!")
}
},
onLeadingClick = {
selected = !selected
},
onFavouriteChange = { favourite = it },
modifier = Modifier.fillMaxWidth(),
selected = selected,
Expand All @@ -217,15 +241,23 @@ private fun ColumnScope.CatalogNewMessageItem(config: MessageItemConfiguration)
},
maxPreviewLines = config.maxPreviewLines,
)

SnackbarHost(snackbarHostState)
}

@Composable
private fun ColumnScope.CatalogUnreadMessageItem(config: MessageItemConfiguration) {
private fun ColumnScope.CatalogUnreadMessageItem(
config: MessageItemConfiguration,
) {
if (!config.hideSection) {
Section(text = "Unread Message", modifier = Modifier.padding(vertical = MainTheme.spacings.double))
}
var selected by remember { mutableStateOf(false) }
var favourite by remember { mutableStateOf(false) }

val snackbarHostState = rememberSnackbarHostState()
val coroutineScope = rememberCoroutineScope()

UnreadMessageItem(
sender = config.sender,
subject = config.subject,
Expand All @@ -243,10 +275,18 @@ private fun ColumnScope.CatalogUnreadMessageItem(config: MessageItemConfiguratio
}
},
onClick = {
if (selected) {
selected = false
coroutineScope.launch {
snackbarHostState.showSnackbar("Clicked!")
}
},
onLongClick = {
coroutineScope.launch {
snackbarHostState.showSnackbar("Long clicked!")
}
},
onLeadingClick = {
selected = !selected
},
onFavouriteChange = { favourite = it },
modifier = Modifier.fillMaxWidth(),
selected = selected,
Expand All @@ -256,15 +296,23 @@ private fun ColumnScope.CatalogUnreadMessageItem(config: MessageItemConfiguratio
},
maxPreviewLines = config.maxPreviewLines,
)

SnackbarHost(snackbarHostState)
}

@Composable
private fun ColumnScope.CatalogReadMessageItem(config: MessageItemConfiguration) {
private fun ColumnScope.CatalogReadMessageItem(
config: MessageItemConfiguration,
) {
if (!config.hideSection) {
Section(text = "Read Message", modifier = Modifier.padding(vertical = MainTheme.spacings.double))
}
var selected by remember { mutableStateOf(false) }
var favourite by remember { mutableStateOf(false) }

val snackbarHostState = rememberSnackbarHostState()
val coroutineScope = rememberCoroutineScope()

ReadMessageItem(
sender = config.sender,
subject = config.subject,
Expand All @@ -282,10 +330,18 @@ private fun ColumnScope.CatalogReadMessageItem(config: MessageItemConfiguration)
}
},
onClick = {
if (selected) {
selected = false
coroutineScope.launch {
snackbarHostState.showSnackbar("Clicked!")
}
},
onLongClick = {
coroutineScope.launch {
snackbarHostState.showSnackbar("Long clicked!")
}
},
onLeadingClick = {
selected = !selected
},
onFavouriteChange = { favourite = it },
modifier = Modifier.fillMaxWidth(),
selected = selected,
Expand All @@ -295,15 +351,23 @@ private fun ColumnScope.CatalogReadMessageItem(config: MessageItemConfiguration)
},
maxPreviewLines = config.maxPreviewLines,
)

SnackbarHost(snackbarHostState)
}

@Composable
private fun ColumnScope.CatalogActiveMessageItem(config: MessageItemConfiguration) {
private fun ColumnScope.CatalogActiveMessageItem(
config: MessageItemConfiguration,
) {
if (!config.hideSection) {
Section(text = "Active Message", modifier = Modifier.padding(vertical = MainTheme.spacings.double))
}
var selected by remember { mutableStateOf(false) }
var favourite by remember { mutableStateOf(false) }

val snackbarHostState = rememberSnackbarHostState()
val coroutineScope = rememberCoroutineScope()

ActiveMessageItem(
sender = config.sender,
subject = config.subject,
Expand All @@ -321,10 +385,18 @@ private fun ColumnScope.CatalogActiveMessageItem(config: MessageItemConfiguratio
}
},
onClick = {
if (selected) {
selected = false
coroutineScope.launch {
snackbarHostState.showSnackbar("Clicked!")
}
},
onLongClick = {
coroutineScope.launch {
snackbarHostState.showSnackbar("Long clicked!")
}
},
onLeadingClick = {
selected = !selected
},
onFavouriteChange = { favourite = it },
modifier = Modifier.fillMaxWidth(),
selected = selected,
Expand All @@ -334,14 +406,22 @@ private fun ColumnScope.CatalogActiveMessageItem(config: MessageItemConfiguratio
},
maxPreviewLines = config.maxPreviewLines,
)

SnackbarHost(snackbarHostState)
}

@Composable
private fun ColumnScope.CatalogJunkMessageItem(config: MessageItemConfiguration) {
private fun ColumnScope.CatalogJunkMessageItem(
config: MessageItemConfiguration,
) {
if (!config.hideSection) {
Section(text = "Junk Message", modifier = Modifier.padding(vertical = MainTheme.spacings.double))
}
var selected by remember { mutableStateOf(false) }

val snackbarHostState = rememberSnackbarHostState()
val coroutineScope = rememberCoroutineScope()

JunkMessageItem(
sender = config.sender,
subject = config.subject,
Expand All @@ -358,10 +438,18 @@ private fun ColumnScope.CatalogJunkMessageItem(config: MessageItemConfiguration)
}
},
onClick = {
if (selected) {
selected = false
coroutineScope.launch {
snackbarHostState.showSnackbar("Clicked!")
}
},
onLongClick = {
coroutineScope.launch {
snackbarHostState.showSnackbar("Long clicked!")
}
},
onLeadingClick = {
selected = !selected
},
modifier = Modifier.fillMaxWidth(),
selected = selected,
swapSenderWithSubject = config.swapSenderAndSubject,
Expand All @@ -370,6 +458,8 @@ private fun ColumnScope.CatalogJunkMessageItem(config: MessageItemConfiguration)
},
maxPreviewLines = config.maxPreviewLines,
)

SnackbarHost(snackbarHostState)
}

@Composable
Expand Down
10 changes: 8 additions & 2 deletions ...net/thunderbird/core/ui/compose/designsystem/organism/message/ActiveMessageItemPreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ private fun PreviewDefault(
}
},
onClick = { },
onFavouriteChange = {},
onLongClick = { },
onLeadingClick = { },
onFavouriteChange = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand All @@ -156,7 +158,9 @@ private fun PreviewCompact(
receivedAt = @OptIn(ExperimentalTime::class) Clock.System.now().toLocalDateTime(TimeZone.UTC),
avatar = { },
onClick = { },
onFavouriteChange = {},
onLongClick = { },
onLeadingClick = { },
onFavouriteChange = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand All @@ -181,6 +185,8 @@ private fun PreviewRelaxed(
receivedAt = @OptIn(ExperimentalTime::class) Clock.System.now().toLocalDateTime(TimeZone.UTC),
avatar = { },
onClick = { },
onLongClick = { },
onLeadingClick = { },
onFavouriteChange = {},
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
Expand Down
6 changes: 6 additions & 0 deletions ...n/net/thunderbird/core/ui/compose/designsystem/organism/message/JunkMessageItemPreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ private fun PreviewDefault(
}
},
onClick = { },
onLongClick = { },
onLeadingClick = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand All @@ -149,6 +151,8 @@ private fun PreviewCompact(
receivedAt = @OptIn(ExperimentalTime::class) Clock.System.now().toLocalDateTime(TimeZone.UTC),
avatar = { },
onClick = { },
onLongClick = { },
onLeadingClick = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand All @@ -172,6 +176,8 @@ private fun PreviewRelaxed(
receivedAt = @OptIn(ExperimentalTime::class) Clock.System.now().toLocalDateTime(TimeZone.UTC),
avatar = { },
onClick = { },
onLongClick = { },
onLeadingClick = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand Down
6 changes: 6 additions & 0 deletions ...otlin/net/thunderbird/core/ui/compose/designsystem/organism/message/MessageItemPreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ private fun PreviewDefault(
},
receivedAt = params.receivedAt,
onClick = { },
onLongClick = { },
onLeadingClick = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand Down Expand Up @@ -149,6 +151,8 @@ private fun PreviewCompact(
},
receivedAt = params.receivedAt,
onClick = { },
onLongClick = { },
onLeadingClick = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand Down Expand Up @@ -186,6 +190,8 @@ private fun PreviewRelaxed(
},
receivedAt = params.receivedAt,
onClick = { },
onLongClick = { },
onLeadingClick = { },
modifier = Modifier.padding(MainTheme.spacings.double),
hasAttachments = params.hasAttachments,
selected = params.selected,
Expand Down
Loading
Loading