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

Commit ddcbed83 authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "Move long-click handling to BundleHeader" into main

parents 51d2b815 9b466783
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
@@ -86,6 +86,7 @@ fun BundleHeader(
    viewModel: BundleHeaderViewModel,
    modifier: Modifier = Modifier,
    onHeaderClicked: () -> Unit = {},
    onHeaderLongClicked: () -> Unit = {},
) {
    val state =
        rememberMutableSceneTransitionLayoutState(
@@ -139,11 +140,12 @@ fun BundleHeader(
        SceneTransitionLayout(
            state = state,
            modifier =
                Modifier.clickable(
                Modifier.combinedClickable(
                    onClick = {
                        viewModel.onHeaderClicked()
                        onHeaderClicked()
                    },
                    onLongClick = { onHeaderLongClicked() },
                    interactionSource = null,
                    indication = null,
                ),
+5 −1
Original line number Diff line number Diff line
@@ -176,7 +176,11 @@ private fun HeaderComposeViewContent(
            row.setBundleHeaderViewModel(viewModel)
            onDispose { row.setBundleHeaderViewModel(null) }
        }
        BundleHeader(viewModel, onHeaderClicked = { row.expandNotification() })
        BundleHeader(
            viewModel,
            onHeaderClicked = { row.expandNotification() },
            onHeaderLongClicked = { row.performLongClick() },
        )
    }
}