Lemmy/Raccoon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: comment reply from swipe action; closes #387 (#388)

Browse Source
This commit is contained in:
Diego Beraldin 2023-12-28 08:14:42 +01:00 committed by GitHub
parent 1c19c24f64
commit 021cf3fece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt
View File

@ -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.OptionId
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.PostCard import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.PostCard
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.di.getFabNestedScrollConnection 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.ShareBottomSheet
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.SortBottomSheet import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.SortBottomSheet
import com.github.diegoberaldin.raccoonforlemmy.core.navigation.di.getNavigationCoordinator 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.createcomment.CreateCommentScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.createpost.CreatePostScreen import com.github.diegoberaldin.raccoonforlemmy.unit.createpost.CreatePostScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.createreport.CreateReportScreen 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.remove.RemoveScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.web.WebViewScreen import com.github.diegoberaldin.raccoonforlemmy.unit.web.WebViewScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.zoomableimage.ZoomableImageScreen import com.github.diegoberaldin.raccoonforlemmy.unit.zoomableimage.ZoomableImageScreen
@ -653,6 +653,7 @@ class PostDetailScreen(
setBottomSheetGesturesEnabled(false) setBottomSheetGesturesEnabled(false)
val screen = CreateCommentScreen( val screen = CreateCommentScreen(
originalPost = uiState.post, originalPost = uiState.post,
originalComment = comment,
) )
showBottomSheet(screen) showBottomSheet(screen)
} }
@ -863,12 +864,12 @@ class PostDetailScreen(
OptionId.Edit -> { OptionId.Edit -> {
with(navigationCoordinator) { with(navigationCoordinator) {
setBottomSheetGesturesEnabled( setBottomSheetGesturesEnabled(
false false,
) )
showBottomSheet( showBottomSheet(
CreateCommentScreen( CreateCommentScreen(
editedComment = comment, editedComment = comment,
) ),
) )
} }
} }
@ -876,7 +877,7 @@ class PostDetailScreen(
OptionId.Report -> { OptionId.Report -> {
navigationCoordinator.showBottomSheet( navigationCoordinator.showBottomSheet(
CreateReportScreen( CreateReportScreen(
commentId = comment.id commentId = comment.id,
) )
) )
} }
@ -887,7 +888,7 @@ class PostDetailScreen(
OptionId.DistinguishComment -> model.reduce( OptionId.DistinguishComment -> model.reduce(
PostDetailMviModel.Intent.ModDistinguishComment( PostDetailMviModel.Intent.ModDistinguishComment(
comment.id comment.id,
) )
) )
@ -1270,6 +1271,7 @@ class PostDetailScreen(
with(navigationCoordinator) { with(navigationCoordinator) {
setBottomSheetGesturesEnabled(false) setBottomSheetGesturesEnabled(false)
val screen = CreateCommentScreen( val screen = CreateCommentScreen(
originalPost = uiState.post,
originalComment = content, originalComment = content,
initialText = buildString { initialText = buildString {
append("> ") append("> ")