From a369af982e6973e389ec7fe64e4a7eafa86cade4 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Thu, 28 Dec 2017 13:41:08 +0300
Subject: [PATCH] Move commons button to out of expanded FABs

---
 .../nrw/commons/nearby/NearbyMapFragment.java | 33 +++++++------------
 .../main/res/layout/bottom_sheet_details.xml  | 29 ++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 42 insertions(+), 21 deletions(-)

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 6441a3ad6..cb49d1cad 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
@@ -54,10 +54,10 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
     private LinearLayout wikipediaButton;
     private LinearLayout wikidataButton;
     private LinearLayout directionsButton;
+    private LinearLayout commonsButton;
     private FloatingActionButton fabPlus;
     private FloatingActionButton fabCamera;
     private FloatingActionButton fabGallery;
-    private FloatingActionButton fabCommons;
     private View transparentView;
     private TextView description;
     private TextView title;
@@ -151,8 +151,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
         fabPlus = getActivity().findViewById(R.id.fab_plus);
         fabCamera = getActivity().findViewById(R.id.fab_camera);
         fabGallery = getActivity().findViewById(R.id.fab_galery);
-        fabCommons = getActivity().findViewById(R.id.fab_commons_page);
-
+        
         fab_open = AnimationUtils.loadAnimation(getActivity(), R.anim.fab_open);
         fab_close = AnimationUtils.loadAnimation(getActivity(),R.anim.fab_close);
         rotate_forward = AnimationUtils.loadAnimation(getActivity(),R.anim.rotate_forward);
@@ -169,6 +168,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
         wikidataButton = getActivity().findViewById(R.id.wikidataButton);
         wikipediaButton = getActivity().findViewById(R.id.wikipediaButton);
         directionsButton = getActivity().findViewById(R.id.directionsButton);
+        commonsButton = getActivity().findViewById(R.id.commonsButton);
 
     }
 
@@ -338,7 +338,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
         p.setAnchorId(View.NO_ID);
         fabPlus.setLayoutParams(p);
         fabPlus.hide();
-        fabCommons.hide();
         fabCamera.hide();
         fabGallery.hide();
     }
@@ -370,14 +369,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
             }
         });
 
-        fabCommons.setEnabled(
-                !(place.siteLinks == null || Uri.EMPTY.equals(place.siteLinks.getCommonsLink())));
-        fabCommons.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                openWebView(place.siteLinks.getCommonsLink()); }
-        });
-
         directionsButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -394,6 +385,15 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
             }
         });
 
+        commonsButton.setEnabled(
+                !(place.siteLinks == null || Uri.EMPTY.equals(place.siteLinks.getCommonsLink())));
+        commonsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                openWebView(place.siteLinks.getCommonsLink());
+            }
+        });
+
         icon.setImageResource(place.getDescription().getIcon());
         description.setText(place.getDescription().getText());
         title.setText(place.name.toString());
@@ -412,23 +412,16 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
             fabPlus.startAnimation(rotate_backward);
             fabCamera.startAnimation(fab_close);
             fabGallery.startAnimation(fab_close);
-            fabCommons.startAnimation(fab_close);
             fabCamera.hide();
             fabGallery.hide();
-            fabCommons.hide();
 
         } else {
 
             fabPlus.startAnimation(rotate_forward);
             fabCamera.startAnimation(fab_open);
             fabGallery.startAnimation(fab_open);
-            fabCommons.startAnimation(fab_open);
             fabCamera.show();
             fabGallery.show();
-            fabCommons.show();
-            fabCommons.setClickable(
-                    !(place.siteLinks == null
-                            || Uri.EMPTY.equals(place.siteLinks.getCommonsLink())));
 
         }
 
@@ -440,10 +433,8 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
             fabPlus.startAnimation(rotate_backward);
             fabCamera.startAnimation(fab_close);
             fabGallery.startAnimation(fab_close);
-            fabCommons.startAnimation(fab_close);
             fabCamera.hide();
             fabGallery.hide();
-            fabCommons.hide();
             this.isFabOpen=!isFabOpen;
         }
     }
diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml
index 0d2399b84..c563b6fd1 100644
--- a/app/src/main/res/layout/bottom_sheet_details.xml
+++ b/app/src/main/res/layout/bottom_sheet_details.xml
@@ -137,6 +137,35 @@
 
                 />
         </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/commonsButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="16dp"
+            android:clickable="true"
+            android:background="@drawable/button_background_selector"
+            android:orientation="vertical"
+            >
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:duplicateParentState="true"
+                app:srcCompat="@drawable/ic_commons_icon_vector"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:duplicateParentState="true"
+                android:textColor="@color/text_color_selector"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/nearby_commons"
+
+                />
+        </LinearLayout>
     </LinearLayout>
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dfbc6b551..45661ee28 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -218,4 +218,5 @@
   <string name="nearby_directions">DIRECTIONS</string>
   <string name="nearby_wikidata">WIKIDATA</string>
   <string name="nearby_wikipedia">WIKIPEDIA</string>
+  <string name="nearby_commons">COMMONS</string>
 </resources>