From aaa2445bef0902177621fd30439eda9f1d18628f Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Sun, 29 Oct 2017 11:07:52 +0100
Subject: [PATCH] Merge extended notifications menu into main menu

---
 .../activity/MainActivity.java                | 10 ++--
 app/src/main/res/menu/main__menu_top.xml      | 44 +++++++++++++++
 ...main__menu_top__notifications_dropdown.xml | 56 -------------------
 3 files changed, 50 insertions(+), 60 deletions(-)
 delete mode 100644 app/src/main/res/menu/main__menu_top__notifications_dropdown.xml

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 07c90135..9dbc2fe1 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -679,6 +679,8 @@ public class MainActivity extends ThemedActivity
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         AppLog.v(this, "onCreateOptionsMenu()");
+        boolean cache;
+
         //Clear the menus
         menu.clear();
         toolbarBottom.getMenu().clear();
@@ -691,10 +693,10 @@ public class MainActivity extends ThemedActivity
                 ///Hide bottom _toolbar
                 toolbarBottom.setVisibility(View.GONE);
             } else {
-                getMenuInflater().inflate(_appSettings.isExtendedNotificationsActivated() ?
-                        R.menu.main__menu_top__notifications_dropdown : R.menu.main__menu_top, menu);
-                getMenuInflater().inflate(R.menu.main__menu_bottom, toolbarBottom.getMenu());
-                top.onCreateBottomOptionsMenu(toolbarBottom.getMenu(), getMenuInflater());
+                cache = _appSettings.isExtendedNotificationsActivated();
+                getMenuInflater().inflate(R.menu.main__menu_top, menu);
+                menu.findItem(R.id.action_notifications).setVisible(!cache);
+                menu.findItem(R.id.action_notifications_extended).setVisible(cache);
             }
         }
         return true;
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index 236525b6..5f9d92fa 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -10,6 +10,50 @@
         android:orderInCategory="100"
         android:title="@string/notifications"
         app:showAsAction="always" />
+
+    <item
+        android:id="@+id/action_notifications_extended"
+        android:icon="@drawable/ic_notifications_white_48px__layer"
+        android:orderInCategory="100"
+        android:title="@string/notifications"
+        app:showAsAction="always">
+        <menu>
+            <item
+                android:id="@+id/action_notifications_all"
+                android:icon="@drawable/ic_dashboard_black_48px"
+                android:title="@string/notifications__all" />
+
+            <item
+                android:id="@+id/action_notifications_also_commented"
+                android:icon="@drawable/ic_question_answer_black_48px"
+                android:title="@string/notifications__also_commented" />
+
+            <item
+                android:id="@+id/action_notifications_comment_on_post"
+                android:icon="@drawable/ic_comment_black_48px"
+                android:title="@string/notifications__comment_on_post" />
+
+            <item
+                android:id="@+id/action_notifications_liked"
+                android:icon="@drawable/ic_thumb_up_black_48px"
+                android:title="@string/notifications__liked" />
+
+            <item
+                android:id="@+id/action_notifications_mentioned"
+                android:icon="@drawable/ic_person_pin_black_48px"
+                android:title="@string/notifications__mentioned" />
+
+            <item
+                android:id="@+id/action_notifications_reshared"
+                android:icon="@drawable/ic_repeat_black_48px"
+                android:title="@string/notifications__reshared" />
+            <item
+                android:id="@+id/action_notifications_started_sharing"
+                android:icon="@drawable/ic_person_add_black_48px"
+                android:title="@string/notifications__started_sharing" />
+        </menu>
+    </item>
+
     <item
         android:id="@+id/action_conversations"
         android:icon="@drawable/ic_mail_white_48px__layer"
diff --git a/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml b/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
deleted file mode 100644
index 19b61939..00000000
--- a/app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<menu 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"
-    tools:context="com.github.dfa.diaspora_android22.activity.MainActivity"
-    tools:ignore="AlwaysShowAction">
-
-    <item
-        android:id="@+id/action_notifications"
-        android:icon="@drawable/ic_notifications_white_48px__layer"
-        android:orderInCategory="100"
-        android:title="@string/notifications"
-        app:showAsAction="always">
-        <menu>
-            <item
-                android:id="@+id/action_notifications_all"
-                android:icon="@drawable/ic_dashboard_black_48px"
-                android:title="@string/notifications__all" />
-
-            <item
-                android:id="@+id/action_notifications_also_commented"
-                android:icon="@drawable/ic_question_answer_black_48px"
-                android:title="@string/notifications__also_commented" />
-
-            <item
-                android:id="@+id/action_notifications_comment_on_post"
-                android:icon="@drawable/ic_comment_black_48px"
-                android:title="@string/notifications__comment_on_post" />
-
-            <item
-                android:id="@+id/action_notifications_liked"
-                android:icon="@drawable/ic_thumb_up_black_48px"
-                android:title="@string/notifications__liked" />
-
-            <item
-                android:id="@+id/action_notifications_mentioned"
-                android:icon="@drawable/ic_person_pin_black_48px"
-                android:title="@string/notifications__mentioned" />
-
-            <item
-                android:id="@+id/action_notifications_reshared"
-                android:icon="@drawable/ic_repeat_black_48px"
-                android:title="@string/notifications__reshared" />
-            <item
-                android:id="@+id/action_notifications_started_sharing"
-                android:icon="@drawable/ic_person_add_black_48px"
-                android:title="@string/notifications__started_sharing" />
-        </menu>
-    </item>
-    <item
-        android:id="@+id/action_conversations"
-        android:icon="@drawable/ic_mail_white_48px__layer"
-        android:orderInCategory="200"
-        android:title="@string/conversations"
-        app:showAsAction="always" />
-
-</menu>