From 34103a39c6fa5f20cfb37fe878357a47d59b7d07 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Thu, 30 Jul 2020 10:43:14 +0200
Subject: [PATCH] #2227 drawer now closes on item click for custom as well

---
 .../java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt   | 5 ++++-
 .../org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt    | 7 ++-----
 .../kiwix/kiwixmobile/custom/main/CustomMainActivity.kt    | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
index cd3cb44e5..237b5a05c 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
@@ -75,7 +75,10 @@ class KiwixMainActivity : CoreMainActivity() {
       ), navigation_container
     )
     drawer_nav_view.setupWithNavController(navController)
-    drawer_nav_view.setNavigationItemSelectedListener(this)
+    drawer_nav_view.setNavigationItemSelectedListener { item ->
+      closeNavigationDrawer()
+      onNavigationItemSelected(item)
+    }
     bottom_nav_view.setupWithNavController(navController)
   }
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
index 7508a8a66..f944b8c5d 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
@@ -23,7 +23,6 @@ import android.view.MenuItem
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.widget.Toolbar
 import androidx.core.net.toUri
-import com.google.android.material.navigation.NavigationView
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.base.BaseActivity
 import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
@@ -40,8 +39,7 @@ import javax.inject.Inject
 
 const val KIWIX_SUPPORT_URL = "https://www.kiwix.org/support"
 
-abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
-  NavigationView.OnNavigationItemSelectedListener {
+abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
 
   @Inject lateinit var externalLinkOpener: ExternalLinkOpener
   protected lateinit var drawerToggle: ActionBarDrawerToggle
@@ -90,7 +88,7 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
 
   abstract fun setupDrawerToggle(toolbar: Toolbar)
 
-  override fun onNavigationItemSelected(item: MenuItem): Boolean {
+  open fun onNavigationItemSelected(item: MenuItem): Boolean {
     when (item.itemId) {
       R.id.menu_support_kiwix -> openSupportKiwixExternalLink()
       R.id.menu_settings -> openSettingsActivity()
@@ -99,7 +97,6 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
       R.id.menu_bookmarks_list -> openBookmarksActivity()
       else -> return false
     }
-    closeNavigationDrawer()
     return true
   }
 
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
index 7609191c3..2d63819df 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
@@ -61,7 +61,10 @@ class CustomMainActivity : CoreMainActivity() {
       )
     custom_drawer_container.addDrawerListener(drawerToggle)
     drawerToggle.syncState()
-    drawer_nav_view.setNavigationItemSelectedListener(this)
+    drawer_nav_view.setNavigationItemSelectedListener { item ->
+      closeNavigationDrawer()
+      onNavigationItemSelected(item)
+    }
     drawer_nav_view.menu.findItem(R.id.menu_host_books)
       .isVisible = false
   }