From 6ee80d2a2becdc24fc61676343fc64293b7922f9 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sun, 22 Mar 2020 19:09:48 -0400
Subject: [PATCH] Cleanup secondary drawer

---
 .../controller/SecondaryDrawerController.kt     | 11 -----------
 .../browse/BrowseCatalogueController.kt         |  2 +-
 .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 17 -----------------
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SecondaryDrawerController.kt

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SecondaryDrawerController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SecondaryDrawerController.kt
deleted file mode 100644
index 93db2ef342..0000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SecondaryDrawerController.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.controller
-
-import android.view.ViewGroup
-import androidx.drawerlayout.widget.DrawerLayout
-
-interface SecondaryDrawerController {
-
-    fun createSecondaryDrawer(drawer: androidx.drawerlayout.widget.DrawerLayout): ViewGroup?
-
-    fun cleanupSecondaryDrawer(drawer: DrawerLayout)
-}
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 4934ffee4f..2dfeabfdfc 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
@@ -43,13 +43,13 @@ import eu.kanade.tachiyomi.util.view.updateLayoutParams
 import eu.kanade.tachiyomi.util.view.visible
 import eu.kanade.tachiyomi.util.view.visibleIf
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
+import java.util.concurrent.TimeUnit
 import kotlinx.android.synthetic.main.catalogue_controller.*
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
-import java.util.concurrent.TimeUnit
 
 /**
  * Controller to manage the catalogues available in the app.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index d94b501eeb..ead4c4bbc4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -82,8 +82,6 @@ open class MainActivity : BaseActivity(), DownloadServiceListener {
     private var currentGestureDelegate: SwipeGestureInterface? = null
     private lateinit var gestureDetector: GestureDetectorCompat
 
-    private var secondaryDrawer: ViewGroup? = null
-
     private var snackBar: Snackbar? = null
     private var extraViewForUndo: View? = null
     private var canDismissSnackBar = false
@@ -547,21 +545,6 @@ open class MainActivity : BaseActivity(), DownloadServiceListener {
 
         currentGestureDelegate = to as? SwipeGestureInterface
 
-        /*if (from is SecondaryDrawerController) {
-            if (secondaryDrawer != null) {
-                from.cleanupSecondaryDrawer(drawer)
-                drawer.removeView(secondaryDrawer)
-                secondaryDrawer = null
-            }
-        }
-        if (to is SecondaryDrawerController) {
-            val newDrawer = to.createSecondaryDrawer(drawer)?.also { drawer.addView(it) }
-            secondaryDrawer = if (newDrawer == null && secondaryDrawer != null) {
-                drawer.removeView(secondaryDrawer)
-                null
-            } else newDrawer
-        }*/
-
         if (to !is SpinnerTitleInterface) toolbar.removeSpinner()
 
         if (to !is DialogController) {