From 9e74288f2df7a6394c04cc321b26a7b9cd64f581 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 20 Apr 2017 11:00:59 +0200
Subject: [PATCH] Fix fab handling when scrolled away

---
 Habitica/res/anim/fab_slide_in.xml                    |  7 +++++--
 Habitica/res/anim/fab_slide_out.xml                   |  7 +++++--
 Habitica/res/layout/floating_menu_tasks.xml           |  4 +++-
 .../ui/helpers/FloatingActionMenuBehavior.java        | 11 ++---------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Habitica/res/anim/fab_slide_in.xml b/Habitica/res/anim/fab_slide_in.xml
index 1675a9ae1..bac34df5b 100644
--- a/Habitica/res/anim/fab_slide_in.xml
+++ b/Habitica/res/anim/fab_slide_in.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="100%" android:toYDelta="0%"/>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200">
+	<translate
+		android:fromYDelta="100%"
+		android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_out.xml b/Habitica/res/anim/fab_slide_out.xml
index b82f4d744..6d97fbbe2 100644
--- a/Habitica/res/anim/fab_slide_out.xml
+++ b/Habitica/res/anim/fab_slide_out.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="0%" android:toYDelta="100%"/>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200">
+	<translate android:fromYDelta="0%"
+		android:toYDelta="100%"
+		/>
 </set>
\ No newline at end of file
diff --git a/Habitica/res/layout/floating_menu_tasks.xml b/Habitica/res/layout/floating_menu_tasks.xml
index c237864d0..9485d17a9 100644
--- a/Habitica/res/layout/floating_menu_tasks.xml
+++ b/Habitica/res/layout/floating_menu_tasks.xml
@@ -18,7 +18,9 @@
     fab:menu_animationDelayPerItem="50"
     fab:menu_icon="@drawable/fab_add"
     fab:menu_buttonSpacing="2dp"
-    fab:menu_labels_margin="4dp">
+    fab:menu_labels_margin="4dp"
+    fab:menu_fab_show_animation="@anim/fab_slide_in"
+    fab:menu_fab_hide_animation="@anim/fab_slide_out">
 
     <com.github.clans.fab.FloatingActionButton
         android:id="@+id/fab.new.habit"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
index e0c35a410..86cd2a913 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
@@ -138,17 +138,10 @@ public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
     }
 
     private void slideFabOffScreen(FloatingActionMenu view) {
-        Animation slideOff = AnimationUtils.loadAnimation(context, R.anim.fab_slide_out);
-        slideOff.setDuration(FAB_ANIMATION_DURATION);
-        slideOff.setFillAfter(true);
-        view.startAnimation(slideOff);
+        view.hideMenu(true);
     }
 
     private void slideFabOnScreen(FloatingActionMenu view) {
-        Animation slideIn = AnimationUtils.loadAnimation(context, R.anim.fab_slide_in);
-        slideIn.setDuration(FAB_ANIMATION_DURATION);
-        slideIn.setFillAfter(true);
-        view.startAnimation(slideIn);
-        view.showMenu(false);
+        view.showMenu(true);
     }
 }
\ No newline at end of file