mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 15:50:16 +02:00
Fix error pages overlapping with nav drawer (#887)
## Description As of #842, if an error occurred on some pages that display a generic error message, it would be shown under the nav drawer making it difficult to read. This PR fixes that by passing the `modifier` into the `ErrorMessage` composables ensuring it has proper offset & padding. Also, for consistency, passes it the `LoadingPage`s. ### Related issues Caused by #842 ### Testing Threw an exception during home page loading to observe the issue and fix on the emulator ## Screenshots N/A ## AI or LLM usage None
This commit is contained in:
parent
11fd780b31
commit
3f0dedd71e
11 changed files with 21 additions and 21 deletions
|
|
@ -531,7 +531,7 @@ fun CollectionFolderGrid(
|
||||||
DataLoadingState.Loading,
|
DataLoadingState.Loading,
|
||||||
DataLoadingState.Pending,
|
DataLoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
is DataLoadingState.Error,
|
is DataLoadingState.Error,
|
||||||
|
|
|
||||||
|
|
@ -95,13 +95,13 @@ fun ItemGrid(
|
||||||
val items by viewModel.items.observeAsState(listOf())
|
val items by viewModel.items.observeAsState(listOf())
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -139,13 +139,13 @@ fun RecommendedContent(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -113,13 +113,13 @@ fun DiscoverMovieDetails(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -105,13 +105,13 @@ fun DiscoverSeriesDetails(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -102,13 +102,13 @@ fun EpisodeDetails(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -130,13 +130,13 @@ fun MovieDetails(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -120,13 +120,13 @@ fun SeriesDetails(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -148,13 +148,13 @@ fun SeriesOverview(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -103,13 +103,13 @@ fun HomePage(
|
||||||
|
|
||||||
when (val state = loading) {
|
when (val state = loading) {
|
||||||
is LoadingState.Error -> {
|
is LoadingState.Error -> {
|
||||||
ErrorMessage(state)
|
ErrorMessage(state, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Loading,
|
LoadingState.Loading,
|
||||||
LoadingState.Pending,
|
LoadingState.Pending,
|
||||||
-> {
|
-> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingState.Success -> {
|
LoadingState.Success -> {
|
||||||
|
|
|
||||||
|
|
@ -314,11 +314,11 @@ fun SlideshowPage(
|
||||||
) {
|
) {
|
||||||
when (loadingState) {
|
when (loadingState) {
|
||||||
ImageLoadingState.Error -> {
|
ImageLoadingState.Error -> {
|
||||||
ErrorMessage("Error loading image", null)
|
ErrorMessage("Error loading image", null, modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
ImageLoadingState.Loading -> {
|
ImageLoadingState.Loading -> {
|
||||||
LoadingPage()
|
LoadingPage(modifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
is ImageLoadingState.Success -> {
|
is ImageLoadingState.Success -> {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue