diff --git a/feature/topic/api/src/main/res/values/strings.xml b/feature/topic/api/src/main/res/values/strings.xml index 1e3f376cf..6d465638e 100644 --- a/feature/topic/api/src/main/res/values/strings.xml +++ b/feature/topic/api/src/main/res/values/strings.xml @@ -16,4 +16,8 @@ --> Loading topic + Loading news + Error + Following + Not following diff --git a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt index 5c802f225..7c04f7863 100644 --- a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt +++ b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt @@ -68,6 +68,7 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems +import java.util.Locale import com.google.samples.apps.nowinandroid.core.ui.R as UiR import com.google.samples.apps.nowinandroid.feature.topic.api.R as TopicR @@ -246,11 +247,11 @@ private fun LazyListScope.userNewsResourceCards( } is NewsUiState.Loading -> item { - NiaLoadingWheel(contentDesc = "Loading news") // TODO + NiaLoadingWheel(contentDesc = stringResource(TopicR.string.feature_topic_api_loading_news)) } else -> item { - Text("Error") // TODO + Text(stringResource(TopicR.string.feature_topic_api_news_error)) } } } @@ -308,9 +309,9 @@ private fun TopicToolbar( modifier = Modifier.padding(end = 24.dp), ) { if (selected) { - Text("FOLLOWING") + Text(stringResource(TopicR.string.feature_topic_api_following).uppercase(Locale.getDefault())) } else { - Text("NOT FOLLOWING") + Text(stringResource(TopicR.string.feature_topic_api_not_following).uppercase(Locale.getDefault())) } } }