meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: edgeToEdge tweaks, chip elevation (#1962)

Browse source
This commit is contained in:
James Rich 2025-05-28 09:34:08 -05:00 • committed by GitHub
parent 9f0765526d
commit 3eefe4b66c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 56 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
View file

@ -17,10 +17,7 @@
package com.geeksville.mesh.ui.message.components
import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ExperimentalSharedTransitionApi
import androidx.compose.animation.SharedTransitionScope
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@ -58,11 +55,11 @@ import com.geeksville.mesh.model.Node
import com.geeksville.mesh.ui.NodeChip
import com.geeksville.mesh.ui.components.AutoLinkText
import com.geeksville.mesh.ui.components.NodeMenuAction
import com.geeksville.mesh.ui.components.SharedTransitionPreview
import com.geeksville.mesh.ui.preview.NodePreviewParameterProvider
import com.geeksville.mesh.ui.theme.AppTheme
@Suppress("LongMethod", "CyclomaticComplexMethod")
@OptIn(ExperimentalFoundationApi::class, ExperimentalSharedTransitionApi::class)
@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun MessageItem(
node: Node,
@ -76,8 +73,6 @@ internal fun MessageItem(
onAction: (NodeMenuAction) -> Unit = {},
onStatusClick: () -> Unit = {},
onSendReaction: (String) -> Unit = {},
sharedTransitionScope: SharedTransitionScope,
animatedContentScope: AnimatedContentScope,
isConnected: Boolean,
) = Row(
modifier = modifier
@ -105,8 +100,6 @@ internal fun MessageItem(
onAction = onAction,
isConnected = isConnected,
isThisNode = false,
sharedTransitionScope = sharedTransitionScope,
animatedContentScope = animatedContentScope,
)
}
Card(
@ -177,19 +170,16 @@ internal fun MessageItem(
}
}
@OptIn(ExperimentalSharedTransitionApi::class)
@PreviewLightDark
@Composable
private fun MessageItemPreview() {
SharedTransitionPreview { sharedTransitionScope, animatedContentScope ->
AppTheme {
MessageItem(
node = NodePreviewParameterProvider().values.first(),
messageText = stringResource(R.string.sample_message),
messageTime = "10:00",
messageStatus = MessageStatus.DELIVERED,
selected = false,
sharedTransitionScope = sharedTransitionScope,
animatedContentScope = animatedContentScope,
isConnected = true,
)
}