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 a55b285d..622285a1 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 @@ -24,7 +24,6 @@ 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.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -37,6 +36,8 @@ import dev.msfjarvis.lobsters.data.local.SavedPost import dev.msfjarvis.lobsters.ui.theme.LobstersTheme import dev.msfjarvis.lobsters.ui.theme.titleColor import dev.msfjarvis.lobsters.util.IconResource +import dev.msfjarvis.lobsters.utils.StringEnum +import dev.msfjarvis.lobsters.utils.stringValue val TEST_POST = SavedPost( shortId = "zqyydb", @@ -141,8 +142,8 @@ fun SubmitterAvatar( ) { CoilImage( data = "${LobstersApi.BASE_URL}/$avatarUrl", - contentDescription = stringResource( - R.string.avatar_content_description, + contentDescription = stringValue( + StringEnum.AvatarContentDescription, name, ), fadeIn = true, @@ -159,7 +160,7 @@ fun SubmitterNameText( name: String, ) { Text( - text = stringResource(id = R.string.submitted_by, name), + text = stringValue(StringEnum.SubmittedBy, name), modifier = Modifier .padding(start = 4.dp), ) @@ -179,10 +180,12 @@ fun SaveButton( .then(modifier), ) { Crossfade(targetState = isSaved) { saved -> + // Using if (saved) ... else ... throws an IllegalArgumentException + val contentDescriptionEnum = if (saved) StringEnum.RemoveFromSavedPosts else StringEnum.AddToSavedPosts IconResource( resourceId = if (saved) R.drawable.ic_favorite_24px else R.drawable.ic_favorite_border_24px, tint = MaterialTheme.colors.secondary, - contentDescription = stringResource(if (saved) R.string.remove_from_saved_posts else R.string.add_to_saved_posts), + contentDescription = stringValue(contentDescriptionEnum), ) } } @@ -202,7 +205,7 @@ fun CommentsButton( IconResource( resourceId = R.drawable.ic_insert_comment_24px, tint = MaterialTheme.colors.secondary, - contentDescription = stringResource(R.string.open_comments), + contentDescription = stringValue(StringEnum.OpenComments), ) } } 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 60570a82..6ec72ea0 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 @@ -15,13 +15,14 @@ import androidx.compose.runtime.getValue 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.data.local.SavedPost import dev.msfjarvis.lobsters.ui.urllauncher.LocalUrlLauncher import dev.msfjarvis.lobsters.util.IconResource import dev.msfjarvis.lobsters.util.asZonedDateTime +import dev.msfjarvis.lobsters.utils.StringEnum +import dev.msfjarvis.lobsters.utils.stringValue import kotlinx.coroutines.flow.Flow @OptIn(ExperimentalFoundationApi::class) @@ -46,9 +47,9 @@ fun SavedPosts( R.drawable.ic_favorite_border_24px, tint = Color(0xFFD97373), modifier = Modifier.padding(16.dp), - contentDescription = stringResource(R.string.add_to_saved_posts), + contentDescription = stringValue(StringEnum.AddToSavedPosts), ) - Text(stringResource(R.string.no_saved_posts)) + Text(stringValue(StringEnum.NoSavedPost)) } } else { LazyColumn(