From 47b56644dee9a097cfce384ca030ddb75ddadfe5 Mon Sep 17 00:00:00 2001
From: Andreas <andreas.everos@gmail.com>
Date: Fri, 19 Aug 2022 13:22:46 +0200
Subject: [PATCH] Fix emoji going crazy and fix tabs being visible when library
 is empty (#7811)

fixes #7792
fixes #7791
---
 .../java/eu/kanade/presentation/components/EmptyScreen.kt   | 5 ++---
 .../java/eu/kanade/presentation/library/LibraryScreen.kt    | 2 +-
 .../presentation/library/components/LibraryContent.kt       | 6 +++---
 .../java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 2 ++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt
index 33ad0db43c..c653bd90c8 100644
--- a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt
@@ -38,12 +38,11 @@ fun EmptyScreen(
                         ViewGroup.LayoutParams.WRAP_CONTENT,
                         ViewGroup.LayoutParams.WRAP_CONTENT,
                     )
+                    show(message, actions)
                 }
             },
             modifier = Modifier
                 .align(Alignment.Center),
-        ) { view ->
-            view.show(message, actions)
-        }
+        )
     }
 }
diff --git a/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
index cd2d2c5bfe..21ebf71774 100644
--- a/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
@@ -77,7 +77,7 @@ fun LibraryScreen(
                     state = presenter,
                     contentPadding = paddingValues,
                     currentPage = { presenter.activeCategory },
-                    isLibraryEmpty = { presenter.loadedManga.isEmpty() },
+                    isLibraryEmpty = presenter.isLibraryEmpty,
                     showPageTabs = presenter.tabVisibility,
                     showMangaCount = presenter.mangaCountVisibility,
                     onChangeCurrentPage = { presenter.activeCategory = it },
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
index 01ffa141c9..8346843928 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
@@ -34,7 +34,7 @@ fun LibraryContent(
     state: LibraryState,
     contentPadding: PaddingValues,
     currentPage: () -> Int,
-    isLibraryEmpty: () -> Boolean,
+    isLibraryEmpty: Boolean,
     isDownloadOnly: Boolean,
     isIncognitoMode: Boolean,
     showPageTabs: Boolean,
@@ -59,7 +59,7 @@ fun LibraryContent(
         val scope = rememberCoroutineScope()
         var isRefreshing by remember(pagerState.currentPage) { mutableStateOf(false) }
 
-        if (showPageTabs && categories.size > 1) {
+        if (isLibraryEmpty.not() && showPageTabs && categories.size > 1) {
             LibraryTabs(
                 state = pagerState,
                 categories = categories,
@@ -100,7 +100,7 @@ fun LibraryContent(
                 )
             },
         ) {
-            if (state.searchQuery.isNullOrEmpty() && isLibraryEmpty()) {
+            if (state.searchQuery.isNullOrEmpty() && isLibraryEmpty) {
                 val handler = LocalUriHandler.current
                 EmptyScreen(
                     R.string.information_empty_library,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index c8fad392c0..d748b9eebd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -98,6 +98,8 @@ class LibraryPresenter(
     var loadedManga by mutableStateOf(emptyMap<Long, List<LibraryItem>>())
         private set
 
+    val isLibraryEmpty by derivedStateOf { loadedManga.isEmpty() }
+
     val tabVisibility by preferences.categoryTabs().asState()
 
     val mangaCountVisibility by preferences.categoryNumberOfItems().asState()