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

More FAB tidying

Browse source
This commit is contained in:
misaochan 2018-05-15 20:09:22 +10:00
parent 11d3517b70
commit 3bd4214246
1 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -291,9 +291,9 @@ public class ShareActivity
mainFab.setOnClickListener(new View.OnClickListener() { mainFab.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if(!isFABOpen){ if(!isFABOpen) {
showFABMenu(); showFABMenu();
}else{ } else {
closeFABMenu(); closeFABMenu();
} }
} }
@ -307,10 +307,27 @@ public class ShareActivity
zoomImageFromThumb(backgroundImageView, mediaUri); zoomImageFromThumb(backgroundImageView, mediaUri);
} }
}); });
} catch (Exception e){ } catch (Exception e) {
Log.i("exception", e.toString()); Log.i("exception", e.toString());
} }
zoomOutButton = (FloatingActionButton) findViewById(R.id.media_upload_zoom_out); 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 @Override
@ -368,22 +385,6 @@ public class ShareActivity
.commitAllowingStateLoss(); .commitAllowingStateLoss();
} }
uploadController.prepareService(); 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);
}
}
});
} }
/** /**