From ce98c82fc540d36e1f1cd09064113d4940adc169 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Sun, 1 Mar 2020 14:24:39 +0530
Subject: [PATCH] Remove bottom menu

---
 .../retromusic/activities/MainActivity.java   |  6 +++++
 .../fragments/base/AbsPlayerFragment.kt       |  4 ++++
 .../main/res/layout/activity_main_content.xml |  3 ++-
 app/src/main/res/menu/menu_player.xml         |  5 +++++
 app/src/main/res/menu/menu_search.xml         | 22 -------------------
 app/src/main/res/values/ids.xml               |  2 ++
 6 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_search.xml

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
index aa2db905..aacdfd1d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
@@ -216,6 +216,9 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             menu.add(0, R.id.action_search, 0, getString(R.string.action_search))
                     .setIcon(R.drawable.ic_mic_white_24dp)
                     .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menu.add(0, R.id.action_settings, 0, getString(R.string.action_settings))
+                    .setIcon(R.drawable.ic_settings_white_24dp)
+                    .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
         if (isFolderPage()) {
             menu.add(0, R.id.action_scan, 0, R.string.scan_media)
@@ -276,6 +279,9 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             case R.id.action_new_playlist:
                 CreatePlaylistDialog.create().show(getSupportFragmentManager(), "CREATE_PLAYLIST");
                 return true;
+            case R.id.action_settings:
+                NavigationUtil.goToSettings(this);
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index 18f08379..a442fb32 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -69,6 +69,10 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(),
                 SongShareDialog.create(song).show(childFragmentManager, "SHARE_SONG")
                 return true
             }
+            R.id.action_go_to_drive_mode -> {
+                NavigationUtil.gotoDriveMode(requireActivity())
+                return true
+            }
             R.id.action_delete_from_device -> {
                 DeleteSongsDialog.create(song).show(childFragmentManager, "DELETE_SONGS")
                 return true
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index 354bebec..b3e78f41 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -47,8 +47,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/toolbar_height"
                         android:background="?attr/colorSurface"
-                        app:navigationIcon="@drawable/ic_menu_white_24dp"
                         app:popupTheme="?attr/toolbarPopupTheme"
+                        app:titleTextColor="?attr/colorControlNormal"
                         app:titleTextAppearance="@style/TextViewHeadline6"
                         tools:ignore="UnusedAttribute">
 
@@ -58,6 +58,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/app_name"
+                            android:textColor="?attr/colorControlNormal"
                             android:textAppearance="@style/TextViewHeadline6" />
                     </androidx.appcompat.widget.Toolbar>
 
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index 4d2f83b0..522fc7c9 100755
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -14,6 +14,11 @@
         android:orderInCategory="2"
         android:title="@string/now_playing_queue"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_go_to_drive_mode"
+        android:icon="@drawable/ic_drive_eta_white_24dp"
+        android:orderInCategory="3"
+        android:title="@string/drive_mode" />
     <item
         android:id="@+id/action_go_to_album"
         android:icon="@drawable/ic_album_white_24dp"
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
deleted file mode 100644
index 29a70443..00000000
--- a/app/src/main/res/menu/menu_search.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_mic_white_24dp"
-        android:title="@string/action_search"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 34ff9c51..989755eb 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <item name="action_new_playlist" type="id" />
+    <item name="action_settings" type="id" />
+    <item name="action_search" type="id" />
     <item name="action_show_lyrics" type="id" />
     <item name="action_genre" type="id" />
     <item name="action_playing_queue" type="id" />