fix: drop "No article selected" flash on back from article
ClearArticle nulls state before exit transition ends, so the outgoing screen briefly rendered the null-branch fallback in the title bar. Render empty title/content for null state; remove article_no_selected.
This commit is contained in:
1 parent
2dadfa11e9
commit
bddcb99177
3 files changed
+2
-13
No files matched your search
@@ -196,16 +196,7 @@ fun ArticleContent(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
null -> {
|
null -> {
|
||||||
Column(
|
Box(modifier = modifier.fillMaxSize())
|
||||||
modifier = modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
verticalArrangement = Arrangement.Center
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = stringResource(R.string.article_no_selected),
|
|
||||||
style = MaterialTheme.typography.bodyLarge
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -221,7 +212,7 @@ fun ArticleTitleBar(
|
|||||||
is ArticleState.Loading -> articleState.title
|
is ArticleState.Loading -> articleState.title
|
||||||
is ArticleState.Success -> articleState.title
|
is ArticleState.Success -> articleState.title
|
||||||
is ArticleState.Error -> articleState.title
|
is ArticleState.Error -> articleState.title
|
||||||
null -> stringResource(R.string.article_no_selected)
|
null -> ""
|
||||||
}
|
}
|
||||||
|
|
||||||
val backIcon = painterResource(R.drawable.ic_arrow_back)
|
val backIcon = painterResource(R.drawable.ic_arrow_back)
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
<string name="language_russian">Русский</string>
|
<string name="language_russian">Русский</string>
|
||||||
<string name="language_system">Системный</string>
|
<string name="language_system">Системный</string>
|
||||||
<string name="clear_search">Очистить поиск</string>
|
<string name="clear_search">Очистить поиск</string>
|
||||||
<string name="article_no_selected">Статья не выбрана</string>
|
|
||||||
<string name="article_return_to_search">Вернуться к поиску</string>
|
<string name="article_return_to_search">Вернуться к поиску</string>
|
||||||
<string name="error_checking_dictionaries">Не удалось проверить статус словарей</string>
|
<string name="error_checking_dictionaries">Не удалось проверить статус словарей</string>
|
||||||
<string name="error_loading_article">Ошибка загрузки: %1$s</string>
|
<string name="error_loading_article">Ошибка загрузки: %1$s</string>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
<string name="language_russian">Russian</string>
|
<string name="language_russian">Russian</string>
|
||||||
<string name="language_system">System</string>
|
<string name="language_system">System</string>
|
||||||
<string name="clear_search">Clear search</string>
|
<string name="clear_search">Clear search</string>
|
||||||
<string name="article_no_selected">No article selected</string>
|
|
||||||
<string name="article_return_to_search">Return to search</string>
|
<string name="article_return_to_search">Return to search</string>
|
||||||
<string name="error_checking_dictionaries">Failed to check dictionary status</string>
|
<string name="error_checking_dictionaries">Failed to check dictionary status</string>
|
||||||
<string name="error_loading_article">Loading error: %1$s</string>
|
<string name="error_loading_article">Loading error: %1$s</string>
|
||||||
|
|||||||
Reference in new issue
Block a user