From 541a52ea4b8ad202c818a972f222a07f0c0762bc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 7 Apr 2021 19:15:01 +0200
Subject: [PATCH] Added nav menu expander

---
 .../java/eu/faircode/email/ActivityView.java    | 17 +++++++++++++++++
 app/src/main/res/layout/include_nav.xml         | 13 ++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index b050f010c4..3a7ad91529 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -104,6 +104,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private RecyclerView rvUnified;
     private ImageButton ibExpanderFolder;
     private RecyclerView rvFolder;
+    private ImageButton ibExpanderMenu;
     private RecyclerView rvMenu;
     private ImageButton ibExpanderExtra;
     private RecyclerView rvMenuExtra;
@@ -344,11 +345,27 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         });
 
         // Menus
+        ibExpanderMenu = drawerContainer.findViewById(R.id.ibExpanderMenu);
+
         rvMenu = drawerContainer.findViewById(R.id.rvMenu);
         rvMenu.setLayoutManager(new LinearLayoutManager(this));
         adapterNavMenu = new AdapterNavMenu(this, this);
         rvMenu.setAdapter(adapterNavMenu);
 
+        boolean nav_menu = prefs.getBoolean("nav_menu", true);
+        ibExpanderMenu.setImageLevel(nav_menu ? 0 /* less */ : 1 /* more */);
+        rvMenu.setVisibility(nav_menu ? View.VISIBLE : View.GONE);
+
+        ibExpanderMenu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean nav_menu = !prefs.getBoolean("nav_menu", true);
+                prefs.edit().putBoolean("nav_menu", nav_menu).apply();
+                ibExpanderMenu.setImageLevel(nav_menu ? 0 /* less */ : 1 /* more */);
+                rvMenu.setVisibility(nav_menu ? View.VISIBLE : View.GONE);
+            }
+        });
+
         // Extra menus
         ibExpanderExtra = drawerContainer.findViewById(R.id.ibExpanderExtra);
 
diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index 9e8fcffc1b..45efd7e525 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -95,6 +95,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvFolder" />
 
+    <ImageButton
+        android:id="@+id/ibExpanderMenu"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/title_legend_expander"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/vSeparatorFolder"
+        app:srcCompat="@drawable/expander" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvMenu"
         android:layout_width="0dp"
@@ -103,7 +114,7 @@
         android:nestedScrollingEnabled="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/vSeparatorFolder" />
+        app:layout_constraintTop_toBottomOf="@id/ibExpanderMenu" />
 
     <View
         android:id="@+id/vSeparatorMenu"