From 00c1977f872da0ba0562eaa4b7a47167e226281d Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 24 Mar 2021 10:43:47 +0530 Subject: [PATCH] common/app: rename StringEnum to Strings Signed-off-by: Harsh Shandilya --- .../lobsters/ui/posts/LobstersItem.kt | 10 +++---- .../msfjarvis/lobsters/ui/posts/SavedPosts.kt | 6 ++-- .../msfjarvis/lobsters/utils/StringValue.kt | 30 +++++++++---------- .../msfjarvis/lobsters/utils/StringValue.kt | 8 ++--- .../utils/{StringEnum.kt => Strings.kt} | 2 +- .../msfjarvis/lobsters/utils/StringValue.kt | 30 +++++++++---------- 6 files changed, 43 insertions(+), 43 deletions(-) rename common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/{StringEnum.kt => Strings.kt} (90%) 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 622285a1..bf840e56 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 @@ -36,7 +36,7 @@ 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.Strings import dev.msfjarvis.lobsters.utils.stringValue val TEST_POST = SavedPost( @@ -143,7 +143,7 @@ fun SubmitterAvatar( CoilImage( data = "${LobstersApi.BASE_URL}/$avatarUrl", contentDescription = stringValue( - StringEnum.AvatarContentDescription, + Strings.AvatarContentDescription, name, ), fadeIn = true, @@ -160,7 +160,7 @@ fun SubmitterNameText( name: String, ) { Text( - text = stringValue(StringEnum.SubmittedBy, name), + text = stringValue(Strings.SubmittedBy, name), modifier = Modifier .padding(start = 4.dp), ) @@ -181,7 +181,7 @@ fun SaveButton( ) { Crossfade(targetState = isSaved) { saved -> // 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( resourceId = if (saved) R.drawable.ic_favorite_24px else R.drawable.ic_favorite_border_24px, tint = MaterialTheme.colors.secondary, @@ -205,7 +205,7 @@ fun CommentsButton( IconResource( resourceId = R.drawable.ic_insert_comment_24px, tint = MaterialTheme.colors.secondary, - contentDescription = stringValue(StringEnum.OpenComments), + contentDescription = stringValue(Strings.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 6ec72ea0..3dac9dfd 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 @@ -21,7 +21,7 @@ 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.Strings import dev.msfjarvis.lobsters.utils.stringValue import kotlinx.coroutines.flow.Flow @@ -47,9 +47,9 @@ fun SavedPosts( R.drawable.ic_favorite_border_24px, tint = Color(0xFFD97373), modifier = Modifier.padding(16.dp), - contentDescription = stringValue(StringEnum.AddToSavedPosts), + contentDescription = stringValue(Strings.AddToSavedPosts), ) - Text(stringValue(StringEnum.NoSavedPost)) + Text(stringValue(Strings.NoSavedPost)) } } else { LazyColumn( diff --git a/common/src/androidMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt b/common/src/androidMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt index 39a8c512..207cccaa 100644 --- a/common/src/androidMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt +++ b/common/src/androidMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt @@ -4,23 +4,23 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import dev.msfjarvis.lobsters.common.R -private fun stringEnumMapper(stringEnum: StringEnum): Int { +private fun stringEnumMapper(stringEnum: Strings): Int { return when (stringEnum) { - StringEnum.AddToSavedPosts -> R.string.add_to_saved_posts - StringEnum.AppName -> R.string.app_name - StringEnum.AvatarContentDescription -> R.string.avatar_content_description - StringEnum.HottestPosts -> R.string.hottest_posts - StringEnum.Loading -> R.string.loading - StringEnum.NoSavedPost -> R.string.no_saved_posts - StringEnum.OpenComments -> R.string.open_comments - StringEnum.RefreshPostsContentDescription -> R.string.refresh_posts_content_description - StringEnum.RemoveFromSavedPosts -> R.string.remove_from_saved_posts - StringEnum.SubmittedBy -> R.string.submitted_by + Strings.AddToSavedPosts -> R.string.add_to_saved_posts + Strings.AppName -> R.string.app_name + Strings.AvatarContentDescription -> R.string.avatar_content_description + Strings.HottestPosts -> R.string.hottest_posts + Strings.Loading -> R.string.loading + Strings.NoSavedPost -> R.string.no_saved_posts + Strings.OpenComments -> R.string.open_comments + Strings.RefreshPostsContentDescription -> R.string.refresh_posts_content_description + Strings.RemoveFromSavedPosts -> R.string.remove_from_saved_posts + Strings.SubmittedBy -> R.string.submitted_by } } @Composable -actual fun stringValue(enum: StringEnum): String { +actual fun stringValue(enum: Strings): String { return stringResource(stringEnumMapper(enum)) } @@ -29,16 +29,16 @@ actual fun stringValue(enum: StringEnum): String { * */ @Composable -actual fun stringValue(enum: StringEnum, arg1: Any): String { +actual fun stringValue(enum: Strings, arg1: Any): String { return stringResource(stringEnumMapper(enum), arg1) } @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) } @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) } diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt b/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt index 4aad62bc..5bfa0d0f 100644 --- a/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt +++ b/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt @@ -3,17 +3,17 @@ package dev.msfjarvis.lobsters.utils import androidx.compose.runtime.Composable @Composable -expect fun stringValue(enum: StringEnum): String +expect fun stringValue(enum: Strings): String /** * Workaround for https://youtrack.jetbrains.com/issue/KT-44499 * */ @Composable -expect fun stringValue(enum: StringEnum, arg1: Any): String +expect fun stringValue(enum: Strings, arg1: Any): String @Composable -expect fun stringValue(enum: StringEnum, arg1: Any, arg2: Any): String +expect fun stringValue(enum: Strings, arg1: Any, arg2: Any): String @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 diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringEnum.kt b/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/Strings.kt similarity index 90% rename from common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringEnum.kt rename to common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/Strings.kt index 9a5b5edf..3ff5f00f 100644 --- a/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/StringEnum.kt +++ b/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/utils/Strings.kt @@ -1,6 +1,6 @@ package dev.msfjarvis.lobsters.utils -enum class StringEnum { +enum class Strings { AddToSavedPosts, AppName, AvatarContentDescription, diff --git a/common/src/jvmMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt b/common/src/jvmMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt index 7399dfe3..006eb086 100644 --- a/common/src/jvmMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt +++ b/common/src/jvmMain/kotlin/dev/msfjarvis/lobsters/utils/StringValue.kt @@ -2,23 +2,23 @@ package dev.msfjarvis.lobsters.utils import androidx.compose.runtime.Composable -private fun stringEnumMapper(stringEnum: StringEnum): String { +private fun stringEnumMapper(stringEnum: Strings): String { return when (stringEnum) { - StringEnum.AddToSavedPosts -> "Add to saved posts" - StringEnum.AppName -> "Claw" - StringEnum.AvatarContentDescription -> "%1s's avatar" - StringEnum.HottestPosts -> "Hottest" - StringEnum.Loading -> "Loading posts…" - StringEnum.NoSavedPost -> "You don't have any saved posts" - StringEnum.OpenComments -> "Open comments" - StringEnum.RefreshPostsContentDescription -> "Refresh posts" - StringEnum.RemoveFromSavedPosts -> "Remove from saved posts" - StringEnum.SubmittedBy -> "submitted by %1s" + Strings.AddToSavedPosts -> "Add to saved posts" + Strings.AppName -> "Claw" + Strings.AvatarContentDescription -> "%1s's avatar" + Strings.HottestPosts -> "Hottest" + Strings.Loading -> "Loading posts…" + Strings.NoSavedPost -> "You don't have any saved posts" + Strings.OpenComments -> "Open comments" + Strings.RefreshPostsContentDescription -> "Refresh posts" + Strings.RemoveFromSavedPosts -> "Remove from saved posts" + Strings.SubmittedBy -> "submitted by %1s" } } @Composable -actual fun stringValue(enum: StringEnum): String { +actual fun stringValue(enum: Strings): String { return stringEnumMapper(enum) } @@ -27,16 +27,16 @@ actual fun stringValue(enum: StringEnum): String { * */ @Composable -actual fun stringValue(enum: StringEnum, arg1: Any): String { +actual fun stringValue(enum: Strings, arg1: Any): String { return stringEnumMapper(enum).format(arg1) } @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) } @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) }