From 02f8d2f45fc8490a54323d04a78a97723262b16d Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sun, 29 Sep 2019 18:33:58 +0200
Subject: [PATCH] Add drafts, settings, and more menu entries

---
 .../android/activities/BaseMainActivity.java  | 10 +++----
 .../app/fedilab/android/helper/Helper.java    |  4 +--
 .../main/res/menu/activity_main_drawer.xml    | 30 ++++---------------
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index be348db92..5897280de 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -1879,7 +1879,7 @@ public abstract class BaseMainActivity extends BaseActivity
         toolbarTitle.setVisibility(View.VISIBLE);
         delete_instance.setVisibility(View.GONE);
         appBar.setExpanded(true);
-        if (id != R.id.nav_drafts && id != R.id.nav_bookmarks && id != R.id.nav_peertube) {
+        if (id != R.id.nav_drafts && id != R.id.nav_pixelfed_drafts && id != R.id.nav_bookmarks && id != R.id.nav_peertube) {
             delete_all.hide();
         } else {
             delete_all.show();
@@ -1903,7 +1903,7 @@ public abstract class BaseMainActivity extends BaseActivity
             fragmentManager.beginTransaction()
                     .replace(R.id.main_app_container, displayPeertubeNotificationsFragment, fragmentTag).commit();
 
-        } else if (id == R.id.nav_favorites || id == R.id.nav_pixelfed_favorites) {
+        } else if (id == R.id.nav_favorites) {
             toot.hide();
             statusFragment = new DisplayStatusFragment();
             bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES);
@@ -1964,7 +1964,7 @@ public abstract class BaseMainActivity extends BaseActivity
             fragmentTag = "HOW_TO_VIDEOS";
             fragmentManager.beginTransaction()
                     .replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit();
-        } else if (id == R.id.nav_muted || id == R.id.nav_pixelfed_muted) {
+        } else if (id == R.id.nav_muted ) {
             toot.hide();
             accountsFragment = new DisplayAccountsFragment();
             bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.MUTED);
@@ -1972,13 +1972,13 @@ public abstract class BaseMainActivity extends BaseActivity
             fragmentTag = "MUTED";
             fragmentManager.beginTransaction()
                     .replace(R.id.main_app_container, accountsFragment, fragmentTag).commit();
-        } else if (id == R.id.nav_scheduled) {
+        } else if (id == R.id.nav_scheduled || id == R.id.nav_pixelfed_scheduled) {
             tootShow();
             TabLayoutScheduleFragment tabLayoutScheduleFragment = new TabLayoutScheduleFragment();
             fragmentTag = "SCHEDULED";
             fragmentManager.beginTransaction()
                     .replace(R.id.main_app_container, tabLayoutScheduleFragment, fragmentTag).commit();
-        } else if (id == R.id.nav_drafts) {
+        } else if (id == R.id.nav_drafts || id == R.id.nav_pixelfed_drafts) {
             DisplayDraftsFragment displayDraftsFragment = new DisplayDraftsFragment();
             fragmentTag = "DRAFTS";
             fragmentManager.beginTransaction()
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index e6495ad9f..a05bba397 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1600,9 +1600,9 @@ public class Helper {
             MenuItem itemCom = menu.findItem(R.id.nav_main_com);
             if (itemCom != null)
                 itemCom.setVisible(false);
-            MenuItem itemOpt = menu.findItem(R.id.nav_main_opt);
+            /*MenuItem itemOpt = menu.findItem(R.id.nav_main_opt);
             if (itemOpt != null)
-                itemOpt.setVisible(false);
+                itemOpt.setVisible(false);*/
             MenuItem itemPCom = menu.findItem(R.id.nav_peertube_comm);
             if (itemPCom != null)
                 itemPCom.setVisible(false);
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 3083f4216..1f337f084 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -114,36 +114,18 @@
             android:id="@+id/nav_pixelfed_comm">
             <menu>
                 <group android:checkableBehavior="single">
-                    <!--
                     <item
-                        android:id="@+id/nav_peertube_fav"
-                        android:icon="@drawable/ic_favorite_peertube_full"
-                        android:title="@string/peertube_favorites" />
-                        -->
-                    <!--
+                        android:id="@+id/nav_pixelfed_scheduled"
+                        android:icon="@drawable/ic_schedule"
+                        android:title="@string/scheduled_toots" />
                     <item
-                        android:id="@+id/nav_my_photo"
-                        android:icon="@drawable/ic_pixelfed_media"
-                        android:title="@string/my_pictures" />
--->
-                    <item
-                        android:id="@+id/nav_pixelfed_favorites"
-                        android:icon="@drawable/ic_pixelfed_favorite"
-                        android:title="@string/favorites_menu" />
+                        android:id="@+id/nav_pixelfed_drafts"
+                        android:icon="@drawable/ic_save_white"
+                        android:title="@string/drafts" />
                     <item
                         android:id="@+id/nav_pixelfed_blocked"
                         android:icon="@drawable/ic_block"
                         android:title="@string/blocked_menu" />
-                    <item
-                        android:id="@+id/nav_pixelfed_muted"
-                        android:icon="@drawable/ic_volume_mute"
-                        android:title="@string/muted_menu" />
-                    <!--
-                    <item
-                        android:id="@+id/nav_pixelfed_settings"
-                        android:icon="@drawable/ic_settings"
-                        android:title="@string/settings" />
-                    -->
                 </group>
             </menu>
         </item>