msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-18 03:17:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

Remove liked post coloring from UI

Browse source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-11-02 01:07:12 +05:30
parent a52c75601c
commit 3f223f4306
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
5 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt
View file

@ -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))

2
app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
View file

@ -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()
}

1
app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt
View file

@ -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,

12
app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt
View file

@ -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<LobstersPost>.transformLikedFlag() = map {
it.apply { isLiked = savedPostsDao.isLiked(shortId) }
}
}

1
model/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt
View file

@ -23,5 +23,4 @@ class LobstersPost(
@Json(name = "submitter_user")
val submitterUser: Submitter,
val tags: List<String>,
var isLiked: Boolean = false,
)