-
Notifications
You must be signed in to change notification settings - Fork 4.4k
fix: render error UI for TopicUiState.Error instead of crashing #2109
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.
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
Noahs212
wants to merge
1
commit into
android:main
Choose a base branch
from
Noahs212:fix/topic-screen-error-state
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
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.
+43
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -129,7 +129,9 @@ internal fun TopicScreen( | |||||||||||||||||
| ) | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| TopicUiState.Error -> TODO() | ||||||||||||||||||
| TopicUiState.Error -> item { | ||||||||||||||||||
| TopicErrorBody() | ||||||||||||||||||
| } | ||||||||||||||||||
| is TopicUiState.Success -> { | ||||||||||||||||||
| item { | ||||||||||||||||||
| TopicToolbar( | ||||||||||||||||||
|
|
@@ -177,7 +179,7 @@ private fun topicItemsSize( | |||||||||||||||||
| topicUiState: TopicUiState, | ||||||||||||||||||
| newsUiState: NewsUiState, | ||||||||||||||||||
| ) = when (topicUiState) { | ||||||||||||||||||
| TopicUiState.Error -> 0 // Nothing | ||||||||||||||||||
| TopicUiState.Error -> 1 // Error message | ||||||||||||||||||
| TopicUiState.Loading -> 1 // Loading bar | ||||||||||||||||||
| is TopicUiState.Success -> when (newsUiState) { | ||||||||||||||||||
| NewsUiState.Error -> 0 // Nothing | ||||||||||||||||||
|
|
@@ -203,6 +205,22 @@ private fun LazyListScope.topicBody( | |||||||||||||||||
| userNewsResourceCards(news, onBookmarkChanged, onNewsResourceViewed, onTopicClick) | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| @Composable | ||||||||||||||||||
| private fun TopicErrorBody() { | ||||||||||||||||||
| Column( | ||||||||||||||||||
| horizontalAlignment = Alignment.CenterHorizontally, | ||||||||||||||||||
| modifier = Modifier | ||||||||||||||||||
|
Comment on lines
+209
to
+212
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is a best practice in Compose to have a
Suggested change
|
||||||||||||||||||
| .fillMaxWidth() | ||||||||||||||||||
| .padding(horizontal = 48.dp), | ||||||||||||||||||
| ) { | ||||||||||||||||||
| Text( | ||||||||||||||||||
| text = stringResource(id = TopicR.string.feature_topic_api_error_header), | ||||||||||||||||||
| style = MaterialTheme.typography.bodyLarge, | ||||||||||||||||||
| modifier = Modifier.padding(vertical = 24.dp), | ||||||||||||||||||
| ) | ||||||||||||||||||
| } | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| @Composable | ||||||||||||||||||
| private fun TopicHeader(name: String, description: String, imageUrl: String) { | ||||||||||||||||||
| Column( | ||||||||||||||||||
|
|
||||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While updating this to
1is correct for the new error state, the existing logic forTopicUiState.Success(lines 185-186) appears to be incorrect as it doesn't account for the Toolbar and Header items which are always rendered in that state. This discrepancy will cause the scrollbar to be incorrectly sized or hidden when news is loading or has an error. Consider updating the entire function to ensure the scrollbar accurately reflects the number of items in theLazyColumn.