From 021cf3fece891f0580b7eaa97ed5fe5136bb2387 Mon Sep 17 00:00:00 2001 From: Diego Beraldin Date: Thu, 28 Dec 2023 08:14:42 +0100 Subject: [PATCH] fix: comment reply from swipe action; closes #387 (#388) --- .../unit/postdetail/PostDetailScreen.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt index c07b6adcc..91ae0046e 100644 --- a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt +++ b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt @@ -85,7 +85,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.Option import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.OptionId import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.PostCard import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.di.getFabNestedScrollConnection -import com.github.diegoberaldin.raccoonforlemmy.unit.rawcontent.RawContentDialog import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.ShareBottomSheet import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.SortBottomSheet import com.github.diegoberaldin.raccoonforlemmy.core.navigation.di.getNavigationCoordinator @@ -104,6 +103,7 @@ import com.github.diegoberaldin.raccoonforlemmy.unit.ban.BanUserScreen import com.github.diegoberaldin.raccoonforlemmy.unit.createcomment.CreateCommentScreen import com.github.diegoberaldin.raccoonforlemmy.unit.createpost.CreatePostScreen import com.github.diegoberaldin.raccoonforlemmy.unit.createreport.CreateReportScreen +import com.github.diegoberaldin.raccoonforlemmy.unit.rawcontent.RawContentDialog import com.github.diegoberaldin.raccoonforlemmy.unit.remove.RemoveScreen import com.github.diegoberaldin.raccoonforlemmy.unit.web.WebViewScreen import com.github.diegoberaldin.raccoonforlemmy.unit.zoomableimage.ZoomableImageScreen @@ -653,6 +653,7 @@ class PostDetailScreen( setBottomSheetGesturesEnabled(false) val screen = CreateCommentScreen( originalPost = uiState.post, + originalComment = comment, ) showBottomSheet(screen) } @@ -863,12 +864,12 @@ class PostDetailScreen( OptionId.Edit -> { with(navigationCoordinator) { setBottomSheetGesturesEnabled( - false + false, ) showBottomSheet( CreateCommentScreen( editedComment = comment, - ) + ), ) } } @@ -876,7 +877,7 @@ class PostDetailScreen( OptionId.Report -> { navigationCoordinator.showBottomSheet( CreateReportScreen( - commentId = comment.id + commentId = comment.id, ) ) } @@ -887,7 +888,7 @@ class PostDetailScreen( OptionId.DistinguishComment -> model.reduce( PostDetailMviModel.Intent.ModDistinguishComment( - comment.id + comment.id, ) ) @@ -1270,6 +1271,7 @@ class PostDetailScreen( with(navigationCoordinator) { setBottomSheetGesturesEnabled(false) val screen = CreateCommentScreen( + originalPost = uiState.post, originalComment = content, initialText = buildString { append("> ")