From fac1fa0b80d1529319ad1e72c6be8ca28a3fa33b Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Tue, 26 Dec 2017 01:14:12 +0300
Subject: [PATCH] Remove show list FAB, since using multple fabs is not
 recommended. Use list button in menu instead

---
 .../nrw/commons/nearby/NearbyActivity.java    | 25 ++++---------------
 .../nrw/commons/nearby/NearbyMapFragment.java |  5 ----
 app/src/main/res/layout/activity_nearby.xml   | 17 -------------
 app/src/main/res/menu/menu_nearby.xml         |  8 ++++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index adb77186f..1d19c9453 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -56,8 +56,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
     LinearLayout bottomSheet;
     @BindView(R.id.bottom_sheet_details)
     LinearLayout bottomSheetDetails;
-    @BindView(R.id.fab_list)
-    FloatingActionButton fabList;
     @BindView(R.id.transparentView)
     View transparentView;
 
@@ -85,8 +83,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         bundle = new Bundle();
 
         initBottomSheetBehaviour();
-        initFabList();
-
         initDrawer();
     }
 
@@ -129,16 +125,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN);
     }
 
-    private void initFabList() {
-        fabList.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN);
-                bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-            }
-        });
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
@@ -155,6 +141,10 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
                 lockNearbyView(false);
                 refreshView(true);
                 return true;
+            case R.id.action_display_list:
+                bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN);
+                bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -412,11 +402,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
     }
 
     public void prepareViewsForSheetPosition(int bottomSheetState) {
-        if (bottomSheetState >= BottomSheetBehavior.STATE_COLLAPSED) {
-            fabList.show();
-        }
-        else if (bottomSheetState == BottomSheetBehavior.STATE_EXPANDED) {
-            fabList.hide();
-        }
+        // TODO
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index dab0cceb3..e207c3f6c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -56,7 +56,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
     private LinearLayout wikipediaButton;
     private LinearLayout wikidataButton;
     private LinearLayout directionsButton;
-    private FloatingActionButton fabList;
     private FloatingActionButton fabPlus;
     private FloatingActionButton fabCamera;
     private FloatingActionButton fabGallery;
@@ -148,7 +147,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
         bottomSheetDetailsBehavior = BottomSheetBehavior.from(bottomSheetDetails);
         bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
 
-        fabList = getActivity().findViewById(R.id.fab_list);
         fabPlus = getActivity().findViewById(R.id.fab_plus);
         fabCamera = getActivity().findViewById(R.id.fab_camera);
         fabGallery = getActivity().findViewById(R.id.fab_galery);
@@ -309,21 +307,18 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
 
         switch (bottomSheetState) {
             case (BottomSheetBehavior.STATE_COLLAPSED):
-                if (!fabList.isShown()) fabList.show();
                 closeFabs(isFabOpen);
                 if (!fabPlus.isShown()) showFAB();
                 this.getView().requestFocus();
                 moreInfo.setVisibility(View.VISIBLE);
                 break;
             case (BottomSheetBehavior.STATE_EXPANDED):
-                if (fabList.isShown()) fabList.hide();
                 this.getView().requestFocus();
                 moreInfo.setVisibility(View.VISIBLE);
                 break;
             case (BottomSheetBehavior.STATE_HIDDEN):
                 transparentView.setClickable(false);
                 transparentView.setAlpha(0);
-                if (!fabList.isShown()) fabList.show();
                 closeFabs(isFabOpen);
                 hideFAB();
                 this.getView().requestFocus();
diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml
index 39e5ead5a..87f23473b 100644
--- a/app/src/main/res/layout/activity_nearby.xml
+++ b/app/src/main/res/layout/activity_nearby.xml
@@ -39,23 +39,6 @@
                     android:layout_height="match_parent"></FrameLayout>
 
             </LinearLayout>
-            <android.support.design.widget.FloatingActionButton
-                android:id="@+id/fab_list"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fabSize="mini"
-                android:layout_alignBottom="@id/toolbar"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="28dp"
-                android:layout_marginBottom="-96dp"
-                android:visibility="invisible"
-                app:elevation="6dp"
-                app:pressedTranslationZ="12dp"
-                android:backgroundTint="@color/button_blue"
-                android:clickable="true"
-                app:srcCompat="@drawable/ic_list_white_24dp"
-                android:scaleType="center"
-                />
             <View
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/menu/menu_nearby.xml b/app/src/main/res/menu/menu_nearby.xml
index 44b4c2d82..383d28b60 100644
--- a/app/src/main/res/menu/menu_nearby.xml
+++ b/app/src/main/res/menu/menu_nearby.xml
@@ -2,6 +2,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"      tools:context=".MainActivity">
 
+    <item
+        android:id="@+id/action_display_list"
+        android:title="@string/display_list_button"
+        android:icon="@drawable/ic_list_white_24dp"
+        android:orderInCategory="1"
+        app:showAsAction="ifRoom"
+        />
+
     <item
         android:id="@+id/action_refresh"
         android:title="@string/refresh_button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1447e55c..dfbc6b551 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
   <string name="categories_search_text_hint">Search categories</string>
   <string name="menu_save_categories">Save</string>
   <string name="refresh_button">Refresh</string>
+  <string name="display_list_button">List</string>
   <string name="gps_disabled">GPS is disabled in your device. Would you like to enable it?</string>
   <string name="enable_gps">Enable GPS</string>
   <string name="contributions_subtitle_zero">No uploads yet</string>