Skip to content

Commit fd91863

Browse files
committed
Move TopicScreen strings to resources
1 parent 7d45eae commit fd91863

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

  • feature/topic

feature/topic/api/src/main/res/values/strings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@
1616
-->
1717
<resources>
1818
<string name="feature_topic_api_loading">Loading topic</string>
19+
<string name="feature_topic_api_loading_news">Loading news</string>
20+
<string name="feature_topic_api_news_error">Error</string>
21+
<string name="feature_topic_api_following">Following</string>
22+
<string name="feature_topic_api_not_following">Not following</string>
1923
</resources>

feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent
6868
import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
6969
import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider
7070
import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems
71+
import java.util.Locale
7172
import com.google.samples.apps.nowinandroid.core.ui.R as UiR
7273
import com.google.samples.apps.nowinandroid.feature.topic.api.R as TopicR
7374

@@ -246,11 +247,11 @@ private fun LazyListScope.userNewsResourceCards(
246247
}
247248

248249
is NewsUiState.Loading -> item {
249-
NiaLoadingWheel(contentDesc = "Loading news") // TODO
250+
NiaLoadingWheel(contentDesc = stringResource(TopicR.string.feature_topic_api_loading_news))
250251
}
251252

252253
else -> item {
253-
Text("Error") // TODO
254+
Text(stringResource(TopicR.string.feature_topic_api_news_error))
254255
}
255256
}
256257
}
@@ -308,9 +309,9 @@ private fun TopicToolbar(
308309
modifier = Modifier.padding(end = 24.dp),
309310
) {
310311
if (selected) {
311-
Text("FOLLOWING")
312+
Text(stringResource(TopicR.string.feature_topic_api_following).uppercase(Locale.getDefault()))
312313
} else {
313-
Text("NOT FOLLOWING")
314+
Text(stringResource(TopicR.string.feature_topic_api_not_following).uppercase(Locale.getDefault()))
314315
}
315316
}
316317
}

0 commit comments

Comments
 (0)