@@ -482,9 +482,8 @@ public void resumeFragment() {
482
482
*/
483
483
@ Override
484
484
public void animateFABs () {
485
- this .isFabOpen = !isFabOpen ;
486
485
if (fabPlus .isShown ()){
487
- if (isFabOpen ) {
486
+ /* if (isFabOpen) {
488
487
fabPlus.startAnimation(rotate_backward);
489
488
fabCamera.startAnimation(fab_close);
490
489
fabGallery.startAnimation(fab_close);
@@ -497,16 +496,36 @@ public void animateFABs() {
497
496
fabCamera.show();
498
497
fabGallery.show();
499
498
}
500
- this .isFabOpen =!isFabOpen ;
499
+ this.isFabOpen=!isFabOpen;*/
500
+ if (isFabOpen ) {
501
+ closeFABs (isFabOpen );
502
+ } else {
503
+ openFABs (isFabOpen );
504
+ }
501
505
}
502
506
}
503
507
504
508
private void showFABs () {
509
+ NearbyFABUtils .addAnchorToBigFABs (fabPlus , bottomSheetDetails .getId ());
510
+ fabPlus .show ();
511
+ NearbyFABUtils .addAnchorToSmallFABs (fabGallery , getView ().findViewById (R .id .empty_view ).getId ());
512
+ NearbyFABUtils .addAnchorToSmallFABs (fabCamera , getView ().findViewById (R .id .empty_view1 ).getId ());
513
+ }
505
514
506
- NearbyFABUtils .addAnchorToBigFABs (fabPlus , bottomSheetDetails .getId ());
507
- fabPlus .show ();
508
- NearbyFABUtils .addAnchorToSmallFABs (fabGallery , getView ().findViewById (R .id .empty_view ).getId ());
509
- NearbyFABUtils .addAnchorToSmallFABs (fabCamera , getView ().findViewById (R .id .empty_view1 ).getId ());
515
+ /**
516
+ * Hides camera and gallery FABs, turn back plus FAB
517
+ * @param isFabOpen
518
+ */
519
+ private void openFABs ( boolean isFabOpen ){
520
+ if (!isFabOpen ) {
521
+ showFABs ();
522
+ fabPlus .startAnimation (rotate_forward );
523
+ fabCamera .startAnimation (fab_open );
524
+ fabGallery .startAnimation (fab_open );
525
+ fabCamera .show ();
526
+ fabGallery .show ();
527
+ this .isFabOpen = true ;
528
+ }
510
529
}
511
530
512
531
/**
@@ -532,7 +551,7 @@ private void closeFABs( boolean isFabOpen){
532
551
fabGallery .startAnimation (fab_close );
533
552
fabCamera .hide ();
534
553
fabGallery .hide ();
535
- this .isFabOpen = ! isFabOpen ;
554
+ this .isFabOpen = false ;
536
555
}
537
556
}
538
557
0 commit comments