Merge pull request #21 from svyatoslavpavlov/button_click

fab animation fix
svyatoslavpavlov · Sep 13, 2018 · 4cc9e69 · 4cc9e69
2 parents 400951c + 98bf34e
commit 4cc9e69
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.6.14.1
-VERSION_CODE=1060141
+VERSION_NAME=1.6.15.0
+VERSION_CODE=1060150
 GROUP=com.github.clans
 
 POM_DESCRIPTION=Floating Action Button implementation for Android

diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
@@ -782,6 +782,7 @@ public void run() {
     }
 
     public void close(final boolean animate) {
+        if (isAlwaysOpened()) return;
         if (isOpened()) {
             if (isBackgroundEnabled()) {
                 if (!animate) {

diff --git a/sample/src/main/res/layout/menus_fragment.xml b/sample/src/main/res/layout/menus_fragment.xml
@@ -32,6 +32,7 @@
         android:textSize="18sp" />
 
     <com.github.clans.fab.FloatingActionMenu
+        fab:menu_backgroundColor="@color/black"
         android:id="@+id/menu_yellow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -263,7 +264,8 @@
         android:id="@+id/menu_labels_right"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"