diff --git a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt index b4f0ee0a..759366fd 100644 --- a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt +++ b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt @@ -20,9 +20,9 @@ class LobstersItemTest : ScreenshotTest { DarkTestTheme { LobstersItem( post = TEST_POST, - onClick = { /*TODO*/ }, - onLongClick = { /*TODO*/ }, - onSaveButtonClick = { /*TODO*/ }, + viewPost = { /*TODO*/ }, + viewComments = { /*TODO*/ }, + toggleSave = { /*TODO*/ }, isSaved = true, ) } 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 bea13542..e154b7aa 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 @@ -58,9 +58,9 @@ fun HottestPosts( LobstersItem( post = item, isSaved = isSaved, - onClick = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) }, - onLongClick = { urlLauncher.launch(item.commentsUrl) }, - onSaveButtonClick = { + viewPost = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) }, + viewComments = { urlLauncher.launch(item.commentsUrl) }, + toggleSave = { isSaved = isSaved.not() saveAction.invoke(item) }, 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 2b24c14a..14186511 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 @@ -54,13 +54,13 @@ val TEST_POST = SavedPost( fun LobstersItem( post: SavedPost, isSaved: Boolean, - onClick: () -> Unit, - onLongClick: () -> Unit, - onSaveButtonClick: () -> Unit, + viewPost: () -> Unit, + viewComments: () -> Unit, + toggleSave: () -> Unit, ) { Surface( modifier = Modifier - .clickable { onClick.invoke() }, + .clickable { viewPost.invoke() }, ) { Row( modifier = Modifier.padding(start = 12.dp, end = 12.dp), @@ -79,14 +79,14 @@ fun LobstersItem( ) { SaveButton( isSaved, - onSaveButtonClick, + toggleSave, ) } Box( modifier = Modifier.weight(0.1f), ) { CommentsButton( - onClick = onLongClick, + onClick = viewComments, ) } } @@ -205,9 +205,9 @@ fun Preview() { LobstersItem( post = item, isSaved = false, - onClick = {}, - onLongClick = {}, - onSaveButtonClick = {}, + viewPost = {}, + viewComments = {}, + toggleSave = {}, ) } } 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 c62bd16e..60b3e1d0 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 @@ -59,9 +59,9 @@ fun SavedPosts( LobstersItem( post = item, isSaved = true, - onClick = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) }, - onLongClick = { urlLauncher.launch(item.commentsUrl) }, - onSaveButtonClick = { saveAction.invoke(item) }, + viewPost = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) }, + viewComments = { urlLauncher.launch(item.commentsUrl) }, + toggleSave = { saveAction.invoke(item) }, ) } }