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 corner FABs bug

Browse source
This commit is contained in:
neslihanturan 2018-03-17 12:39:25 +03:00
parent 41e11b7f20
commit 56fb147e1a
1 changed files with 74 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

109
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -16,6 +16,8 @@ import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -508,22 +510,54 @@ public class NearbyMapFragment extends DaggerFragment {
} }
private void hideFAB() { private void hideFAB() {
//get rid of anchors
//Somehow this was the only way https://stackoverflow.com/questions/32732932/floatingactionbutton-visible-for-sometime-even-if-visibility-is-set-to-gone removeAnchorFromFABs(fabPlus);
CoordinatorLayout.LayoutParams p = (CoordinatorLayout.LayoutParams) fabPlus
.getLayoutParams();
p.setAnchorId(View.NO_ID);
fabPlus.setLayoutParams(p);
fabPlus.hide(); fabPlus.hide();
removeAnchorFromFABs(fabCamera);
fabCamera.hide(); fabCamera.hide();
removeAnchorFromFABs(fabGallery);
fabGallery.hide(); fabGallery.hide();
}
/*
* We are not able to hide FABs without removing anchors, this method removes anchors
* */
private void removeAnchorFromFABs(FloatingActionButton floatingActionButton) {
//get rid of anchors
//Somehow this was the only way https://stackoverflow.com/questions/32732932
// /floatingactionbutton-visible-for-sometime-even-if-visibility-is-set-to-gone
CoordinatorLayout.LayoutParams param = (CoordinatorLayout.LayoutParams) floatingActionButton
.getLayoutParams();
param.setAnchorId(View.NO_ID);
// If we don't set them to zero, then they become visible for a moment on upper left side
param.width = 0;
param.height = 0;
floatingActionButton.setLayoutParams(param);
} }
private void showFAB() { private void showFAB() {
CoordinatorLayout.LayoutParams p = (CoordinatorLayout.LayoutParams) fabPlus.getLayoutParams();
p.setAnchorId(getActivity().findViewById(R.id.bottom_sheet_details).getId()); addAnchorToFABs(fabPlus, getActivity().findViewById(R.id.bottom_sheet_details).getId());
fabPlus.setLayoutParams(p);
fabPlus.show(); fabPlus.show();
addAnchorToFABs(fabGallery, getActivity().findViewById(R.id.empty_view).getId());
addAnchorToFABs(fabCamera, getActivity().findViewById(R.id.empty_view1).getId());
}
/*
* Add amnchors back before making them visible again.
* */
private void addAnchorToFABs(FloatingActionButton floatingActionButton, int anchorID) {
CoordinatorLayout.LayoutParams params = new CoordinatorLayout.LayoutParams
(ViewGroup.LayoutParams.WRAP_CONTENT,ViewGroup.LayoutParams.WRAP_CONTENT);
params.setAnchorId(anchorID);
params.anchorGravity = Gravity.TOP|Gravity.RIGHT|Gravity.END;
floatingActionButton.setLayoutParams(params);
} }
private void passInfoToSheet(Place place) { private void passInfoToSheet(Place place) {
@ -554,25 +588,28 @@ public class NearbyMapFragment extends DaggerFragment {
distance.setText(place.distance.toString()); distance.setText(place.distance.toString());
fabCamera.setOnClickListener(view -> { fabCamera.setOnClickListener(view -> {
Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); if (fabCamera.isShown()) {
controller = new ContributionController(this); Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
controller = new ContributionController(this);
DirectUpload directUpload = new DirectUpload(this, controller); DirectUpload directUpload = new DirectUpload(this, controller);
storeSharedPrefs(); storeSharedPrefs();
directUpload.initiateCameraUpload(); directUpload.initiateCameraUpload();
}
}); });
fabGallery.setOnClickListener(view -> { fabGallery.setOnClickListener(view -> {
Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); if (fabGallery.isShown()) {
controller = new ContributionController(this); Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
controller = new ContributionController(this);
DirectUpload directUpload = new DirectUpload(this, controller); DirectUpload directUpload = new DirectUpload(this, controller);
storeSharedPrefs(); storeSharedPrefs();
directUpload.initiateGalleryUpload(); directUpload.initiateGalleryUpload();
//TODO: App crashes after image upload completes
//TODO: Handle onRequestPermissionsResult
//TODO: App crashes after image upload completes
//TODO: Handle onRequestPermissionsResult
}
}); });
} }
@ -627,20 +664,22 @@ public class NearbyMapFragment extends DaggerFragment {
} }
private void animateFAB(boolean isFabOpen) { private void animateFAB(boolean isFabOpen) {
if (isFabOpen) { if (fabPlus.isShown()){
fabPlus.startAnimation(rotate_backward); if (isFabOpen) {
fabCamera.startAnimation(fab_close); fabPlus.startAnimation(rotate_backward);
fabGallery.startAnimation(fab_close); fabCamera.startAnimation(fab_close);
fabCamera.hide(); fabGallery.startAnimation(fab_close);
fabGallery.hide(); fabCamera.hide();
} else { fabGallery.hide();
fabPlus.startAnimation(rotate_forward); } else {
fabCamera.startAnimation(fab_open); fabPlus.startAnimation(rotate_forward);
fabGallery.startAnimation(fab_open); fabCamera.startAnimation(fab_open);
fabCamera.show(); fabGallery.startAnimation(fab_open);
fabGallery.show(); fabCamera.show();
fabGallery.show();
}
this.isFabOpen=!isFabOpen;
} }
this.isFabOpen=!isFabOpen;
} }
private void closeFabs(boolean isFabOpen){ private void closeFabs(boolean isFabOpen){