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

fix: opening links; closes #365 (#366)

Browse Source
This commit is contained in:
Diego Beraldin 2023-12-23 18:26:24 +01:00 committed by GitHub
parent 8bbe2801db
commit a9e556168d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/PostCard.kt
View File

@ -72,7 +72,7 @@ fun PostCard(
onDownVote: (() -> Unit)? = null, onDownVote: (() -> Unit)? = null,
onSave: (() -> Unit)? = null, onSave: (() -> Unit)? = null,
onReply: (() -> Unit)? = null, onReply: (() -> Unit)? = null,
onImageClick: ((String) -> Unit)? = null, onOpenImage: ((String) -> Unit)? = null,
onOptionSelected: ((OptionId) -> Unit)? = null, onOptionSelected: ((OptionId) -> Unit)? = null,
onClick: (() -> Unit)? = null, onClick: (() -> Unit)? = null,
onDoubleClick: (() -> Unit)? = null, onDoubleClick: (() -> Unit)? = null,
@ -118,7 +118,7 @@ fun PostCard(
onDownVote = onDownVote, onDownVote = onDownVote,
onSave = onSave, onSave = onSave,
onReply = onReply, onReply = onReply,
onImageClick = onImageClick, onOpenImage = onOpenImage,
onOptionSelected = onOptionSelected, onOptionSelected = onOptionSelected,
onClick = onClick, onClick = onClick,
onDoubleClick = onDoubleClick, onDoubleClick = onDoubleClick,
@ -141,7 +141,7 @@ fun PostCard(
onDownVote = onDownVote, onDownVote = onDownVote,
onSave = onSave, onSave = onSave,
onReply = onReply, onReply = onReply,
onImageClick = onImageClick, onOpenImage = onOpenImage,
onOptionSelected = onOptionSelected, onOptionSelected = onOptionSelected,
onClick = onClick, onClick = onClick,
onDoubleClick = onDoubleClick, onDoubleClick = onDoubleClick,
@ -169,7 +169,7 @@ private fun CompactPost(
onDownVote: (() -> Unit)? = null, onDownVote: (() -> Unit)? = null,
onSave: (() -> Unit)? = null, onSave: (() -> Unit)? = null,
onReply: (() -> Unit)? = null, onReply: (() -> Unit)? = null,
onImageClick: ((String) -> Unit)? = null, onOpenImage: ((String) -> Unit)? = null,
onOptionSelected: ((OptionId) -> Unit)? = null, onOptionSelected: ((OptionId) -> Unit)? = null,
onClick: (() -> Unit)? = null, onClick: (() -> Unit)? = null,
onDoubleClick: (() -> Unit)? = null, onDoubleClick: (() -> Unit)? = null,
@ -218,9 +218,11 @@ private fun CompactPost(
text = post.title, text = post.title,
autoLoadImages = autoLoadImages, autoLoadImages = autoLoadImages,
onClick = onClick, onClick = onClick,
onOpenImage = onImageClick, onOpenCommunity = onOpenCommunity,
onDoubleClick = onDoubleClick, onOpenUser = onOpenCreator,
onOpenPost = onOpenPost, onOpenPost = onOpenPost,
onOpenImage = onOpenImage,
onDoubleClick = onDoubleClick,
onOpenWeb = onOpenWeb, onOpenWeb = onOpenWeb,
onLongClick = { onLongClick = {
optionsMenuOpen.value = true optionsMenuOpen.value = true
@ -239,7 +241,7 @@ private fun CompactPost(
Icon(imageVector = Icons.Default.Download, contentDescription = null) Icon(imageVector = Icons.Default.Download, contentDescription = null)
}, },
blurred = blurNsfw && post.nsfw, blurred = blurNsfw && post.nsfw,
onImageClick = onImageClick, onImageClick = onOpenImage,
onDoubleClick = onDoubleClick, onDoubleClick = onDoubleClick,
onLongClick = { onLongClick = {
optionsMenuOpen.value = true optionsMenuOpen.value = true
@ -292,7 +294,7 @@ private fun ExtendedPost(
onDownVote: (() -> Unit)? = null, onDownVote: (() -> Unit)? = null,
onSave: (() -> Unit)? = null, onSave: (() -> Unit)? = null,
onReply: (() -> Unit)? = null, onReply: (() -> Unit)? = null,
onImageClick: ((String) -> Unit)? = null, onOpenImage: ((String) -> Unit)? = null,
onOptionSelected: ((OptionId) -> Unit)? = null, onOptionSelected: ((OptionId) -> Unit)? = null,
onClick: (() -> Unit)? = null, onClick: (() -> Unit)? = null,
onDoubleClick: (() -> Unit)? = null, onDoubleClick: (() -> Unit)? = null,
@ -343,7 +345,7 @@ private fun ExtendedPost(
onOpenPost = onOpenPost, onOpenPost = onOpenPost,
onOpenWeb = onOpenWeb, onOpenWeb = onOpenWeb,
onClick = onClick, onClick = onClick,
onOpenImage = onImageClick, onOpenImage = onOpenImage,
onDoubleClick = onDoubleClick, onDoubleClick = onDoubleClick,
onLongClick = { onLongClick = {
optionsMenuOpen.value = true optionsMenuOpen.value = true
@ -369,7 +371,7 @@ private fun ExtendedPost(
}, },
imageUrl = post.imageUrl, imageUrl = post.imageUrl,
blurred = blurNsfw && post.nsfw, blurred = blurNsfw && post.nsfw,
onImageClick = onImageClick, onImageClick = onOpenImage,
onDoubleClick = onDoubleClick, onDoubleClick = onDoubleClick,
autoLoadImages = autoLoadImages, autoLoadImages = autoLoadImages,
onLongClick = { onLongClick = {
@ -397,7 +399,11 @@ private fun ExtendedPost(
text = post.text, text = post.text,
autoLoadImages = autoLoadImages, autoLoadImages = autoLoadImages,
onClick = onClick, onClick = onClick,
onOpenImage = onImageClick, onOpenCommunity = onOpenCommunity,
onOpenUser = onOpenCreator,
onOpenPost = onOpenPost,
onOpenImage = onOpenImage,
onOpenWeb = onOpenWeb,
onDoubleClick = onDoubleClick, onDoubleClick = onDoubleClick,
onLongClick = { onLongClick = {
optionsMenuOpen.value = true optionsMenuOpen.value = true

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

@ -428,7 +428,7 @@ class ExploreScreen : Screen {
) )
} }
}, },
onImageClick = rememberCallbackArgs { url -> onOpenImage = rememberCallbackArgs { url ->
navigationCoordinator.pushScreen( navigationCoordinator.pushScreen(
ZoomableImageScreen(url), ZoomableImageScreen(url),
) )

2
unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailScreen.kt
View File

@ -662,7 +662,7 @@ class CommunityDetailScreen(
detailOpener.openPostDetail(post) detailOpener.openPostDetail(post)
} }
}, },
onImageClick = rememberCallbackArgs(model) { url -> onOpenImage = rememberCallbackArgs(model) { url ->
model.reduce( model.reduce(
CommunityDetailMviModel.Intent.MarkAsRead( CommunityDetailMviModel.Intent.MarkAsRead(
post.id post.id

2
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt
View File

@ -349,7 +349,7 @@ class MultiCommunityScreen(
onReply = rememberCallback { onReply = rememberCallback {
detailOpener.openPostDetail(post) detailOpener.openPostDetail(post)
}, },
onImageClick = rememberCallbackArgs { url -> onOpenImage = rememberCallbackArgs { url ->
model.reduce(MultiCommunityMviModel.Intent.MarkAsRead(post.id)) model.reduce(MultiCommunityMviModel.Intent.MarkAsRead(post.id))
navigationCoordinator.pushScreen(ZoomableImageScreen(url)) navigationCoordinator.pushScreen(ZoomableImageScreen(url))
}, },

2
unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedScreen.kt
View File

@ -200,7 +200,7 @@ object ProfileLoggedScreen : Tab {
WebViewScreen(url) WebViewScreen(url)
) )
}, },
onImageClick = rememberCallbackArgs { url -> onOpenImage = rememberCallbackArgs { url ->
navigationCoordinator.pushScreen( navigationCoordinator.pushScreen(
ZoomableImageScreen(url), ZoomableImageScreen(url),
) )

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

@ -509,7 +509,7 @@ class PostDetailScreen(
else -> Unit else -> Unit
} }
}, },
onImageClick = rememberCallbackArgs { url -> onOpenImage = rememberCallbackArgs { url ->
navigationCoordinator.pushScreen( navigationCoordinator.pushScreen(
ZoomableImageScreen(url), ZoomableImageScreen(url),
) )

2
unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListScreen.kt
View File

@ -413,7 +413,7 @@ class PostListScreen : Screen {
detailOpener.openPostDetail(post) detailOpener.openPostDetail(post)
} }
}, },
onImageClick = rememberCallbackArgs(model, post) { url -> onOpenImage = rememberCallbackArgs(model, post) { url ->
model.reduce(PostListMviModel.Intent.MarkAsRead(post.id)) model.reduce(PostListMviModel.Intent.MarkAsRead(post.id))
navigationCoordinator.pushScreen( navigationCoordinator.pushScreen(
ZoomableImageScreen(url) ZoomableImageScreen(url)

2
unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsScreen.kt
View File

@ -261,7 +261,7 @@ class SavedItemsScreen : Screen {
onReply = rememberCallback { onReply = rememberCallback {
detailOpener.openPostDetail(post) detailOpener.openPostDetail(post)
}, },
onImageClick = rememberCallbackArgs { url -> onOpenImage = rememberCallbackArgs { url ->
navigatorCoordinator.pushScreen( navigatorCoordinator.pushScreen(
ZoomableImageScreen(url), ZoomableImageScreen(url),
) )

2
unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailScreen.kt
View File

@ -536,7 +536,7 @@ class UserDetailScreen(
detailOpener.openPostDetail(post) detailOpener.openPostDetail(post)
} }
}, },
onImageClick = rememberCallbackArgs { url -> onOpenImage = rememberCallbackArgs { url ->
navigationCoordinator.pushScreen( navigationCoordinator.pushScreen(
ZoomableImageScreen(url), ZoomableImageScreen(url),
) )