From 6c47fa3c897ea9882eef5a91873051c303d8b6c6 Mon Sep 17 00:00:00 2001
From: veyndan <veyndan@gmail.com>
Date: Mon, 3 Jul 2017 07:10:22 +0100
Subject: [PATCH] Fix crashes where R.id.navigation_view wasn't found

---
 .../res/layout/activity_multiple_uploads.xml  | 20 ++++++++-----------
 app/src/main/res/layout/activity_share.xml    | 17 ++++++----------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/layout/activity_multiple_uploads.xml b/app/src/main/res/layout/activity_multiple_uploads.xml
index a83ce3429..8095a5dce 100644
--- a/app/src/main/res/layout/activity_multiple_uploads.xml
+++ b/app/src/main/res/layout/activity_multiple_uploads.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -22,17 +23,12 @@
             android:orientation="vertical"></FrameLayout>
     </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/drawer_pane"
-        android:layout_width="320dp"
-    android:layout_height="match_parent"
+    <android.support.design.widget.NavigationView
+        android:id="@+id/navigation_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@android:color/white">
+        app:headerLayout="@layout/drawer_header"
+        app:menu="@menu/drawer" />
 
-        <FrameLayout
-            android:id="@+id/drawer_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </RelativeLayout>
-
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 2e53e2c76..a75012077 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -36,17 +36,12 @@
         </FrameLayout>
     </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/drawer_pane"
-        android:layout_width="320dp"
+    <android.support.design.widget.NavigationView
+        android:id="@+id/navigation_view"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@android:color/white">
+        app:headerLayout="@layout/drawer_header"
+        app:menu="@menu/drawer" />
 
-        <FrameLayout
-            android:id="@+id/drawer_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </RelativeLayout>
-
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>