Nested FAB implemented

Author: tanvidadu

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -398,12 +398,13 @@ public void onClick(View v) {
     private void showFABMenu(){
         isFABOpen=true;
 
+        //if( imageObj != null && imageObj.imageCoordsExists == true)
         maps_fragment.setVisibility(View.VISIBLE);
         zoomInButton.setVisibility(View.VISIBLE);
 
         mainFab.animate().rotationBy(180);
-        maps_fragment.animate().translationY(-getResources().getDimension(R.dimen.first_fab));
-        zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.second_fab));
+        maps_fragment.animate().translationY(-getResources().getDimension(R.dimen.second_fab));
+        zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.first_fab));
     }
 
     private void closeFABMenu(){
@@ -814,6 +815,8 @@ private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
         if (CurrentAnimator != null) {
             CurrentAnimator.cancel();
         }
+        closeFABMenu();
+        mainFab.setVisibility(View.GONE);
         hideKeyboard(ShareActivity.this);
         InputStream input = null;
         Bitmap scaled = null;
@@ -944,7 +947,7 @@ public void onClick(View view) {
                     CurrentAnimator.cancel();
                 }
                 zoomOutButton.setVisibility(View.GONE);
-                zoomInButton.setVisibility(View.VISIBLE);
+                mainFab.setVisibility(View.VISIBLE);
 
                 // Animate the four positioning/sizing properties in parallel,
                 // back to their original values.

app/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>

app/src/main/res/layout/activity_share.xml

@@ -48,41 +48,41 @@
             android:layout_alignParentBottom="true"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginBottom="@dimen/standard_gap"
-            app:srcCompat="@drawable/ic_launcher"
+            app:srcCompat="@drawable/ic_keyboard_arrow_up_black_24dp"
             android:id="@+id/main_fab"/>
 
+
         <android.support.design.widget.FloatingActionButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_above="@+id/main_fab"
             android:visibility="gone"
             android:layout_marginRight="@dimen/standard_gap"
-            android:layout_marginBottom="@dimen/standard_gap"
-            app:srcCompat="@drawable/ic_map_white_24dp"
-            android:id="@+id/media_map"/>
+            android:src="@drawable/ic_zoom_in_white_24dp"
+            android:layout_above="@+id/main_fab"
+            android:id="@+id/media_upload_zoom_in"/>
 
         <android.support.design.widget.FloatingActionButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
             android:visibility="gone"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginBottom="@dimen/standard_gap"
-            android:src="@drawable/ic_zoom_in_white_24dp"
-            android:layout_above="@+id/media_map"
-            android:id="@+id/media_upload_zoom_in"/>
+            android:src="@drawable/ic_zoom_out_white_24dp"
+            android:layout_above="@+id/main_fab"
+            android:id="@+id/media_upload_zoom_out"/>
 
         <android.support.design.widget.FloatingActionButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
+            android:layout_above="@+id/media_upload_zoom_in"
             android:visibility="gone"
             android:layout_marginRight="@dimen/standard_gap"
-            android:layout_marginBottom="@dimen/standard_gap"
-            android:src="@drawable/ic_zoom_out_white_24dp"
-            android:layout_above="@+id/media_map"
-            android:id="@+id/media_upload_zoom_out"/>
+            app:srcCompat="@drawable/ic_map_white_24dp"
+            android:id="@+id/media_map"/>
 
     </RelativeLayout>
 

app/src/main/res/values/dimens.xml

@@ -23,6 +23,6 @@
     <dimen name="subheading_text_size">20sp</dimen>
     <dimen name="normal_text">16sp</dimen>
     <dimen name="description_text_size">14sp</dimen>
-    <dimen name="first_fab">55dp</dimen>
-    <dimen name="second_fab">100dp</dimen>
+    <dimen name="first_fab">15dp</dimen>
+    <dimen name="second_fab">25dp</dimen>
 </resources>