Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show LibraryScreen toolbar early to match other main screens (#8285)

Browse Source 
(cherry picked from commit a834ff3a4428497d458399a1ed04b0424f21be64)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
This commit is contained in:
AntsyLich 2022-10-25 19:40:45 +06:00 committed by Jobobby04
parent 20ea3d5eac
commit e0c83b018b
1 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
View File

@ -1,6 +1,5 @@
package eu.kanade.presentation.library package eu.kanade.presentation.library
import androidx.compose.animation.Crossfade
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.HelpOutline import androidx.compose.material.icons.filled.HelpOutline
@ -45,10 +44,7 @@ fun LibraryScreen(
onOpenReader: (LibraryManga) -> Unit, onOpenReader: (LibraryManga) -> Unit,
// SY <-- // SY <--
) { ) {
Crossfade(targetState = presenter.isLoading) { state -> Scaffold(
when (state) {
true -> LoadingScreen()
false -> Scaffold(
topBar = { scrollBehavior -> topBar = { scrollBehavior ->
val title by presenter.getToolbarTitle() val title by presenter.getToolbarTitle()
val tabVisible = presenter.tabVisibility && presenter.categories.size > 1 val tabVisible = presenter.tabVisibility && presenter.categories.size > 1
@ -84,6 +80,11 @@ fun LibraryScreen(
) )
}, },
) { paddingValues -> ) { paddingValues ->
if (presenter.isLoading) {
LoadingScreen()
return@Scaffold
}
val contentPadding = TachiyomiBottomNavigationView.withBottomNavPadding(paddingValues) val contentPadding = TachiyomiBottomNavigationView.withBottomNavPadding(paddingValues)
if (presenter.searchQuery.isNullOrEmpty() && presenter.isLibraryEmpty) { if (presenter.searchQuery.isNullOrEmpty() && presenter.isLibraryEmpty) {
val handler = LocalUriHandler.current val handler = LocalUriHandler.current
@ -136,5 +137,3 @@ fun LibraryScreen(
) )
} }
} }
}
}