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

Fix emoji going crazy and fix tabs being visible when library is empty (#7811)

Browse Source 
fixes #7792
fixes #7791

(cherry picked from commit 47b56644dee9a097cfce384ca030ddb75ddadfe5)
This commit is contained in:
Andreas 2022-08-19 13:22:46 +02:00 committed by Jobobby04
parent 114ed8836b
commit ec210de6c5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt
View File

@ -38,12 +38,11 @@ fun EmptyScreen(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
) )
show(message, actions)
} }
}, },
modifier = Modifier modifier = Modifier
.align(Alignment.Center), .align(Alignment.Center),
) { view -> )
view.show(message, actions)
}
} }
} }

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

@ -93,7 +93,7 @@ fun LibraryScreen(
state = presenter, state = presenter,
contentPadding = paddingValues, contentPadding = paddingValues,
currentPage = { presenter.activeCategory }, currentPage = { presenter.activeCategory },
isLibraryEmpty = { presenter.loadedManga.isEmpty() }, isLibraryEmpty = presenter.isLibraryEmpty,
showPageTabs = presenter.tabVisibility, showPageTabs = presenter.tabVisibility,
showMangaCount = presenter.mangaCountVisibility, showMangaCount = presenter.mangaCountVisibility,
onChangeCurrentPage = { presenter.activeCategory = it }, onChangeCurrentPage = { presenter.activeCategory = it },

6
app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
View File

@ -37,7 +37,7 @@ fun LibraryContent(
state: LibraryState, state: LibraryState,
contentPadding: PaddingValues, contentPadding: PaddingValues,
currentPage: () -> Int, currentPage: () -> Int,
isLibraryEmpty: () -> Boolean, isLibraryEmpty: Boolean,
isDownloadOnly: Boolean, isDownloadOnly: Boolean,
isIncognitoMode: Boolean, isIncognitoMode: Boolean,
showPageTabs: Boolean, showPageTabs: Boolean,
@ -66,7 +66,7 @@ fun LibraryContent(
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
var isRefreshing by remember(pagerState.currentPage) { mutableStateOf(false) } var isRefreshing by remember(pagerState.currentPage) { mutableStateOf(false) }
if (showPageTabs && categories.size > 1) { if (isLibraryEmpty.not() && showPageTabs && categories.size > 1) {
LibraryTabs( LibraryTabs(
state = pagerState, state = pagerState,
categories = categories, categories = categories,
@ -115,7 +115,7 @@ fun LibraryContent(
) )
}, },
) { ) {
if (state.searchQuery.isNullOrEmpty() && isLibraryEmpty()) { if (state.searchQuery.isNullOrEmpty() && isLibraryEmpty) {
val handler = LocalUriHandler.current val handler = LocalUriHandler.current
EmptyScreen( EmptyScreen(
R.string.information_empty_library, R.string.information_empty_library,

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -144,6 +144,8 @@ class LibraryPresenter(
var loadedManga by mutableStateOf(emptyMap<Long, List<LibraryItem>>()) var loadedManga by mutableStateOf(emptyMap<Long, List<LibraryItem>>())
private set private set
val isLibraryEmpty by derivedStateOf { loadedManga.isEmpty() }
val tabVisibility by preferences.categoryTabs().asState() val tabVisibility by preferences.categoryTabs().asState()
val mangaCountVisibility by preferences.categoryNumberOfItems().asState() val mangaCountVisibility by preferences.categoryNumberOfItems().asState()