From 10a195d60d66722976fa1bb3e4eab8f7f9e4882f Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Thu, 23 Jul 2020 11:13:25 +0200
Subject: [PATCH] #2227 added drawer to nav activity

---
 .../kiwixmobile/main/KiwixNewNavigationActivity.kt |  7 ++++---
 .../main/res/layout/activity_new_navigation.xml    | 14 +++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
index dca9c8a64..e9dd0fb83 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
@@ -26,7 +26,8 @@ import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
-import kotlinx.android.synthetic.main.activity_new_navigation.nav_view
+import kotlinx.android.synthetic.main.activity_new_navigation.bottom_nav_view
+import kotlinx.android.synthetic.main.activity_new_navigation.container
 import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
@@ -53,8 +54,8 @@ class KiwixNewNavigationActivity : CoreMainActivity() {
 
     navController = findNavController(R.id.nav_host_fragment)
     navController.addOnDestinationChangedListener(finishActionModeOnDestinationChange)
-    appBarConfiguration = AppBarConfiguration(navController.graph)
-    nav_view.setupWithNavController(navController)
+    appBarConfiguration = AppBarConfiguration(navController.graph, container)
+    bottom_nav_view.setupWithNavController(navController)
   }
 
   override fun onSupportActionModeStarted(mode: ActionMode) {
diff --git a/app/src/main/res/layout/activity_new_navigation.xml b/app/src/main/res/layout/activity_new_navigation.xml
index 05089530f..2b6f960c7 100644
--- a/app/src/main/res/layout/activity_new_navigation.xml
+++ b/app/src/main/res/layout/activity_new_navigation.xml
@@ -16,7 +16,7 @@
   ~
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/container"
@@ -39,15 +39,23 @@
       tools:ignore="FragmentTagUsage" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
-      android:id="@+id/nav_view"
+      android:id="@+id/bottom_nav_view"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="bottom"
       app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
       app:layout_scrollFlags="scroll|enterAlways"
       app:menu="@menu/menu_bottom_nav" />
+
+    <com.google.android.material.navigation.NavigationView
+      android:id="@+id/drawer_nav_view"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:layout_gravity="start"
+      android:fitsSystemWindows="true" />
+
   </org.kiwix.kiwixmobile.core.utils.NestedCoordinatorLayout>
 
 
-</LinearLayout>
+</androidx.drawerlayout.widget.DrawerLayout>