From f24c5e944e4034699c212116722244b71c365ef5 Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Sat, 6 Apr 2019 07:40:27 -0400
Subject: [PATCH] Fix various proguard issues

---
 app/proguard-rules.pro                                          | 1 +
 .../tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt  | 1 +
 .../tachiyomi/ui/catalogue/browse/BrowseCataloguePresenter.kt   | 1 +
 .../tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt    | 1 +
 .../tachiyomi/ui/catalogue/browse => exh}/EXHSavedSearch.kt     | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)
 rename app/src/main/java/{eu/kanade/tachiyomi/ui/catalogue/browse => exh}/EXHSavedSearch.kt (80%)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 4e0044461..e1e3a3686 100755
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -97,6 +97,7 @@
 -dontwarn com.fasterxml.jackson.databind.ext.Java7SupportImpl
 -dontwarn com.fasterxml.jackson.module.kotlin.KotlinNamesAnnotationIntrospector$hasCreatorAnnotation$1
 -dontwarn com.fasterxml.jackson.module.kotlin.KotlinValueInstantiator
+-dontwarn exh.metadata.MetadataUtilKt$joinTagsToGenreString$2
 
 # Realm
 -dontnote rx.internal.util.PlatformDependent
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
index 264f12fe6..3139ec8fd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
@@ -24,6 +24,7 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.*
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
+import exh.EXHSavedSearch
 import kotlinx.android.synthetic.main.catalogue_controller.*
 import kotlinx.android.synthetic.main.main_activity.*
 import rx.Observable
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCataloguePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCataloguePresenter.kt
index f8821bea7..083af0919 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCataloguePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCataloguePresenter.kt
@@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.ui.catalogue.filter.*
+import exh.EXHSavedSearch
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt
index 7ef11f190..088b0bfea 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt
@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.widget.SimpleNavigationView
 import kotlinx.android.synthetic.main.catalogue_drawer_content.view.*
 import android.util.TypedValue
 import android.view.View
+import exh.EXHSavedSearch
 
 class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
     : SimpleNavigationView(context, attrs) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/EXHSavedSearch.kt b/app/src/main/java/exh/EXHSavedSearch.kt
similarity index 80%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/EXHSavedSearch.kt
rename to app/src/main/java/exh/EXHSavedSearch.kt
index 2ba1923e3..1b88a0101 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/EXHSavedSearch.kt
+++ b/app/src/main/java/exh/EXHSavedSearch.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.catalogue.browse
+package exh
 
 import eu.kanade.tachiyomi.source.model.Filter