From 30590084763160a766fadf35f2b2f67394f65dbb Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:54:01 -0400
Subject: [PATCH] Cleanup

---
 .../kanade/tachiyomi/data/download/DownloadCache.kt  |  1 +
 .../tachiyomi/ui/browse/extension/ExtensionHolder.kt |  1 +
 .../ui/browse/source/index/IndexController.kt        |  8 +++++---
 .../eu/kanade/tachiyomi/ui/library/LibrarySort.kt    |  1 +
 .../ui/manga/info/MangaInfoButtonsAdapter.kt         |  1 -
 .../ui/setting/search/SettingsSearchHelper.kt        |  1 +
 .../metadata/adapters/EHentaiDescriptionAdapter.kt   | 12 ++++++------
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
index f8752fa06..8d35f4474 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
@@ -212,6 +212,7 @@ class DownloadCache(
             }
         }
     }
+
     // SY <--
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
index 52ca2f7dd..1a3099fbf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
@@ -72,6 +72,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
             }
         } else this
     }
+
     // SY <--
 
     @Suppress("ResourceType")
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexController.kt
index 801b94a08..d87544708 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexController.kt
@@ -196,16 +196,18 @@ open class IndexController :
             onFilterClicked = {
                 val allDefault = presenter.sourceFilters == presenter.source.getFilterList()
                 filterSheet?.dismiss()
-                if (!allDefault) {
-                    val json = Json.encodeToString(
+                val json = if (allDefault) {
+                    null
+                } else {
+                    Json.encodeToString(
                         JsonSavedSearch(
                             "",
                             "",
                             filterSerializer.serialize(presenter.sourceFilters)
                         )
                     )
-                    onBrowseClick(presenter.query.nullIfBlank(), json)
                 }
+                onBrowseClick(presenter.query.nullIfBlank(), json)
             },
             onResetClicked = {},
             onSaveClicked = {},
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
index e7fcdba2d..98792740f 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
@@ -15,6 +15,7 @@ object LibrarySort {
     // SY -->
     const val DRAG_AND_DROP = 7
     const val TAG_LIST = 9
+
     // SY <--
 
     @Deprecated("Removed in favor of searching by source")
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt
index 2dd9e4820..1ab284fa5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt
@@ -50,7 +50,6 @@ class MangaInfoButtonsAdapter(
                     .onEach {
                         controller.mergeWithAnother()
                     }
-
                     .launchIn(controller.viewScope)
             }
             // EXH <--
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
index 09b5fc924..78d523afc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
@@ -56,6 +56,7 @@ object SettingsSearchHelper {
         }
         controllers
     }
+
     // SY <--
 
     /**
diff --git a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt
index f8357fd33..9e302553f 100644
--- a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt
+++ b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt
@@ -40,12 +40,12 @@ class EHentaiDescriptionAdapter(
 
             binding.genre.text =
                 meta.genre?.let { MetadataUtil.getGenreAndColour(itemView.context, it) }
-                ?.let {
-                    binding.genre.setBackgroundColor(it.first)
-                    it.second
-                }
-                ?: meta.genre
-                ?: itemView.context.getString(R.string.unknown)
+                    ?.let {
+                        binding.genre.setBackgroundColor(it.first)
+                        it.second
+                    }
+                    ?: meta.genre
+                    ?: itemView.context.getString(R.string.unknown)
 
             binding.visible.text = itemView.context.getString(R.string.is_visible, meta.visible ?: itemView.context.getString(R.string.unknown))