From ac6a858b3d35ed8a4e941b42f03b4c87c1f31500 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 9 Mar 2020 21:11:24 -0400
Subject: [PATCH] android: frontend: game_list: Move add directory button to
 top bar.

---
 .../org/citra/citra_android/ui/main/MainActivity.java |  9 ---------
 src/android/app/src/main/res/layout/activity_main.xml | 11 -----------
 src/android/app/src/main/res/menu/menu_game_grid.xml  |  7 ++++++-
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
index fbe5020f3..6178a7d12 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
@@ -33,7 +33,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
     private Toolbar mToolbar;
     private int mFrameLayoutId;
     private PlatformGamesFragment mPlatformGamesFragment;
-    private FloatingActionButton mFab;
 
     private MainPresenter mPresenter = new MainPresenter(this);
 
@@ -47,13 +46,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
         setSupportActionBar(mToolbar);
 
         mFrameLayoutId = R.id.games_platform_frame;
-        mFab.setOnClickListener(view -> {
-            if (PermissionsHandler.hasWriteAccess(this)) {
-                mPresenter.onFabClick();
-            } else {
-                PermissionsHandler.checkWritePermission(this);
-            }
-        });
         mPresenter.onCreate();
 
         if (savedInstanceState == null) {
@@ -86,7 +78,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
     // TODO: Replace with a ButterKnife injection.
     private void findViews() {
         mToolbar = findViewById(R.id.toolbar_main);
-        mFab = findViewById(R.id.button_add_directory);
     }
 
     @Override
diff --git a/src/android/app/src/main/res/layout/activity_main.xml b/src/android/app/src/main/res/layout/activity_main.xml
index 5e08b9c35..647f75802 100644
--- a/src/android/app/src/main/res/layout/activity_main.xml
+++ b/src/android/app/src/main/res/layout/activity_main.xml
@@ -25,15 +25,4 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/button_add_directory"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_add"
-        app:borderWidth="0dp"
-        app:layout_anchor="@+id/games_platform_frame"
-        app:layout_anchorGravity="bottom|right|end"
-        app:rippleColor="?android:colorPrimary" />
-
 </android.support.design.widget.CoordinatorLayout>
diff --git a/src/android/app/src/main/res/menu/menu_game_grid.xml b/src/android/app/src/main/res/menu/menu_game_grid.xml
index 875091f42..0983b322b 100644
--- a/src/android/app/src/main/res/menu/menu_game_grid.xml
+++ b/src/android/app/src/main/res/menu/menu_game_grid.xml
@@ -2,10 +2,15 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/button_add_directory"
+        android:title="@string/add_directory_title"
+        android:icon="@drawable/ic_add"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/menu_settings_core"
         android:title="@string/grid_menu_core_settings"
         android:icon="@drawable/ic_settings_core"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always"/>
 
 </menu>
\ No newline at end of file