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

common/app: rename StringEnum to Strings

Browse source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2021-03-24 10:43:47 +05:30
parent b19a9267f6
commit 00c1977f87
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
6 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ import dev.msfjarvis.lobsters.data.local.SavedPost
import dev.msfjarvis.lobsters.ui.theme.LobstersTheme 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.StringEnum import dev.msfjarvis.lobsters.utils.Strings
import dev.msfjarvis.lobsters.utils.stringValue import dev.msfjarvis.lobsters.utils.stringValue
val TEST_POST = SavedPost( val TEST_POST = SavedPost(
@ -143,7 +143,7 @@ fun SubmitterAvatar(
CoilImage( CoilImage(
data = "${LobstersApi.BASE_URL}/$avatarUrl", data = "${LobstersApi.BASE_URL}/$avatarUrl",
contentDescription = stringValue( contentDescription = stringValue(
StringEnum.AvatarContentDescription, Strings.AvatarContentDescription,
name, name,
), ),
fadeIn = true, fadeIn = true,
@ -160,7 +160,7 @@ fun SubmitterNameText(
name: String, name: String,
) { ) {
Text( Text(
text = stringValue(StringEnum.SubmittedBy, name), text = stringValue(Strings.SubmittedBy, name),
modifier = Modifier modifier = Modifier
.padding(start = 4.dp), .padding(start = 4.dp),
) )
@ -181,7 +181,7 @@ fun SaveButton(
) { ) {
Crossfade(targetState = isSaved) { saved -> Crossfade(targetState = isSaved) { saved ->
// Using if (saved) ... else ... throws an IllegalArgumentException // Using if (saved) ... else ... throws an IllegalArgumentException
val contentDescriptionEnum = if (saved) StringEnum.RemoveFromSavedPosts else StringEnum.AddToSavedPosts 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,
@ -205,7 +205,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(StringEnum.OpenComments), contentDescription = stringValue(Strings.OpenComments),
) )
} }
} }

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

@ -21,7 +21,7 @@ import dev.msfjarvis.lobsters.data.local.SavedPost
import dev.msfjarvis.lobsters.ui.urllauncher.LocalUrlLauncher 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.StringEnum import dev.msfjarvis.lobsters.utils.Strings
import dev.msfjarvis.lobsters.utils.stringValue import dev.msfjarvis.lobsters.utils.stringValue
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
@ -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(StringEnum.AddToSavedPosts), contentDescription = stringValue(Strings.AddToSavedPosts),
) )
Text(stringValue(StringEnum.NoSavedPost)) Text(stringValue(Strings.NoSavedPost))
} }
} else { } else {
LazyColumn( LazyColumn(

30
common/src/androidMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt
View file

@ -4,23 +4,23 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import dev.msfjarvis.lobsters.common.R import dev.msfjarvis.lobsters.common.R
private fun stringEnumMapper(stringEnum: StringEnum): Int { private fun stringEnumMapper(stringEnum: Strings): Int {
return when (stringEnum) { return when (stringEnum) {
StringEnum.AddToSavedPosts -> R.string.add_to_saved_posts Strings.AddToSavedPosts -> R.string.add_to_saved_posts
StringEnum.AppName -> R.string.app_name Strings.AppName -> R.string.app_name
StringEnum.AvatarContentDescription -> R.string.avatar_content_description Strings.AvatarContentDescription -> R.string.avatar_content_description
StringEnum.HottestPosts -> R.string.hottest_posts Strings.HottestPosts -> R.string.hottest_posts
StringEnum.Loading -> R.string.loading Strings.Loading -> R.string.loading
StringEnum.NoSavedPost -> R.string.no_saved_posts Strings.NoSavedPost -> R.string.no_saved_posts
StringEnum.OpenComments -> R.string.open_comments Strings.OpenComments -> R.string.open_comments
StringEnum.RefreshPostsContentDescription -> R.string.refresh_posts_content_description Strings.RefreshPostsContentDescription -> R.string.refresh_posts_content_description
StringEnum.RemoveFromSavedPosts -> R.string.remove_from_saved_posts Strings.RemoveFromSavedPosts -> R.string.remove_from_saved_posts
StringEnum.SubmittedBy -> R.string.submitted_by Strings.SubmittedBy -> R.string.submitted_by
} }
} }
@Composable @Composable
actual fun stringValue(enum: StringEnum): String { actual fun stringValue(enum: Strings): String {
return stringResource(stringEnumMapper(enum)) return stringResource(stringEnumMapper(enum))
} }
@ -29,16 +29,16 @@ actual fun stringValue(enum: StringEnum): String {
* *
*/ */
@Composable @Composable
actual fun stringValue(enum: StringEnum, arg1: Any): String { actual fun stringValue(enum: Strings, arg1: Any): String {
return stringResource(stringEnumMapper(enum), arg1) return stringResource(stringEnumMapper(enum), arg1)
} }
@Composable @Composable
actual fun stringValue(enum: StringEnum, arg1: Any, arg2: Any): String { actual fun stringValue(enum: Strings, arg1: Any, arg2: Any): String {
return stringResource(stringEnumMapper(enum), arg1, arg2) return stringResource(stringEnumMapper(enum), arg1, arg2)
} }
@Composable @Composable
actual fun stringValue(enum: StringEnum, arg1: Any, arg2: Any, arg3: Any): String { actual fun stringValue(enum: Strings, arg1: Any, arg2: Any, arg3: Any): String {
return stringResource(stringEnumMapper(enum), arg1, arg2, arg3) return stringResource(stringEnumMapper(enum), arg1, arg2, arg3)
} }

8
common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt
View file

@ -3,17 +3,17 @@ package dev.msfjarvis.lobsters.utils
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@Composable @Composable
expect fun stringValue(enum: StringEnum): String expect fun stringValue(enum: Strings): String
/** /**
* Workaround for https://youtrack.jetbrains.com/issue/KT-44499 * Workaround for https://youtrack.jetbrains.com/issue/KT-44499
* *
*/ */
@Composable @Composable
expect fun stringValue(enum: StringEnum, arg1: Any): String expect fun stringValue(enum: Strings, arg1: Any): String
@Composable @Composable
expect fun stringValue(enum: StringEnum, arg1: Any, arg2: Any): String expect fun stringValue(enum: Strings, arg1: Any, arg2: Any): String
@Composable @Composable
expect fun stringValue(enum: StringEnum, arg1: Any, arg2: Any, arg3: Any): String expect fun stringValue(enum: Strings, arg1: Any, arg2: Any, arg3: Any): String

2
common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringEnum.kt → common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/Strings.kt
View file

@ -1,6 +1,6 @@
package dev.msfjarvis.lobsters.utils package dev.msfjarvis.lobsters.utils
enum class StringEnum { enum class Strings {
AddToSavedPosts, AddToSavedPosts,
AppName, AppName,
AvatarContentDescription, AvatarContentDescription,

30
common/src/jvmMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt
View file

@ -2,23 +2,23 @@ package dev.msfjarvis.lobsters.utils
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
private fun stringEnumMapper(stringEnum: StringEnum): String { private fun stringEnumMapper(stringEnum: Strings): String {
return when (stringEnum) { return when (stringEnum) {
StringEnum.AddToSavedPosts -> "Add to saved posts" Strings.AddToSavedPosts -> "Add to saved posts"
StringEnum.AppName -> "Claw" Strings.AppName -> "Claw"
StringEnum.AvatarContentDescription -> "%1s's avatar" Strings.AvatarContentDescription -> "%1s's avatar"
StringEnum.HottestPosts -> "Hottest" Strings.HottestPosts -> "Hottest"
StringEnum.Loading -> "Loading posts…" Strings.Loading -> "Loading posts…"
StringEnum.NoSavedPost -> "You don't have any saved posts" Strings.NoSavedPost -> "You don't have any saved posts"
StringEnum.OpenComments -> "Open comments" Strings.OpenComments -> "Open comments"
StringEnum.RefreshPostsContentDescription -> "Refresh posts" Strings.RefreshPostsContentDescription -> "Refresh posts"
StringEnum.RemoveFromSavedPosts -> "Remove from saved posts" Strings.RemoveFromSavedPosts -> "Remove from saved posts"
StringEnum.SubmittedBy -> "submitted by %1s" Strings.SubmittedBy -> "submitted by %1s"
} }
} }
@Composable @Composable
actual fun stringValue(enum: StringEnum): String { actual fun stringValue(enum: Strings): String {
return stringEnumMapper(enum) return stringEnumMapper(enum)
} }
@ -27,16 +27,16 @@ actual fun stringValue(enum: StringEnum): String {
* *
*/ */
@Composable @Composable
actual fun stringValue(enum: StringEnum, arg1: Any): String { actual fun stringValue(enum: Strings, arg1: Any): String {
return stringEnumMapper(enum).format(arg1) return stringEnumMapper(enum).format(arg1)
} }
@Composable @Composable
actual fun stringValue(enum: StringEnum, arg1: Any, arg2: Any): String { actual fun stringValue(enum: Strings, arg1: Any, arg2: Any): String {
return stringEnumMapper(enum).format(arg1, arg2) return stringEnumMapper(enum).format(arg1, arg2)
} }
@Composable @Composable
actual fun stringValue(enum: StringEnum, arg1: Any, arg2: Any, arg3: Any): String { actual fun stringValue(enum: Strings, arg1: Any, arg2: Any, arg3: Any): String {
return stringEnumMapper(enum).format(arg1, arg2, arg3) return stringEnumMapper(enum).format(arg1, arg2, arg3)
} }