FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Move TopicScreen strings to resources by ois0886 · Pull Request #2116 · android/nowinandroid · GitHub

/ nowinandroid Public

Move TopicScreen strings to resources #2116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ois0886 wants to merge 1 commit into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+9 −4
Conversation 5 Commits 1 Checks 1 Files changed 2
Open

Move TopicScreen strings to resources #2116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .kt  (1) .xml  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
      • TopicScreen.kt
4 changes: 4 additions & 0 deletions feature/topic/api/src/main/res/values/strings.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
-->
<resources>
<string name="feature_topic_api_loading">Loading topic</string>
<string name="feature_topic_api_loading_news">Loading news</string>
<string name="feature_topic_api_news_error">Error</string>
<string name="feature_topic_api_following">Following</string>
<string name="feature_topic_api_not_following">Not following</string>
</resources>
9 changes: 5 additions & 4 deletions ...pl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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))
}
}
}
Expand Down Expand Up @@ -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()))
}
}
}
Expand Down
Back | FazBrowse Home | New Git URL