kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-14 01:48:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

#2227 drawer now closes on item click for custom as well

Browse Source
This commit is contained in:
HissPirat 2020-07-30 10:43:14 +02:00
parent ae516514bf
commit 34103a39c6
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
View File

@ -75,7 +75,10 @@ class KiwixMainActivity : CoreMainActivity() {
), navigation_container ), navigation_container
) )
drawer_nav_view.setupWithNavController(navController) drawer_nav_view.setupWithNavController(navController)
drawer_nav_view.setNavigationItemSelectedListener(this) drawer_nav_view.setNavigationItemSelectedListener { item ->
closeNavigationDrawer()
onNavigationItemSelected(item)
}
bottom_nav_view.setupWithNavController(navController) bottom_nav_view.setupWithNavController(navController)
} }

7
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
View File

@ -23,7 +23,6 @@ import android.view.MenuItem
import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.net.toUri import androidx.core.net.toUri
import com.google.android.material.navigation.NavigationView
import org.kiwix.kiwixmobile.core.R import org.kiwix.kiwixmobile.core.R
import org.kiwix.kiwixmobile.core.base.BaseActivity import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions 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" const val KIWIX_SUPPORT_URL = "https://www.kiwix.org/support"
abstract class CoreMainActivity : BaseActivity(), WebViewProvider, abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
NavigationView.OnNavigationItemSelectedListener {
@Inject lateinit var externalLinkOpener: ExternalLinkOpener @Inject lateinit var externalLinkOpener: ExternalLinkOpener
protected lateinit var drawerToggle: ActionBarDrawerToggle protected lateinit var drawerToggle: ActionBarDrawerToggle
@ -90,7 +88,7 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
abstract fun setupDrawerToggle(toolbar: Toolbar) abstract fun setupDrawerToggle(toolbar: Toolbar)
override fun onNavigationItemSelected(item: MenuItem): Boolean { open fun onNavigationItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
R.id.menu_support_kiwix -> openSupportKiwixExternalLink() R.id.menu_support_kiwix -> openSupportKiwixExternalLink()
R.id.menu_settings -> openSettingsActivity() R.id.menu_settings -> openSettingsActivity()
@ -99,7 +97,6 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider,
R.id.menu_bookmarks_list -> openBookmarksActivity() R.id.menu_bookmarks_list -> openBookmarksActivity()
else -> return false else -> return false
} }
closeNavigationDrawer()
return true return true
} }

5
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
View File

@ -61,7 +61,10 @@ class CustomMainActivity : CoreMainActivity() {
) )
custom_drawer_container.addDrawerListener(drawerToggle) custom_drawer_container.addDrawerListener(drawerToggle)
drawerToggle.syncState() 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) drawer_nav_view.menu.findItem(R.id.menu_host_books)
.isVisible = false .isVisible = false
} }