From e37d71fba652cbbd40cca2badda81e4930ed7d1a Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 29 Oct 2020 16:53:03 +0530 Subject: [PATCH] Move hardcoded strings to resources Signed-off-by: Harsh Shandilya --- app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt | 3 ++- .../main/java/dev/msfjarvis/lobsters/ui/Destination.kt | 9 ++++++--- .../main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt | 2 -- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt index 97eef75b..b3d08c98 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.Providers import androidx.compose.runtime.getValue import androidx.compose.ui.platform.setContent +import androidx.compose.ui.res.stringResource import androidx.navigation.compose.KEY_ROUTE import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable @@ -67,7 +68,7 @@ fun LobstersApp( } ) }, - label = { Text(screen.label) }, + label = { Text(stringResource(id = screen.labelRes)) }, selected = currentRoute == screen.route, onClick = { // This is the equivalent to popUpTo the start destination diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt index 588a02fd..0c6ebc45 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt @@ -1,12 +1,15 @@ package dev.msfjarvis.lobsters.ui +import androidx.annotation.StringRes +import dev.msfjarvis.lobsters.R + /** * Destinations for navigation within the app. */ sealed class Destination( val route: String, - val label: String, + @StringRes val labelRes: Int, ) { - object Hottest : Destination("hottest", "Hottest") - object Saved : Destination("saved", "Saved") + object Hottest : Destination("hottest", R.string.hottest_posts) + object Saved : Destination("saved", R.string.saved_posts) } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt index b1328f30..06a4fb9d 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt @@ -37,5 +37,3 @@ fun SavedPosts( } } } - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4c203edf..e24e430e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,4 +2,6 @@ lobste.rs Loading posts… You don\'t have any saved posts + Hottest + Saved