Merge pull request #1142 from tunjid/tj/simplify-notification-scaffold

Simplify NotificationPostScaffold

Author: tunjid

feature/notifications/src/commonMain/kotlin/com/tunjid/heron/notifications/ui/NotificationPostScaffold.kt

@@ -16,7 +16,6 @@
 
 package com.tunjid.heron.notifications.ui
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -32,7 +31,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import com.tunjid.heron.data.core.models.Embed
@@ -52,8 +50,8 @@ import com.tunjid.heron.ui.AttributionLayout
 import com.tunjid.heron.ui.PaneTransitionScope
 import com.tunjid.heron.ui.UiTokens
 import com.tunjid.heron.ui.modifiers.rootShapedClickable
+import com.tunjid.heron.ui.modifiers.shapedClickable
 import com.tunjid.heron.ui.shapes.RoundedPolygonShape
-import com.tunjid.treenav.compose.UpdatedMovableStickySharedElementOf
 import kotlin.time.Instant
 
 @Composable
@@ -158,27 +156,29 @@ private fun PostAttribution(
     val post = notification.associatedPost
     AttributionLayout(
         avatar = {
-            UpdatedMovableStickySharedElementOf(
+            PaneStickySharedElement(
                 modifier = Modifier
                     .size(UiTokens.avatarSize)
-                    .clip(avatarShape)
-                    .clickable { onProfileClicked(notification, post.author) },
+                    .shapedClickable(avatarShape) { onProfileClicked(notification, post.author) },
                 sharedContentState = with(paneTransitionScope) {
                     rememberSharedContentState(
                         key = post.avatarSharedElementKey(sharedElementPrefix),
                     )
                 },
-                state = remember(post.author.avatar) {
-                    ImageArgs(
-                        url = post.author.avatar?.uri,
-                        contentScale = ContentScale.Crop,
-                        contentDescription = post.author.displayName ?: post.author.handle.id,
-                        shape = avatarShape,
+                content = {
+                    AsyncImage(
+                        modifier = Modifier
+                            .fillParentAxisIfFixedOrWrap(),
+                        args = remember(post.author.avatar) {
+                            ImageArgs(
+                                url = post.author.avatar?.uri,
+                                contentScale = ContentScale.Crop,
+                                contentDescription = post.author.displayName ?: post.author.handle.id,
+                                shape = avatarShape,
+                            )
+                        },
                     )
                 },
-                sharedElement = { state, modifier ->
-                    AsyncImage(state, modifier)
-                },
             )
         },
         label = {

feature/notifications/src/commonMain/kotlin/com/tunjid/heron/notifications/ui/NotificationRowScaffold.kt

@@ -49,7 +49,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.buildAnnotatedString
@@ -61,6 +61,7 @@ import com.tunjid.heron.images.AsyncImage
 import com.tunjid.heron.images.ImageArgs
 import com.tunjid.heron.ui.PaneTransitionScope
 import com.tunjid.heron.ui.UiTokens
+import com.tunjid.heron.ui.modifiers.shapedClickable
 import com.tunjid.heron.ui.shapes.RoundedPolygonShape
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
@@ -130,7 +131,10 @@ fun NotificationAggregateScaffold(
             with(paneTransitionScope) {
                 Box(
                     modifier = Modifier
-                        .animateBounds(lookaheadScope = this, boundsTransform = childBoundsTransform)
+                        .animateBounds(
+                            lookaheadScope = this,
+                            boundsTransform = childBoundsTransform,
+                        )
                         .clip(ExpandableAvatarRowShape),
                 ) {
                     if (isExpanded) Column(
@@ -171,14 +175,17 @@ private fun PaneTransitionScope.ExpandButton(
     isExpanded: Boolean,
     onExpansionToggled: (Boolean) -> Unit,
 ) {
+    val rotationState = animateFloatAsState(if (isExpanded) 180f else 0f)
     IconButton(
         modifier = Modifier
             .animateBounds(
                 lookaheadScope = this@ExpandButton,
                 boundsTransform = childBoundsTransform,
             )
             .size(32.dp)
-            .rotate(animateFloatAsState(if (isExpanded) 180f else 0f).value),
+            .graphicsLayer {
+                rotationZ = rotationState.value
+            },
         onClick = {
             onExpansionToggled(!isExpanded)
         },
@@ -208,16 +215,18 @@ private fun PaneTransitionScope.ExpandableProfiles(
         ) {
             PaneStickySharedElement(
                 modifier = Modifier
-                    .size(ExpandableAvatarSize),
+                    .size(ExpandableAvatarSize)
+                    .clip(CircleShape)
+                    .shapedClickable(CircleShape) {
+                        onProfileClicked(notification, profile)
+                    },
                 sharedContentState = rememberSharedContentState(
                     key = notification.avatarSharedElementKey(profile),
                 ),
             ) {
                 AsyncImage(
                     modifier = Modifier
-                        .fillParentAxisIfFixedOrWrap()
-                        .clip(CircleShape)
-                        .clickable { onProfileClicked(notification, profile) },
+                        .fillParentAxisIfFixedOrWrap(),
                     args = ImageArgs(
                         url = profile.avatar?.uri,
                         contentScale = ContentScale.Crop,