Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-03 13:57:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: comment and post headers

Browse Source
This commit is contained in:
Diego Beraldin 2023-10-19 13:57:28 +02:00
parent da8d6fc3f0
commit 3826653010
3 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailScreen.kt
View File

@ -350,11 +350,10 @@ class UserDetailScreen(
content = {
PostCard(
modifier = Modifier.onClick {
navigator?.push(
PostDetailScreen(post),
)
navigator?.push(PostDetailScreen(post = post))
},
post = post,
hideAuthor = true,
postLayout = uiState.postLayout,
fullHeightImage = uiState.fullHeightImages,
blurNsfw = uiState.blurNsfw,
@ -400,9 +399,7 @@ class UserDetailScreen(
}
},
onOpenCommunity = { community ->
navigator?.push(
CommunityDetailScreen(community),
)
navigator?.push(CommunityDetailScreen(community))
},
onReply = if (isOnOtherInstance) {
null
@ -496,14 +493,16 @@ class UserDetailScreen(
},
content = {
CommentCard(
modifier = Modifier.onClick {
navigator?.push(
PostDetailScreen(
post = PostModel(id = comment.postId),
highlightCommentId = comment.id,
modifier = Modifier
.background(MaterialTheme.colorScheme.background)
.onClick {
navigator?.push(
PostDetailScreen(
post = PostModel(id = comment.postId),
highlightCommentId = comment.id,
)
)
)
},
},
comment = comment,
separateUpAndDownVotes = uiState.separateUpAndDownVotes,
autoLoadImages = uiState.autoLoadImages,
@ -564,8 +563,8 @@ class UserDetailScreen(
bottomSheetNavigator.show(screen)
}
},
onOpenCommunity = {
navigator?.push(CommunityDetailScreen(it))
onOpenCommunity = { community ->
navigator?.push(CommunityDetailScreen(community))
},
)
Divider(

19
feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/logged/ProfileLoggedScreen.kt
View File

@ -1,5 +1,6 @@
package com.github.diegoberaldin.raccoonforlemmy.feature.profile.logged
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@ -236,14 +237,16 @@ internal object ProfileLoggedScreen : Tab {
}
itemsIndexed(uiState.comments) { idx, comment ->
CommentCard(
modifier = Modifier.onClick {
navigator?.push(
PostDetailScreen(
post = PostModel(id = comment.postId),
highlightCommentId = comment.id,
),
)
},
modifier = Modifier
.background(MaterialTheme.colorScheme.background)
.onClick {
navigator?.push(
PostDetailScreen(
post = PostModel(id = comment.postId),
highlightCommentId = comment.id,
),
)
},
comment = comment,
separateUpAndDownVotes = uiState.separateUpAndDownVotes,
autoLoadImages = uiState.autoLoadImages,

19
feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreScreen.kt
View File

@ -1,5 +1,6 @@
package com.github.diegoberaldin.raccoonforlemmy.feature.search.main
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@ -373,14 +374,16 @@ class ExploreScreen : Screen {
is CommentModel -> {
CommentCard(
modifier = Modifier.onClick {
navigator?.push(
PostDetailScreen(
post = PostModel(id = result.postId),
highlightCommentId = result.id,
),
)
},
modifier = Modifier
.background(MaterialTheme.colorScheme.background)
.onClick {
navigator?.push(
PostDetailScreen(
post = PostModel(id = result.postId),
highlightCommentId = result.id,
),
)
},
comment = result,
separateUpAndDownVotes = uiState.separateUpAndDownVotes,
autoLoadImages = uiState.autoLoadImages,