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

Rename mapsFragment to mapButton to be consistent with other FABs

Browse source
This commit is contained in:
misaochan 2018-05-29 19:02:38 +10:00
parent 96ea3f693d
commit fe185e0da8
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@ import android.support.design.widget.Snackbar;
import android.support.graphics.drawable.VectorDrawableCompat; import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
@ -110,7 +109,7 @@ public class ShareActivity
@BindView(R.id.backgroundImage) @BindView(R.id.backgroundImage)
SimpleDraweeView backgroundImageView; SimpleDraweeView backgroundImageView;
@BindView(R.id.media_map) @BindView(R.id.media_map)
FloatingActionButton mapsFragment; FloatingActionButton mapButton;
@BindView(R.id.media_upload_zoom_in) @BindView(R.id.media_upload_zoom_in)
FloatingActionButton zoomInButton; FloatingActionButton zoomInButton;
@BindView(R.id.media_upload_zoom_out) @BindView(R.id.media_upload_zoom_out)
@ -343,11 +342,11 @@ public class ShareActivity
isFABOpen=true; isFABOpen=true;
if( imageObj != null && imageObj.imageCoordsExists) if( imageObj != null && imageObj.imageCoordsExists)
mapsFragment.setVisibility(View.VISIBLE); mapButton.setVisibility(View.VISIBLE);
zoomInButton.setVisibility(View.VISIBLE); zoomInButton.setVisibility(View.VISIBLE);
mainFab.animate().rotationBy(180); mainFab.animate().rotationBy(180);
mapsFragment.animate().translationY(-getResources().getDimension(R.dimen.second_fab)); mapButton.animate().translationY(-getResources().getDimension(R.dimen.second_fab));
zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.first_fab)); zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.first_fab));
} }
@ -357,7 +356,7 @@ public class ShareActivity
private void closeFABMenu(){ private void closeFABMenu(){
isFABOpen=false; isFABOpen=false;
mainFab.animate().rotationBy(-180); mainFab.animate().rotationBy(-180);
mapsFragment.animate().translationY(0); mapButton.animate().translationY(0);
zoomInButton.animate().translationY(0).setListener(new Animator.AnimatorListener() { zoomInButton.animate().translationY(0).setListener(new Animator.AnimatorListener() {
@Override @Override
public void onAnimationStart(Animator animator) { public void onAnimationStart(Animator animator) {
@ -366,7 +365,7 @@ public class ShareActivity
@Override @Override
public void onAnimationEnd(Animator animator) { public void onAnimationEnd(Animator animator) {
if(!isFABOpen){ if(!isFABOpen){
mapsFragment.setVisibility(View.GONE); mapButton.setVisibility(View.GONE);
zoomInButton.setVisibility(View.GONE); zoomInButton.setVisibility(View.GONE);
} }
} }
@ -498,7 +497,7 @@ public class ShareActivity
} }
/** /**
* Allows zooming in to the uploaded image. Called when zoom FAB is tapped * Allows zooming in to the image about to be uploaded. Called when zoom FAB is tapped
*/ */
private void zoomImageFromThumb(final View thumbView, Uri imageuri) { private void zoomImageFromThumb(final View thumbView, Uri imageuri) {
// If there's an animation in progress, cancel it immediately and proceed with this one. // If there's an animation in progress, cancel it immediately and proceed with this one.