Close FAB menu on back pressed

android/src/androidTest/java/org/ligi/passandroid/ThePassListActivity.kt

@@ -2,6 +2,7 @@ package org.ligi.passandroid
 
 import android.annotation.TargetApi
 import android.support.test.espresso.Espresso.onView
+import android.support.test.espresso.Espresso.pressBack
 import android.support.test.espresso.action.ViewActions.click
 import android.support.test.espresso.assertion.ViewAssertions.matches
 import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -10,6 +11,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.ligi.passandroid.R.id.pass_recyclerview
 import org.ligi.passandroid.functions.checkThatHelpIsThere
+import org.ligi.passandroid.functions.expand
+import org.ligi.passandroid.functions.isCollapsed
 import org.ligi.passandroid.ui.PassListActivity
 import org.ligi.trulesk.TruleskActivityRule
 
@@ -35,5 +38,15 @@ class ThePassListActivity {
         checkThatHelpIsThere()
     }
 
+    @Test
+    fun testCloseFabOnBackPressed() {
+        onView(withId(R.id.fam)).perform(expand())
+
+        pressBack()
+
+        onView(withId(R.id.fam))
+                .check(matches(isDisplayed()))
+                .check(matches(isCollapsed()))
+    }
 
 }

android/src/androidTest/java/org/ligi/passandroid/functions/FabFunctions.kt

@@ -0,0 +1,39 @@
+package org.ligi.passandroid.functions
+
+import android.support.test.espresso.UiController
+import android.support.test.espresso.ViewAction
+import android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import android.view.View
+import net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.TypeSafeMatcher
+
+fun expand(): ViewAction? = ExpandFabAction()
+
+fun isCollapsed(): Matcher<in View>? = CollapsedCheck() as Matcher<in View>
+
+class ExpandFabAction : ViewAction {
+
+    override fun getConstraints(): Matcher<View> = isAssignableFrom(FloatingActionsMenu::class.java)
+
+    override fun getDescription() = "expands the floating action menu"
+
+    override fun perform(uiController: UiController?, view: View?) {
+        val fam = view as FloatingActionsMenu
+        fam.expand()
+    }
+
+}
+
+class CollapsedCheck : TypeSafeMatcher<FloatingActionsMenu>(FloatingActionsMenu::class.java) {
+
+    override fun describeTo(description: Description?) {
+        description?.appendText("is in collapsed state")
+    }
+
+    override fun matchesSafely(fam: FloatingActionsMenu?): Boolean {
+        return !fam?.isExpanded!!
+    }
+
+}

android/src/main/java/org/ligi/passandroid/ui/PassListActivity.kt

@@ -302,4 +302,9 @@ class PassListActivity : PassAndroidActivity() {
 
     }
 
+    override fun onBackPressed() {
+        if (fam.isExpanded) fam.collapse()
+        else super.onBackPressed()
+    }
+
 }