mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix whitespace

Browse source
This commit is contained in:
misaochan 2018-05-25 23:05:29 +10:00
parent 5e0e01b035
commit 953d00d2f6
1 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -433,7 +433,6 @@ public class ShareActivity
} }
} }
/** /**
* Displays Snackbar to ask for location permissions * Displays Snackbar to ask for location permissions
*/ */
@ -447,7 +446,6 @@ public class ShareActivity
return snackbar; return snackbar;
} }
//I might not be supposed to change it, but still, I saw it //I might not be supposed to change it, but still, I saw it
@Override @Override
public void onPositiveResponse() { public void onPositiveResponse() {
@ -495,9 +493,6 @@ public class ShareActivity
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
//TODO: Move this to a new class.
//TODO: Move this to a new class. Save references to the findViewByIds and pass them to the new method //TODO: Move this to a new class. Save references to the findViewByIds and pass them to the new method
/* /*
* function to provide pinch zoom * function to provide pinch zoom
@ -597,15 +592,10 @@ public class ShareActivity
// Construct and run the parallel animation of the four translation and // Construct and run the parallel animation of the four translation and
// scale properties (X, Y, SCALE_X, and SCALE_Y). // scale properties (X, Y, SCALE_X, and SCALE_Y).
AnimatorSet set = new AnimatorSet(); AnimatorSet set = new AnimatorSet();
set set.play(ObjectAnimator.ofFloat(expandedImageView, View.X, startBounds.left, finalBounds.left))
.play(ObjectAnimator.ofFloat(expandedImageView, View.X, .with(ObjectAnimator.ofFloat(expandedImageView, View.Y, startBounds.top, finalBounds.top))
startBounds.left, finalBounds.left)) .with(ObjectAnimator.ofFloat(expandedImageView, View.SCALE_X, startScale, 1f))
.with(ObjectAnimator.ofFloat(expandedImageView, View.Y, .with(ObjectAnimator.ofFloat(expandedImageView, View.SCALE_Y, startScale, 1f));
startBounds.top, finalBounds.top))
.with(ObjectAnimator.ofFloat(expandedImageView, View.SCALE_X,
startScale, 1f))
.with(ObjectAnimator.ofFloat(expandedImageView,
View.SCALE_Y, startScale, 1f));
set.setDuration(ShortAnimationDuration); set.setDuration(ShortAnimationDuration);
set.setInterpolator(new DecelerateInterpolator()); set.setInterpolator(new DecelerateInterpolator());
set.addListener(new AnimatorListenerAdapter() { set.addListener(new AnimatorListenerAdapter() {
@ -626,7 +616,6 @@ public class ShareActivity
// to the original bounds and show the thumbnail instead of // to the original bounds and show the thumbnail instead of
// the expanded image. // the expanded image.
startScaleFinal = startScale; startScaleFinal = startScale;
} }
/* /*
@ -662,17 +651,10 @@ public class ShareActivity
// Animate the four positioning/sizing properties in parallel, // Animate the four positioning/sizing properties in parallel,
// back to their original values. // back to their original values.
AnimatorSet set = new AnimatorSet(); AnimatorSet set = new AnimatorSet();
set.play(ObjectAnimator set.play(ObjectAnimator.ofFloat(expandedImageView, View.X, startBounds.left))
.ofFloat(expandedImageView, View.X, startBounds.left)) .with(ObjectAnimator.ofFloat(expandedImageView, View.Y, startBounds.top))
.with(ObjectAnimator .with(ObjectAnimator.ofFloat(expandedImageView, View.SCALE_X, startScaleFinal))
.ofFloat(expandedImageView, .with(ObjectAnimator.ofFloat(expandedImageView, View.SCALE_Y, startScaleFinal));
View.Y, startBounds.top))
.with(ObjectAnimator
.ofFloat(expandedImageView,
View.SCALE_X, startScaleFinal))
.with(ObjectAnimator
.ofFloat(expandedImageView,
View.SCALE_Y, startScaleFinal));
set.setDuration(ShortAnimationDuration); set.setDuration(ShortAnimationDuration);
set.setInterpolator(new DecelerateInterpolator()); set.setInterpolator(new DecelerateInterpolator());
set.addListener(new AnimatorListenerAdapter() { set.addListener(new AnimatorListenerAdapter() {
@ -699,9 +681,7 @@ public class ShareActivity
@OnClick(R.id.media_map) @OnClick(R.id.media_map)
public void onFabShowMapsClicked() { public void onFabShowMapsClicked() {
if (imageObj != null && imageObj.imageCoordsExists == true) { if (imageObj != null && imageObj.imageCoordsExists == true) {
Uri gmmIntentUri = Uri Uri gmmIntentUri = Uri.parse("google.streetview:cbll=" + imageObj.getDecLatitude() + "," + imageObj.getDecLongitude());
.parse("google.streetview:cbll=" + imageObj.getDecLatitude() + "," + imageObj
.getDecLongitude());
Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri); Intent mapIntent = new Intent(Intent.ACTION_VIEW, gmmIntentUri);
mapIntent.setPackage("com.google.android.apps.maps"); mapIntent.setPackage("com.google.android.apps.maps");
startActivity(mapIntent); startActivity(mapIntent);