msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 22:17:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat(common): add swipe action for saving posts

Browse source
This commit is contained in:
Harsh Shandilya 2023-11-07 13:09:05 +05:30
parent c721b8b1da
commit 7a648a77b0
No known key found for this signature in database
3 changed files with 35 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Start work on integrating Shiori (https://github.com/go-shiori/shiori/) as a
remote backup target for saved posts
* Make top app bar color match bottom bar
* Add a left-to-right swipe action to save a post
## [1.37.0] - 2023-10-06

26
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/LobstersListItem.kt
View file

@ -8,10 +8,15 @@ package dev.msfjarvis.claw.android.ui.lists
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Reply
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.FavoriteBorder
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import dev.msfjarvis.claw.common.posts.LobstersCard
@ -29,20 +34,37 @@ fun LobstersListItem(
modifier: Modifier = Modifier,
) {
val read by produceState(false, item.shortId) { value = isRead(item.shortId) }
var saved by remember(item.shortId) { mutableStateOf(isSaved(item)) }
val commentsAction =
SwipeAction(
icon = rememberVectorPainter(Icons.AutoMirrored.Filled.Reply),
background = MaterialTheme.colorScheme.tertiary,
onSwipe = { postActions.viewCommentsPage(item.commentsUrl) },
)
val saveAction =
SwipeAction(
icon =
rememberVectorPainter(if (saved) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder),
background = MaterialTheme.colorScheme.tertiary,
onSwipe = {
postActions.toggleSave(item)
saved = isSaved(item)
},
)
SwipeableActionsBox(
startActions = listOf(saveAction),
endActions = listOf(commentsAction),
) {
LobstersCard(
post = item,
isSaved = isSaved(item),
isSaved = saved,
isRead = read,
postActions = postActions,
viewComments = postActions::viewComments,
toggleSave = { post ->
postActions.toggleSave(post)
saved = isSaved(post)
},
viewPost = postActions::viewPost,
modifier = modifier,
)
}

56
common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt
View file

@ -36,10 +36,6 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@ -52,9 +48,6 @@ import dev.msfjarvis.claw.common.theme.LobstersTheme
import dev.msfjarvis.claw.common.ui.NetworkImage
import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
import dev.msfjarvis.claw.database.local.SavedPost
import dev.msfjarvis.claw.model.LinkMetadata
import dev.msfjarvis.claw.model.LobstersPostDetails
import dev.msfjarvis.claw.model.User
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList
@ -63,15 +56,16 @@ fun LobstersCard(
post: SavedPost,
isSaved: Boolean,
isRead: Boolean,
postActions: PostActions,
viewComments: (String) -> Unit,
toggleSave: (SavedPost) -> Unit,
viewPost: (String, String, String) -> Unit,
modifier: Modifier = Modifier,
) {
var localSavedState by remember(post, isSaved) { mutableStateOf(isSaved) }
Box(
modifier =
modifier
.fillMaxWidth()
.clickable { postActions.viewPost(post.shortId, post.url, post.commentsUrl) }
.clickable { viewPost(post.shortId, post.url, post.commentsUrl) }
.background(MaterialTheme.colorScheme.background)
.padding(start = 16.dp, top = 16.dp, end = 4.dp, bottom = 16.dp),
) {
@ -90,12 +84,8 @@ fun LobstersCard(
horizontalAlignment = Alignment.CenterHorizontally,
) {
SaveButton(
isSaved = localSavedState,
modifier =
Modifier.clickable(role = Role.Button) {
localSavedState = !localSavedState
postActions.toggleSave(post)
},
isSaved = isSaved,
modifier = Modifier.clickable(role = Role.Button) { toggleSave(post) },
)
HorizontalDivider(modifier = Modifier.width(48.dp))
CommentsButton(
@ -103,7 +93,7 @@ fun LobstersCard(
modifier =
Modifier.clickable(
role = Role.Button,
onClick = { postActions.viewComments(post.shortId) },
onClick = { viewComments(post.shortId) },
),
)
}
@ -267,35 +257,9 @@ fun LobstersCardPreview() {
),
isRead = true,
isSaved = true,
postActions =
object : PostActions {
override fun viewPost(postId: String, postUrl: String, commentsUrl: String) {}
override fun viewComments(postId: String) {}
override fun viewCommentsPage(commentsUrl: String) {}
override fun toggleSave(post: SavedPost) {}
override suspend fun getComments(postId: String): LobstersPostDetails {
return LobstersPostDetails(
shortId = "ooga",
title = "Simple Anomaly Detection Using Plain SQL",
url = "https://hakibenita.com/sql-anomaly-detection",
createdAt = "2020-09-21T08:04:24.000-05:00",
commentCount = 1,
commentsUrl = "https://lobste.rs/s/q1hh1g/simple_anomaly_detection_using_plain_sql",
tags = listOf("databases", "apis"),
description = "",
submitter = User("Haki", "", "", "", ""),
comments = emptyList(),
)
}
override suspend fun getLinkMetadata(url: String): LinkMetadata {
return LinkMetadata("", "")
}
},
viewPost = { _, _, _ -> },
viewComments = {},
toggleSave = {},
)
}
}