From 3f223f430659f9cb5a205b55e3eece1d7984c053 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 2 Nov 2020 01:07:12 +0530 Subject: [PATCH] Remove liked post coloring from UI Signed-off-by: Harsh Shandilya --- .../dev/msfjarvis/lobsters/ui/posts/EmptyList.kt | 4 ++-- .../dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt | 2 -- .../java/dev/msfjarvis/lobsters/ui/theme/Theme.kt | 1 - .../lobsters/ui/viewmodel/LobstersViewModel.kt | 12 ------------ .../dev/msfjarvis/lobsters/model/LobstersPost.kt | 1 - 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt index a88d86af..4173c68c 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt @@ -8,11 +8,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import dev.msfjarvis.lobsters.R import dev.msfjarvis.lobsters.util.IconResource -import dev.msfjarvis.lobsters.ui.theme.savedTitleColor @Composable fun EmptyList(saved: Boolean) { @@ -24,7 +24,7 @@ fun EmptyList(saved: Boolean) { if (saved) { IconResource( R.drawable.ic_favorite_border_24px, - tint = savedTitleColor, + tint = Color(0xFFD97373), modifier = Modifier.padding(16.dp) ) Text(stringResource(R.string.no_saved_posts)) 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 277e15d5..a767814c 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 @@ -32,7 +32,6 @@ import dev.msfjarvis.lobsters.injection.ApiModule import dev.msfjarvis.lobsters.model.LobstersPost import dev.msfjarvis.lobsters.model.Submitter import dev.msfjarvis.lobsters.ui.theme.LobstersTheme -import dev.msfjarvis.lobsters.ui.theme.savedTitleColor import dev.msfjarvis.lobsters.ui.theme.titleColor @Composable @@ -43,7 +42,6 @@ fun LazyItemScope.LobstersItem( commentOpenAction: (LobstersPost) -> Unit, saveAction: (LobstersPost) -> Unit, ) { - val titleColor = if (post.isLiked) savedTitleColor else titleColor val width = with(DensityAmbient.current) { ConfigurationAmbient.current.screenWidthDp.toDp().toPx() } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt index 1bc934d9..d80e8b95 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt @@ -6,7 +6,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color val titleColor = Color(0xFF7395D9) -val savedTitleColor = Color(0xFFD97373) val darkColors = darkColors( primary = Color.White, diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt index cb29bd7b..76c59379 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt @@ -54,15 +54,9 @@ class LobstersViewModel @ViewModelInject constructor( getMorePostsInternal(false) } - fun refreshPosts() { - apiPage = 1 - getMorePostsInternal(true) - } - private fun getMorePostsInternal(firstLoad: Boolean) { viewModelScope.launch(coroutineExceptionHandler) { val newPosts = lobstersApi.getHottestPosts(apiPage) - .transformLikedFlag() .toList() if (firstLoad) { _posts.value = newPosts @@ -79,7 +73,6 @@ class LobstersViewModel @ViewModelInject constructor( viewModelScope.launch { savedPostsDao.insertPosts(post) getSavedPosts() - _posts.value = _posts.value.transformLikedFlag().toList() } } @@ -87,11 +80,6 @@ class LobstersViewModel @ViewModelInject constructor( viewModelScope.launch { savedPostsDao.deletePostById(post.shortId) getSavedPosts() - _posts.value = _posts.value.transformLikedFlag().toList() } } - - private suspend fun List.transformLikedFlag() = map { - it.apply { isLiked = savedPostsDao.isLiked(shortId) } - } } diff --git a/model/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt b/model/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt index 5feb2f92..f6d947bd 100644 --- a/model/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt +++ b/model/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt @@ -23,5 +23,4 @@ class LobstersPost( @Json(name = "submitter_user") val submitterUser: Submitter, val tags: List, - var isLiked: Boolean = false, )