浏览代码

Lock drawer with gravity parameter instead of a view

len 7 年之前
父节点
当前提交
e971d40e06

+ 1 - 4
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt

@@ -187,10 +187,7 @@ open class CatalogueController(bundle: Bundle? = null) :
         }
         navView.setFilters(presenter.filterItems)
 
-        navView.post {
-            if (isAttached && !drawer.isDrawerOpen(navView))
-                drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, navView)
-        }
+        drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.END)
 
         navView.onSearchClicked = {
             val allDefault = presenter.sourceFilters == presenter.source.getFilterList()

+ 2 - 6
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt

@@ -36,8 +36,8 @@ import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.inflate
 import eu.kanade.tachiyomi.util.toast
 import eu.kanade.tachiyomi.widget.DrawerSwipeCloseListener
-import kotlinx.android.synthetic.main.main_activity.*
 import kotlinx.android.synthetic.main.library_controller.view.*
+import kotlinx.android.synthetic.main.main_activity.*
 import rx.Subscription
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
@@ -189,11 +189,7 @@ class LibraryController(
             drawer.addDrawerListener(it)
         }
         navView = view
-
-        navView?.post {
-            if (isAttached && drawer.isDrawerOpen(navView))
-                drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, navView)
-        }
+        drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.END)
 
         navView?.onGroupClicked = { group ->
             when (group) {