diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt index 99c4371c..0091a911 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt @@ -85,14 +85,12 @@ fun LobstersApp() { HottestPosts( posts = hottestPosts, listState = hottestPostsListState, - saveAction = viewModel::savePost, overscrollAction = viewModel::getMorePosts, ) } composable(Destination.Saved.route) { SavedPosts( posts = savedPosts, - saveAction = viewModel::removeSavedPost, ) } } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt index 6b040842..6fd3ad5d 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt @@ -14,7 +14,6 @@ fun HottestPosts( posts: List, listState: LazyListState, modifier: Modifier = Modifier, - saveAction: (LobstersPost) -> Unit, overscrollAction: () -> Unit, ) { val urlLauncher = UrlLauncherAmbient.current @@ -34,7 +33,6 @@ fun HottestPosts( post = item, linkOpenAction = { post -> urlLauncher.launch(post.url.ifEmpty { post.commentsUrl }) }, commentOpenAction = { post -> urlLauncher.launch(post.commentsUrl) }, - saveAction = saveAction, ) } } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 818e9d5b..5c825392 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -6,23 +6,16 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.offsetPx import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumnFor import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.FractionalThreshold -import androidx.compose.material.rememberSwipeableState -import androidx.compose.material.swipeable import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.gesture.scrollorientationlocking.Orientation import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.ConfigurationAmbient -import androidx.compose.ui.platform.DensityAmbient import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.ui.tooling.preview.Preview @@ -33,39 +26,17 @@ import dev.msfjarvis.lobsters.model.Submitter import dev.msfjarvis.lobsters.ui.theme.LobstersTheme import dev.msfjarvis.lobsters.ui.theme.titleColor -private enum class SwipeState { - NotSwiped, - FullySwiped, -} - @Composable fun LazyItemScope.LobstersItem( post: LobstersPost, modifier: Modifier = Modifier, linkOpenAction: (LobstersPost) -> Unit, commentOpenAction: (LobstersPost) -> Unit, - saveAction: (LobstersPost) -> Unit, ) { - val width = with(DensityAmbient.current) { - ConfigurationAmbient.current.screenWidthDp.toDp().toPx() - } - val swipeableState = rememberSwipeableState(SwipeState.NotSwiped) - val anchors = mapOf(0f to SwipeState.NotSwiped, width to SwipeState.FullySwiped) - if (swipeableState.offset.value >= (width / 2)) { - saveAction.invoke(post) - swipeableState.animateTo(SwipeState.NotSwiped) - } Column( modifier = modifier .fillParentMaxWidth() - .swipeable( - state = swipeableState, - anchors = anchors, - thresholds = { _, _ -> FractionalThreshold(0.5f) }, - orientation = Orientation.Horizontal - ) - .offsetPx(swipeableState.offset) .clickable( onClick = { linkOpenAction.invoke(post) }, onLongClick = { commentOpenAction.invoke(post) }, @@ -145,7 +116,6 @@ fun PreviewLobstersItem() { post = item, linkOpenAction = {}, commentOpenAction = {}, - saveAction = {}, ) } } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt index 4765aed5..27319df7 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt @@ -13,7 +13,6 @@ import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient fun SavedPosts( posts: List, modifier: Modifier = Modifier, - saveAction: (LobstersPost) -> Unit ) { val listState = rememberLazyListState() val urlLauncher = UrlLauncherAmbient.current @@ -30,7 +29,6 @@ fun SavedPosts( post = item, linkOpenAction = { post -> urlLauncher.launch(post.url.ifEmpty { post.commentsUrl }) }, commentOpenAction = { post -> urlLauncher.launch(post.commentsUrl) }, - saveAction = saveAction, ) } }