diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 481835ee..7c07b007 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,11 +11,11 @@ android:label="@string/app_name" android:roundIcon="@drawable/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.Lobsters"> + android:theme="@style/Theme.MaterialComponents"> + android:theme="@style/Theme.MaterialComponents.NoActionBar"> diff --git a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt index 4a37df84..03c66b3f 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt @@ -56,9 +56,11 @@ fun LobstersApp( if (lastIndex == index) { viewModel.getMorePosts() } - LobstersItem(item) { post -> - urlLauncher.launch(post.url) - } + LobstersItem( + item, + linkOpenAction = { post -> urlLauncher.launch(post.url) }, + commentOpenAction = { post -> urlLauncher.launch(post.commentsUrl) }, + ) } } ) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt index d57ec967..a539067e 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border 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.padding import androidx.compose.foundation.lazy.LazyColumnFor @@ -26,40 +25,42 @@ import dev.msfjarvis.lobsters.model.Submitter fun LazyItemScope.LobstersItem( post: LobstersPost, modifier: Modifier = Modifier, - onClick: (LobstersPost) -> Unit, + linkOpenAction: (LobstersPost) -> Unit, + commentOpenAction: (LobstersPost) -> Unit, ) { ListItem( modifier = modifier.padding(horizontal = 8.dp) .fillParentMaxWidth() - .clickable(onClick = { onClick.invoke(post) }), + .clickable( + onClick = { linkOpenAction.invoke(post) }, + onLongClick = { commentOpenAction.invoke(post) } + ), text = { - Column { - Text( - text = post.title, - color = Color(0xFF7395D9), - fontWeight = FontWeight.Bold, - modifier = Modifier.padding(top = 4.dp) - ) - Row( - modifier = Modifier.padding(vertical = 8.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - post.tags.forEach { tag -> - Text( - text = tag, - modifier = Modifier - .border(BorderStroke(1.dp, Color.Gray)) - .background(Color(0xFFFFFCD7), RoundedCornerShape(4.dp)) - .padding(vertical = 2.dp, horizontal = 4.dp), - color = Color.DarkGray, - ) - } + Text( + text = post.title, + color = Color(0xFF7395D9), + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(top = 4.dp) + ) + Row( + modifier = Modifier.padding(vertical = 8.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + post.tags.take(4).forEach { tag -> + Text( + text = tag, + modifier = Modifier + .border(BorderStroke(1.dp, Color.Gray)) + .background(Color(0xFFFFFCD7), RoundedCornerShape(4.dp)) + .padding(vertical = 2.dp, horizontal = 4.dp), + color = Color.DarkGray, + ) } - Text( - text = "submitted by ${post.submitterUser.username}", - modifier = Modifier.padding(bottom = 4.dp), - ) } + Text( + text = "submitted by ${post.submitterUser.username}", + modifier = Modifier.padding(bottom = 4.dp), + ) } ) } @@ -95,7 +96,7 @@ fun PreviewLobstersItem() { ) LobstersTheme { LazyColumnFor(items = listOf(post)) { item -> - LobstersItem(post = item, onClick = {}) + LobstersItem(post = item, linkOpenAction = {}, commentOpenAction = {}) } } -} \ No newline at end of file +} diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index e7c6378c..00000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index f8c6127d..00000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml deleted file mode 100644 index f7d48c38..00000000 --- a/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -