From c0db682476aad58c00d4f2f660b4a6ff2a477431 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 6 Aug 2022 16:23:13 -0400
Subject: [PATCH] Minor fixes

- Fix categories modal showing when adding from source with no categories
- Use old categories icon in library bottom action menu

(cherry picked from commit 688cc64dffa8cdf1241d3b4e2467b5e8c8529800)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
---
 .../kanade/presentation/components/MangaBottomActionMenu.kt  | 3 ++-
 app/src/main/java/eu/kanade/tachiyomi/App.kt                 | 2 +-
 app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt             | 1 +
 .../ui/browse/source/browse/BrowseSourcePresenter.kt         | 5 ++++-
 app/src/main/java/exh/favorites/FavoritesSyncHelper.kt       | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
index c9c6f5115..c56eedb1b 100644
--- a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
@@ -23,6 +23,7 @@ import androidx.compose.material.icons.filled.DoneAll
 import androidx.compose.material.icons.filled.RemoveDone
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.Label
 import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material.icons.outlined.SwapCalls
 import androidx.compose.material.ripple.rememberRipple
@@ -255,7 +256,7 @@ fun LibraryBottomActionMenu(
                 if (onChangeCategoryClicked != null) {
                     Button(
                         title = stringResource(R.string.action_move_category),
-                        icon = Icons.Default.BookmarkAdd,
+                        icon = Icons.Outlined.Label,
                         toConfirm = confirm[0],
                         onLongClick = { onLongClickItem(0) },
                         onClick = onChangeCategoryClicked,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index c9d166ff9..3a547fd23 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -246,7 +246,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
         return super.getPackageName()
     }
 
-    protected open fun setupNotificationChannels() {
+    private fun setupNotificationChannels() {
         try {
             Notifications.createChannels(this)
         } catch (e: Exception) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt b/app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt
index 7ec80cdb6..96e681f41 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt
@@ -5,6 +5,7 @@ package eu.kanade.tachiyomi
  *
  * @since extension-lib 1.3
  */
+@Suppress("UNUSED")
 object AppInfo {
     fun getVersionCode() = BuildConfig.VERSION_CODE
     fun getVersionName() = BuildConfig.VERSION_NAME
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
index b052c0f0a..58f557ec8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
@@ -469,7 +469,10 @@ open class BrowseSourcePresenter(
      * @return List of categories, not including the default category
      */
     suspend fun getCategories(): List<DomainCategory> {
-        return getCategories.subscribe().firstOrNull() ?: emptyList()
+        return getCategories.subscribe()
+            .firstOrNull()
+            ?.filterNot { it.id == DomainCategory.UNCATEGORIZED_ID }
+            ?: emptyList()
     }
 
     suspend fun getDuplicateLibraryManga(manga: DomainManga): DomainManga? {
diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
index 2f57be2f3..07e4ecdd6 100644
--- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
+++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
@@ -201,6 +201,7 @@ class FavoritesSyncHelper(val context: Context) {
 
     private suspend fun applyRemoteCategories(categories: List<String>) {
         val localCategories = getCategories.await()
+            .filterNot(Category::isSystemCategory)
 
         categories.forEachIndexed { index, remote ->
             val local = localCategories.getOrElse(index) {
@@ -346,6 +347,7 @@ class FavoritesSyncHelper(val context: Context) {
 
         val insertedMangaCategories = mutableListOf<Pair<Long, Manga>>()
         val categories = getCategories.await()
+            .filterNot(Category::isSystemCategory)
 
         // Apply additions
         throttleManager.resetThrottle()