Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8e4b846d authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

feat(message-list): change MessageListItem to expose onLeadingClick 

# Conflicts:
#	legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/item/MessageItemContent.kt
parent f9b7c542

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/organism/items/message/CatalogMessageItems.kt

+16 −2
Original line number Diff line number Diff line
@@ -31,14 +31,12 @@ 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.SnackbarHostState

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.CoroutineScope

import kotlinx.coroutines.launch

import kotlinx.datetime.TimeZone

import kotlinx.datetime.toLocalDateTime
@@ -105,6 +103,7 @@ private data class MessageItemConfiguration( 
    val maxPreviewLines: Int,

)



@Suppress("LongMethod")

@Composable

private fun MessageItemConfiguration(

    config: MessageItemConfiguration,
@@ -230,6 +229,9 @@ private fun ColumnScope.CatalogNewMessageItem( 
                snackbarHostState.showSnackbar("Long clicked!")

            }

        },

        onLeadingClick = {

            selected = !selected

        },

        onFavouriteChange = { favourite = it },

        modifier = Modifier.fillMaxWidth(),

        selected = selected,
@@ -282,6 +284,9 @@ private fun ColumnScope.CatalogUnreadMessageItem( 
                snackbarHostState.showSnackbar("Long clicked!")

            }

        },

        onLeadingClick = {

            selected = !selected

        },

        onFavouriteChange = { favourite = it },

        modifier = Modifier.fillMaxWidth(),

        selected = selected,
@@ -334,6 +339,9 @@ private fun ColumnScope.CatalogReadMessageItem( 
                snackbarHostState.showSnackbar("Long clicked!")

            }

        },

        onLeadingClick = {

            selected = !selected

        },

        onFavouriteChange = { favourite = it },

        modifier = Modifier.fillMaxWidth(),

        selected = selected,
@@ -386,6 +394,9 @@ private fun ColumnScope.CatalogActiveMessageItem( 
                snackbarHostState.showSnackbar("Long clicked!")

            }

        },

        onLeadingClick = {

            selected = !selected

        },

        onFavouriteChange = { favourite = it },

        modifier = Modifier.fillMaxWidth(),

        selected = selected,
@@ -436,6 +447,9 @@ private fun ColumnScope.CatalogJunkMessageItem( 
                snackbarHostState.showSnackbar("Long clicked!")

            }

        },

        onLeadingClick = {

            selected = !selected

        },

        modifier = Modifier.fillMaxWidth(),

        selected = selected,

        swapSenderWithSubject = config.swapSenderAndSubject,

core/ui/compose/designsystem/src/debug/kotlin/net/thunderbird/core/ui/compose/designsystem/organism/message/ActiveMessageItemPreview.kt

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ private fun PreviewDefault( 
            },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            onFavouriteChange = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,
@@ -158,6 +159,7 @@ private fun PreviewCompact( 
            avatar = { },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            onFavouriteChange = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,
@@ -184,6 +186,7 @@ private fun PreviewRelaxed( 
            avatar = { },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            onFavouriteChange = {},

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

core/ui/compose/designsystem/src/debug/kotlin/net/thunderbird/core/ui/compose/designsystem/organism/message/JunkMessageItemPreview.kt

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ private fun PreviewDefault( 
            },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

            selected = params.selected,
@@ -151,6 +152,7 @@ private fun PreviewCompact( 
            avatar = { },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

            selected = params.selected,
@@ -175,6 +177,7 @@ private fun PreviewRelaxed( 
            avatar = { },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

            selected = params.selected,

core/ui/compose/designsystem/src/debug/kotlin/net/thunderbird/core/ui/compose/designsystem/organism/message/MessageItemPreview.kt

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ private fun PreviewDefault( 
            receivedAt = params.receivedAt,

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

            selected = params.selected,
@@ -151,6 +152,7 @@ private fun PreviewCompact( 
            receivedAt = params.receivedAt,

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

            selected = params.selected,
@@ -189,6 +191,7 @@ private fun PreviewRelaxed( 
            receivedAt = params.receivedAt,

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,

            selected = params.selected,

core/ui/compose/designsystem/src/debug/kotlin/net/thunderbird/core/ui/compose/designsystem/organism/message/NewMessageItemPreview.kt

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ private fun PreviewDefault( 
            },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            onFavouriteChange = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,
@@ -158,6 +159,7 @@ private fun PreviewCompact( 
            avatar = { },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            onFavouriteChange = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,
@@ -184,6 +186,7 @@ private fun PreviewRelaxed( 
            avatar = { },

            onClick = { },

            onLongClick = { },

            onLeadingClick = { },

            onFavouriteChange = { },

            modifier = Modifier.padding(MainTheme.spacings.double),

            hasAttachments = params.hasAttachments,