From 5acab436693a7048a977abbd5bba49e52a2db1e5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 9 Nov 2020 11:35:42 +0530 Subject: [PATCH] Rename LobstersItemRedux to LobstersItem Signed-off-by: Harsh Shandilya --- .../dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt | 2 +- .../ui/posts/{LobstersItemRedux.kt => LobstersItem.kt} | 10 ++-------- .../java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) rename app/src/main/java/dev/msfjarvis/lobsters/ui/posts/{LobstersItemRedux.kt => LobstersItem.kt} (91%) 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 78449a0c..ad5afa9e 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 @@ -30,7 +30,7 @@ fun HottestPosts( if (posts.lastIndex == index) { overscrollAction.invoke() } - LobstersItemRedux( + LobstersItem( post = item, onClick = { post -> urlLauncher.launch(post.url.ifEmpty { post.commentsUrl }) }, onLongClick = { post -> urlLauncher.launch(post.commentsUrl) }, diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemRedux.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt similarity index 91% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemRedux.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 4704768a..0e8c4756 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemRedux.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -55,14 +55,8 @@ val TEST_POST = LobstersPost( listOf("openbsd", "linux", "containers", "hack the planet", "no thanks"), ) -/** - * A temporary replacement for [LobstersItem] that implements the same functionality backed by - * a UI that's built upon [ConstraintLayout] rather than Column and Row. This allows us to add a - * dedicated save button without needing to add swipe actions, which have been hard to get right - * and thus resulted in a variety of bugs (see https://msfjarvis.dev/g/compose-lobsters/issues/65). - */ @Composable -fun LobstersItemRedux( +fun LobstersItem( post: LobstersPost, onClick: (LobstersPost) -> Unit = {}, onLongClick: (LobstersPost) -> Unit = {}, @@ -157,7 +151,7 @@ fun TagRow( fun Preview() { LobstersTheme { LazyColumnFor(items = listOf(TEST_POST, TEST_POST, TEST_POST, TEST_POST, TEST_POST)) { item -> - LobstersItemRedux( + LobstersItem( post = item, ) } 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 30154262..30bd941a 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 @@ -26,7 +26,7 @@ fun SavedPosts( state = listState, modifier = Modifier.padding(horizontal = 8.dp).then(modifier) ) { item -> - LobstersItemRedux( + LobstersItem( post = item, onClick = { post -> urlLauncher.launch(post.url.ifEmpty { post.commentsUrl }) }, onLongClick = { post -> urlLauncher.launch(post.commentsUrl) },