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

app: switch to extension API

Browse source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2021-03-24 10:57:53 +05:30
parent 56fd18be75
commit 4016c22289
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
import dev.msfjarvis.lobsters.ui.theme.titleColor import dev.msfjarvis.lobsters.ui.theme.titleColor
import dev.msfjarvis.lobsters.util.IconResource import dev.msfjarvis.lobsters.util.IconResource
import dev.msfjarvis.lobsters.utils.Strings import dev.msfjarvis.lobsters.utils.Strings
import dev.msfjarvis.lobsters.utils.stringValue import dev.msfjarvis.lobsters.utils.get
val TEST_POST = SavedPost( val TEST_POST = SavedPost(
shortId = "zqyydb", shortId = "zqyydb",
@ -142,10 +142,7 @@ fun SubmitterAvatar(
) { ) {
CoilImage( CoilImage(
data = "${LobstersApi.BASE_URL}/$avatarUrl", data = "${LobstersApi.BASE_URL}/$avatarUrl",
contentDescription = stringValue( contentDescription = Strings.AvatarContentDescription.get(name),
Strings.AvatarContentDescription,
name,
),
fadeIn = true, fadeIn = true,
requestBuilder = { requestBuilder = {
transformations(CircleCropTransformation()) transformations(CircleCropTransformation())
@ -160,7 +157,7 @@ fun SubmitterNameText(
name: String, name: String,
) { ) {
Text( Text(
text = stringValue(Strings.SubmittedBy, name), text = Strings.SubmittedBy.get(name),
modifier = Modifier modifier = Modifier
.padding(start = 4.dp), .padding(start = 4.dp),
) )
@ -180,12 +177,10 @@ fun SaveButton(
.then(modifier), .then(modifier),
) { ) {
Crossfade(targetState = isSaved) { saved -> Crossfade(targetState = isSaved) { saved ->
// Using if (saved) ... else ... throws an IllegalArgumentException
val contentDescriptionEnum = if (saved) Strings.RemoveFromSavedPosts else Strings.AddToSavedPosts
IconResource( IconResource(
resourceId = if (saved) R.drawable.ic_favorite_24px else R.drawable.ic_favorite_border_24px, resourceId = if (saved) R.drawable.ic_favorite_24px else R.drawable.ic_favorite_border_24px,
tint = MaterialTheme.colors.secondary, tint = MaterialTheme.colors.secondary,
contentDescription = stringValue(contentDescriptionEnum), contentDescription = if (saved) Strings.RemoveFromSavedPosts.get() else Strings.AddToSavedPosts.get(),
) )
} }
} }
@ -205,7 +200,7 @@ fun CommentsButton(
IconResource( IconResource(
resourceId = R.drawable.ic_insert_comment_24px, resourceId = R.drawable.ic_insert_comment_24px,
tint = MaterialTheme.colors.secondary, tint = MaterialTheme.colors.secondary,
contentDescription = stringValue(Strings.OpenComments), contentDescription = Strings.OpenComments.get(),
) )
} }
} }

6
app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
View file

@ -22,7 +22,7 @@ import dev.msfjarvis.lobsters.ui.urllauncher.LocalUrlLauncher
import dev.msfjarvis.lobsters.util.IconResource import dev.msfjarvis.lobsters.util.IconResource
import dev.msfjarvis.lobsters.util.asZonedDateTime import dev.msfjarvis.lobsters.util.asZonedDateTime
import dev.msfjarvis.lobsters.utils.Strings import dev.msfjarvis.lobsters.utils.Strings
import dev.msfjarvis.lobsters.utils.stringValue import dev.msfjarvis.lobsters.utils.get
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@ -47,9 +47,9 @@ fun SavedPosts(
R.drawable.ic_favorite_border_24px, R.drawable.ic_favorite_border_24px,
tint = Color(0xFFD97373), tint = Color(0xFFD97373),
modifier = Modifier.padding(16.dp), modifier = Modifier.padding(16.dp),
contentDescription = stringValue(Strings.AddToSavedPosts), contentDescription = Strings.AddToSavedPosts.get(),
) )
Text(stringValue(Strings.NoSavedPost)) Text(Strings.NoSavedPost.get())
} }
} else { } else {
LazyColumn( LazyColumn(