Merge branch 'main' into feat/animated-gifs

LemmyNet · Jun 13, 2023 · aaba5df · aaba5df
2 parents 0568ae0 + e4923c9
commit aaba5df
Show file tree

Hide file tree

Showing 22 changed files with 132 additions and 19 deletions.
diff --git a/app/src/main/java/com/jerboa/MainActivity.kt b/app/src/main/java/com/jerboa/MainActivity.kt
@@ -410,6 +410,7 @@ class MainActivity : ComponentActivity() {
                             accountViewModel = accountViewModel,
                             homeViewModel = homeViewModel,
                             commentReplyViewModel = commentReplyViewModel,
+                            siteViewModel = siteViewModel,
                         )
                     }
                     composable(
@@ -489,6 +490,7 @@ class MainActivity : ComponentActivity() {
                             accountViewModel = accountViewModel,
                             personProfileViewModel = personProfileViewModel,
                             navController = navController,
+                            siteViewModel = siteViewModel,
                         )
                     }
                     composable(
@@ -538,6 +540,7 @@ class MainActivity : ComponentActivity() {
                             inboxViewModel = inboxViewModel,
                             accountViewModel = accountViewModel,
                             navController = navController,
+                            siteViewModel = siteViewModel,
                         )
                     }
                     composable(

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
@@ -99,6 +99,7 @@ fun CommentNodeHeader(
     isExpanded: Boolean,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
+    showAvatar: Boolean,
 ) {
     CommentOrPostNodeHeader(
         creator = commentView.creator,
@@ -115,6 +116,7 @@ fun CommentNodeHeader(
         isExpanded = isExpanded,
         onClick = onClick,
         onLongCLick = onLongClick,
+        showAvatar = showAvatar,
     )
 }
 
@@ -131,6 +133,7 @@ fun CommentNodeHeaderPreview() {
         onLongClick = {},
         collapsedCommentsCount = 5,
         isExpanded = false,
+        showAvatar = true,
     )
 }
 
@@ -207,6 +210,7 @@ fun LazyListScope.commentNodeItem(
     isCollapsedByParent: Boolean,
     showActionBar: (commentId: Int) -> Boolean,
     enableDownVotes: Boolean,
+    showAvatar: Boolean,
 ) {
     val commentView = node.commentView
     val commentId = commentView.comment.id
@@ -281,6 +285,7 @@ fun LazyListScope.commentNodeItem(
                             },
                             collapsedCommentsCount = node.commentView.counts.child_count,
                             isExpanded = isExpanded(commentId),
+                            showAvatar = showAvatar,
                         )
                         AnimatedVisibility(
                             visible = isExpanded(commentId) || showCollapsedCommentContent,
@@ -388,6 +393,7 @@ fun LazyListScope.commentNodeItem(
             showCollapsedCommentContent = showCollapsedCommentContent,
             showActionBar = showActionBar,
             enableDownVotes = enableDownVotes,
+            showAvatar = showAvatar,
         )
     }
 }
@@ -639,6 +645,7 @@ fun CommentNodesPreview() {
         showCollapsedCommentContent = false,
         showActionBarByDefault = true,
         enableDownVotes = true,
+        showAvatar = true,
     )
 }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt
@@ -39,6 +39,7 @@ fun CommentNodes(
     isCollapsedByParent: Boolean,
     showActionBarByDefault: Boolean,
     enableDownVotes: Boolean,
+    showAvatar: Boolean,
 ) {
     // Holds the un-expanded comment ids
     val unExpandedComments = remember { mutableStateListOf<Int>() }
@@ -86,6 +87,7 @@ fun CommentNodes(
                 showActionBarByDefault xor commentsWithToggledActionBar.contains(commentId)
             },
             enableDownVotes = enableDownVotes,
+            showAvatar = showAvatar,
         )
     }
 }
@@ -117,6 +119,7 @@ fun LazyListScope.commentNodeItems(
     isCollapsedByParent: Boolean,
     showActionBar: (commentId: Int) -> Boolean,
     enableDownVotes: Boolean,
+    showAvatar: Boolean,
 ) {
     nodes.forEach { node ->
         commentNodeItem(
@@ -146,6 +149,7 @@ fun LazyListScope.commentNodeItems(
             isCollapsedByParent = isCollapsedByParent,
             showActionBar = showActionBar,
             enableDownVotes = enableDownVotes,
+            showAvatar = showAvatar,
         )
     }
 }
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
@@ -61,6 +61,7 @@ fun CommentMentionNodeHeader(
     myVote: Int?,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
+    showAvatar: Boolean,
 ) {
     CommentOrPostNodeHeader(
         creator = personMentionView.creator,
@@ -75,6 +76,7 @@ fun CommentMentionNodeHeader(
         isCommunityBanned = personMentionView.creator_banned_from_community,
         onClick = onClick,
         onLongCLick = onLongClick,
+        showAvatar = showAvatar,
     )
 }
 
@@ -88,6 +90,7 @@ fun CommentMentionNodeHeaderPreview() {
         onPersonClick = {},
         onClick = {},
         onLongClick = {},
+        showAvatar = true,
     )
 }
 
@@ -305,6 +308,7 @@ fun CommentMentionNode(
     onLinkClick: (personMentionView: PersonMentionView) -> Unit,
     onBlockCreatorClick: (creator: PersonSafe) -> Unit,
     account: Account?,
+    showAvatar: Boolean,
 ) {
     // These are necessary for instant comment voting
     val score = personMentionView.counts.score
@@ -337,6 +341,7 @@ fun CommentMentionNode(
             onLongClick = {
                 isActionBarExpanded = !isActionBarExpanded
             },
+            showAvatar = showAvatar,
         )
         AnimatedVisibility(
             visible = isExpanded,

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt b/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt
@@ -82,6 +82,7 @@ fun RepliedComment(
     commentView: CommentView,
     onPersonClick: (personId: Int) -> Unit,
     isModerator: Boolean,
+    showAvatar: Boolean,
 ) {
     Column(modifier = Modifier.padding(MEDIUM_PADDING)) {
         CommentNodeHeader(
@@ -94,6 +95,7 @@ fun RepliedComment(
             isExpanded = true,
             onClick = {},
             onLongClick = {},
+            showAvatar = showAvatar,
         )
         SelectionContainer {
             Text(text = commentView.comment.content)
@@ -105,6 +107,7 @@ fun RepliedComment(
 fun RepliedCommentReply(
     commentReplyView: CommentReplyView,
     onPersonClick: (personId: Int) -> Unit,
+    showAvatar: Boolean,
 ) {
     Column(modifier = Modifier.padding(MEDIUM_PADDING)) {
         CommentReplyNodeHeader(
@@ -114,6 +117,7 @@ fun RepliedCommentReply(
             myVote = commentReplyView.my_vote,
             onClick = {},
             onLongClick = {},
+            showAvatar = showAvatar,
         )
         SelectionContainer {
             Text(text = commentReplyView.comment.content)
@@ -125,6 +129,7 @@ fun RepliedCommentReply(
 fun RepliedMentionReply(
     personMentionView: PersonMentionView,
     onPersonClick: (personId: Int) -> Unit,
+    showAvatar: Boolean,
 ) {
     Column(modifier = Modifier.padding(MEDIUM_PADDING)) {
         CommentMentionNodeHeader(
@@ -134,6 +139,7 @@ fun RepliedMentionReply(
             myVote = personMentionView.my_vote,
             onClick = {},
             onLongClick = {},
+            showAvatar = showAvatar,
         )
         SelectionContainer {
             Text(text = personMentionView.comment.content)
@@ -148,6 +154,7 @@ fun RepliedCommentPreview() {
         commentView = sampleCommentView,
         isModerator = false,
         onPersonClick = {},
+        showAvatar = true,
     )
 }
 
@@ -181,6 +188,7 @@ fun CommentReply(
     isModerator: Boolean,
     account: Account?,
     modifier: Modifier = Modifier,
+    showAvatar: Boolean,
 ) {
     val scrollState = rememberScrollState()
 
@@ -191,6 +199,7 @@ fun CommentReply(
             commentView = commentView,
             onPersonClick = onPersonClick,
             isModerator = isModerator,
+            showAvatar = showAvatar,
         )
         Divider(modifier = Modifier.padding(vertical = LARGE_PADDING))
         MarkdownTextField(
@@ -210,6 +219,7 @@ fun CommentReplyReply(
     onPersonClick: (personId: Int) -> Unit,
     account: Account?,
     modifier: Modifier = Modifier,
+    showAvatar: Boolean,
 ) {
     val scrollState = rememberScrollState()
 
@@ -219,6 +229,7 @@ fun CommentReplyReply(
         RepliedCommentReply(
             commentReplyView = commentReplyView,
             onPersonClick = onPersonClick,
+            showAvatar = showAvatar,
         )
         Divider(modifier = Modifier.padding(vertical = LARGE_PADDING))
         MarkdownTextField(
@@ -238,6 +249,7 @@ fun MentionReply(
     onPersonClick: (personId: Int) -> Unit,
     account: Account?,
     modifier: Modifier = Modifier,
+    showAvatar: Boolean,
 ) {
     val scrollState = rememberScrollState()
 
@@ -247,6 +259,7 @@ fun MentionReply(
         RepliedMentionReply(
             personMentionView = personMentionView,
             onPersonClick = onPersonClick,
+            showAvatar = showAvatar,
         )
         Divider(modifier = Modifier.padding(vertical = LARGE_PADDING))
         MarkdownTextField(

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReplyActivity.kt b/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReplyActivity.kt
@@ -20,6 +20,7 @@ import androidx.navigation.NavController
 import com.jerboa.db.AccountViewModel
 import com.jerboa.isModerator
 import com.jerboa.ui.components.common.getCurrentAccount
+import com.jerboa.ui.components.home.SiteViewModel
 import com.jerboa.ui.components.person.PersonProfileViewModel
 import com.jerboa.ui.components.post.PostViewModel
 
@@ -31,6 +32,7 @@ fun CommentReplyActivity(
     personProfileViewModel: PersonProfileViewModel,
     postViewModel: PostViewModel,
     navController: NavController,
+    siteViewModel: SiteViewModel,
 ) {
     Log.d("jerboa", "got to comment reply activity")
 
@@ -88,6 +90,7 @@ fun CommentReplyActivity(
                                 modifier = Modifier
                                     .padding(padding)
                                     .imePadding(),
+                                showAvatar = siteViewModel.siteRes?.my_user?.local_user_view?.local_user?.show_avatars ?: true,
                             )
                         is ReplyItem.PostItem -> PostReply(
                             postView = replyItem.item,
@@ -118,6 +121,7 @@ fun CommentReplyActivity(
                                 modifier = Modifier
                                     .padding(padding)
                                     .imePadding(),
+                                showAvatar = siteViewModel.siteRes?.my_user?.local_user_view?.local_user?.show_avatars ?: true,
                             )
                         is ReplyItem.MentionReplyItem ->
                             MentionReply(
@@ -131,6 +135,7 @@ fun CommentReplyActivity(
                                 modifier = Modifier
                                     .padding(padding)
                                     .imePadding(),
+                                showAvatar = siteViewModel.siteRes?.my_user?.local_user_view?.local_user?.show_avatars ?: true,
                             )
                     }
                 }

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
@@ -61,6 +61,7 @@ fun CommentReplyNodeHeader(
     myVote: Int?,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
+    showAvatar: Boolean,
 ) {
     CommentOrPostNodeHeader(
         creator = commentReplyView.creator,
@@ -75,6 +76,7 @@ fun CommentReplyNodeHeader(
         isCommunityBanned = commentReplyView.creator_banned_from_community,
         onClick = onClick,
         onLongCLick = onLongClick,
+        showAvatar = showAvatar,
     )
 }
 
@@ -88,6 +90,7 @@ fun CommentReplyNodeHeaderPreview() {
         onPersonClick = {},
         onClick = {},
         onLongClick = {},
+        showAvatar = true,
     )
 }
 
@@ -303,6 +306,7 @@ fun CommentReplyNode(
     onCommentLinkClick: (commentReplyView: CommentReplyView) -> Unit,
     onBlockCreatorClick: (creator: PersonSafe) -> Unit,
     account: Account?,
+    showAvatar: Boolean,
 ) {
     // These are necessary for instant comment voting
     val score = commentReplyView.counts.score
@@ -335,6 +339,7 @@ fun CommentReplyNode(
             onLongClick = {
                 isActionBarExpanded = !isActionBarExpanded
             },
+            showAvatar = showAvatar,
         )
         AnimatedVisibility(
             visible = isExpanded,

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
@@ -242,6 +242,7 @@ fun CommentOrPostNodeHeader(
     onLongCLick: () -> Unit,
     isExpanded: Boolean = true,
     collapsedCommentsCount: Int = 0,
+    showAvatar: Boolean,
 ) {
     FlowRow(
         mainAxisAlignment = FlowMainAxisAlignment.SpaceBetween,
@@ -279,6 +280,7 @@ fun CommentOrPostNodeHeader(
                 isPostCreator = isPostCreator,
                 isModerator = isModerator,
                 isCommunityBanned = isCommunityBanned,
+                showAvatar = showAvatar,
             )
         }
         ScoreAndTime(
@@ -308,6 +310,7 @@ fun CommentOrPostNodeHeaderPreview() {
         isCommunityBanned = false,
         onClick = {},
         onLongCLick = {},
+        showAvatar = true,
     )
 }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt b/app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt
@@ -99,7 +99,7 @@ fun pictureBlurOrRounded(
         modifier_ = modifier_.clip(RoundedCornerShape(12f))
     }
     if (nsfw) {
-        modifier_ = modifier_.blur(radius = 20.dp)
+        modifier_ = modifier_.blur(radius = 100.dp)
     }
     return modifier_
 }

diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt
@@ -231,6 +231,7 @@ fun CommunityActivity(
                 postViewMode = getPostViewMode(appSettingsViewModel),
                 showVotingArrowsInListView = showVotingArrowsInListView,
                 enableDownVotes = siteViewModel.siteRes?.site_view?.local_site?.enable_downvotes ?: true,
+                showAvatar = siteViewModel.siteRes?.my_user?.local_user_view?.local_user?.show_avatars ?: true,
             )
         },
         floatingActionButtonPosition = FabPosition.End,