From 76fa69ed5bec3704392ff26ebc4816118772dc5e Mon Sep 17 00:00:00 2001 From: Sagi Sarussi <39622904+tuxiqae@users.noreply.github.com> Date: Wed, 7 Jun 2023 22:39:47 +0300 Subject: [PATCH] Allow signed-out users to interact with specific buttons such as showMoreOptions (#450) Signed-off-by: Sagi Sarussi --- .../main/java/com/jerboa/ui/components/comment/CommentNode.kt | 1 + .../ui/components/comment/mentionnode/CommentMentionNode.kt | 1 + .../jerboa/ui/components/comment/replynode/CommentReplyNode.kt | 1 + app/src/main/java/com/jerboa/ui/components/common/AppBars.kt | 3 ++- app/src/main/java/com/jerboa/ui/components/post/PostListing.kt | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) 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 dd9041d30..277b755d1 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 @@ -518,6 +518,7 @@ fun CommentFooterLine( icon = Icons.Outlined.MoreVert, account = account, onClick = { showMoreOptions = !showMoreOptions }, + requiresAccount = false, ) } } diff --git a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt index ef6ed3cb1..a1671cffa 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt @@ -193,6 +193,7 @@ fun CommentMentionNodeFooterLine( icon = Icons.Outlined.MoreVert, account = account, onClick = { showMoreOptions = !showMoreOptions }, + requiresAccount = false, ) } } diff --git a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt index c5839262a..3fbf557ae 100644 --- a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt +++ b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt @@ -193,6 +193,7 @@ fun CommentReplyNodeFooterLine( icon = Icons.Outlined.MoreVert, account = account, onClick = { showMoreOptions = !showMoreOptions }, + requiresAccount = false, ) } } 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 29b251d68..ceec992e8 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 @@ -292,6 +292,7 @@ fun ActionBarButton( contentColor: Color = MaterialTheme.colorScheme.onBackground.muted, noClick: Boolean = false, account: Account?, + requiresAccount: Boolean = true, ) { val ctx = LocalContext.current // Button( @@ -311,7 +312,7 @@ fun ActionBarButton( Modifier } else { Modifier.clickable(onClick = { - if (account !== null) { + if (!requiresAccount || account !== null) { onClick() } else { loginFirstToast(ctx) diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt b/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt index 130137980..379c2a810 100644 --- a/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt +++ b/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt @@ -530,6 +530,7 @@ fun PostFooterLine( icon = Icons.Outlined.MoreVert, account = account, onClick = { showMoreOptions = !showMoreOptions }, + requiresAccount = false, ) } }