From f5436d7417ad912e0fe4241f98428c3c6539cfae Mon Sep 17 00:00:00 2001
From: Maarten Vercruysse <67873169+MV-GH@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:42:37 +0200
Subject: [PATCH] Fix Saved comments header does nothing (#1473)

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
---
 .../java/com/jerboa/ui/components/comment/CommentNode.kt  | 6 ++++--
 .../main/java/com/jerboa/ui/components/common/AppBars.kt  | 8 ++++----
 .../com/jerboa/ui/components/community/CommunityLink.kt   | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt
index 2779f0776..85ae32c43 100644
--- a/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt
+++ b/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt
@@ -691,12 +691,14 @@ fun PostAndCommunityContextHeader(
     showAvatar: Boolean,
 ) {
     Column(
-        modifier = Modifier.padding(top = LARGE_PADDING),
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onPostClick(post.id) }
+            .padding(top = LARGE_PADDING),
     ) {
         Text(
             text = post.name,
             style = MaterialTheme.typography.titleSmall,
-            modifier = Modifier.clickable { onPostClick(post.id) },
         )
         Row(
             verticalAlignment = Alignment.CenterVertically,
diff --git a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
index b0572fd79..1ea481dd3 100644
--- a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
+++ b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
@@ -264,15 +264,15 @@ fun CommentOrPostNodeHeader(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .padding(
-                    top = LARGE_PADDING,
-                    bottom = MEDIUM_PADDING,
-                )
                 .combinedClickable(
                     interactionSource = remember { MutableInteractionSource() },
                     indication = null,
                     onLongClick = onLongCLick,
                     onClick = onClick,
+                )
+                .padding(
+                    top = LARGE_PADDING,
+                    bottom = MEDIUM_PADDING,
                 ),
     ) {
         Row(
diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt
index 736df83ac..b91b9eeac 100644
--- a/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt
+++ b/app/src/main/java/com/jerboa/ui/components/community/CommunityLink.kt
@@ -88,7 +88,7 @@ fun CommunityLink(
         horizontalArrangement = Arrangement.spacedBy(spacing),
         modifier =
             if (clickable) {
-                modifier.clickable { onClick(community) }
+                Modifier.clickable { onClick(community) }.then(modifier)
             } else {
                 modifier
             },