Open map of place where picture was taken (commons-app#1360)

tanvidadu · neslihanturan · commit 4f6b791c936b · 2018-05-07T12:57:59.000+03:00
* Intent to map added

*  Merge conflicts resolved

*  Added the functionality to hide FAB incase of null coordinate

*  Merge Conflict resolved

*  Improve pr quality

* Improve Quality

*  Added nested FAB animations

* Nested FAB implemented

*  Improve Quality

*  Added up arrow

*  Javadocs Added
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
@@ -81,8 +81,7 @@
 import fr.free.nrw.commons.utils.ViewUtil;
 import timber.log.Timber;
 
-
-
+import android.support.design.widget.FloatingActionButton;
 import static fr.free.nrw.commons.upload.ExistingFileAsync.Result.DUPLICATE_PROCEED;
 import static fr.free.nrw.commons.upload.ExistingFileAsync.Result.NO_DUPLICATE;
 import static java.lang.Long.min;
@@ -122,6 +121,7 @@ public class ShareActivity
     private Uri mediaUri;
     private Contribution contribution;
     private SimpleDraweeView backgroundImageView;
+    private FloatingActionButton maps_fragment;
 
     private boolean cacheFound;
 
@@ -145,6 +145,8 @@ public class ShareActivity
     private long ShortAnimationDuration;
     private FloatingActionButton zoomInButton;
     private FloatingActionButton zoomOutButton;
+    private FloatingActionButton mainFab;
+    private boolean isFABOpen = false;
 
 
     /**
@@ -284,6 +286,24 @@ R.drawable.ic_error_outline_black_24dp, getTheme()))
         if (mediaUri != null) {
             backgroundImageView.setImageURI(mediaUri);
         }
+
+        mainFab = (FloatingActionButton) findViewById(R.id.main_fab);
+        /*
+         * called when upper arrow floating button
+         */
+        mainFab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(!isFABOpen){
+                    showFABMenu();
+                }else{
+                    closeFABMenu();
+                }
+            }
+        });
+
+
+
         zoomInButton = (FloatingActionButton) findViewById(R.id.media_upload_zoom_in);
         try {
             zoomInButton.setOnClickListener(new View.OnClickListener() {
@@ -358,8 +378,75 @@ public void onClick(View v) {
                     .commitAllowingStateLoss();
         }
         uploadController.prepareService();
+        maps_fragment = (FloatingActionButton) findViewById(R.id.media_map);
+        maps_fragment.setVisibility(View.VISIBLE);
+        if( imageObj == null || imageObj.imageCoordsExists != true){
+            maps_fragment.setVisibility(View.INVISIBLE);
+        }
+
+
+        maps_fragment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if( imageObj != null && imageObj.imageCoordsExists == true) {
+                    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);
+                }
+            }
+        });
+    }
+    /*
+     * Function to display the zoom and map FAB
+     */
+    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.second_fab));
+        zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.first_fab));
+    }
+
+    /*
+     * function to close the zoom and map FAB
+     */
+    private void closeFABMenu(){
+        isFABOpen=false;
+        mainFab.animate().rotationBy(-180);
+        maps_fragment.animate().translationY(0);
+        zoomInButton.animate().translationY(0).setListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animator) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                if(!isFABOpen){
+                    maps_fragment.setVisibility(View.GONE);
+                    zoomInButton.setVisibility(View.GONE);
+                }
+
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animator) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animator) {
+
+            }
+        });
     }
 
+
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            @NonNull String[] permissions, @NonNull int[] grantResults) {
@@ -461,6 +548,9 @@ private void performUnwantedPictureDetectionProcess() {
         detectUnwantedPicturesAsync.execute();
     }
 
+    /*
+     *  to display permission snackbar in share activity
+     */
     private Snackbar requestPermissionUsingSnackBar(String rationale,
                                                     final String[] perms,
                                                     final int code) {
@@ -693,7 +783,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    // Get SHA1 of file from input stream
+    /*
+     * Get SHA1 of file from input stream
+     */
     private String getSHA1(InputStream is) {
 
         MessageDigest digest;
@@ -730,13 +822,18 @@ private String getSHA1(InputStream is) {
         }
     }
 
+    /*
+     * function to provide pinch zoom
+     */
     private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
         // If there's an animation in progress, cancel it
         // immediately and proceed with this one.
         if (CurrentAnimator != null) {
             CurrentAnimator.cancel();
         }
         ViewUtil.hideKeyboard(ShareActivity.this.findViewById(R.id.titleEdit | R.id.descEdit));
+        closeFABMenu();
+        mainFab.setVisibility(View.GONE);
         InputStream input = null;
         Bitmap scaled = null;
         try {
@@ -866,7 +963,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.
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml b/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>
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
@@ -41,17 +41,28 @@
 
         </FrameLayout>
 
-
-
         <android.support.design.widget.FloatingActionButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginBottom="@dimen/standard_gap"
+            app:backgroundTint="@color/button_blue"
+            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:visibility="gone"
+            android:layout_marginRight="@dimen/standard_gap"
             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"
@@ -61,7 +72,19 @@
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginBottom="@dimen/standard_gap"
             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"
+            app:srcCompat="@drawable/ic_map_white_24dp"
+            android:id="@+id/media_map"/>
+
     </RelativeLayout>
 
     <android.support.design.widget.NavigationView
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -23,4 +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">15dp</dimen>
+    <dimen name="second_fab">25dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -275,4 +275,6 @@
   <string name="error_loading_images">Error occurred while loading images.</string>
   <string name="image_uploaded_by">Uploaded by: %1$s</string>
   <string name="share_app_title">Share App</string>
+  <string name="share_coordinates_not_present">Coordinates were not specified during image selection</string>
+
 </resources>
