From 3bd421424685070fcd061f3e730900476f390a18 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 15 May 2018 20:09:22 +1000
Subject: [PATCH] More FAB tidying

---
 .../nrw/commons/upload/ShareActivity.java     | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index 3da0ef8fe..a9c5c1260 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -291,9 +291,9 @@ public class ShareActivity
         mainFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if(!isFABOpen){
+                if(!isFABOpen) {
                     showFABMenu();
-                }else{
+                } else {
                     closeFABMenu();
                 }
             }
@@ -307,10 +307,27 @@ public class ShareActivity
                     zoomImageFromThumb(backgroundImageView, mediaUri);
                 }
             });
-        } catch (Exception e){
+        } catch (Exception e) {
             Log.i("exception", e.toString());
         }
         zoomOutButton = (FloatingActionButton) findViewById(R.id.media_upload_zoom_out);
+
+        maps_fragment = (FloatingActionButton) findViewById(R.id.media_map);
+        maps_fragment.setVisibility(View.VISIBLE);
+        if( imageObj == null || imageObj.imageCoordsExists){
+            maps_fragment.setVisibility(View.INVISIBLE);
+        }
+        maps_fragment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if( imageObj != null && imageObj.imageCoordsExists) {
+                    Uri gmmIntentUri = Uri.parse("google.streetview:cbll=" + imageObj.getDecLatitude() + "," + imageObj.getDecLongitude());
+                    Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
+                    mapIntent.setPackage("com.google.android.apps.maps");
+                    startActivity(mapIntent);
+                }
+            }
+        });
     }
 
     @Override
@@ -368,22 +385,6 @@ public class ShareActivity
                     .commitAllowingStateLoss();
         }
         uploadController.prepareService();
-        maps_fragment = (FloatingActionButton) findViewById(R.id.media_map);
-        maps_fragment.setVisibility(View.VISIBLE);
-        if( imageObj == null || imageObj.imageCoordsExists){
-            maps_fragment.setVisibility(View.INVISIBLE);
-        }
-        maps_fragment.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if( imageObj != null && imageObj.imageCoordsExists) {
-                    Uri gmmIntentUri = Uri.parse("google.streetview:cbll=" + imageObj.getDecLatitude() + "," + imageObj.getDecLongitude());
-                    Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
-                    mapIntent.setPackage("com.google.android.apps.maps");
-                    startActivity(mapIntent);
-                }
-            }
-        });
     }
 
     /**