Merge branch 'release-1.3.1'

markormesher · May 28, 2017 · 9253a8c · 9253a8c
2 parents 780447a + 4f6bbb1
commit 9253a8c
Show file tree

Hide file tree

Showing 5 changed files with 10,827 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 }
 
 def version = new Properties()
-version['code'] = 10
-version['name'] = '1.3.0'
+version['code'] = 11
+version['name'] = '1.3.1'
 
 def secrets = getSecrets()
 

diff --git a/fab/build.gradle b/fab/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 }
 
 def version = new Properties()
-version['code'] = 10
-version['name'] = '1.3.0'
+version['code'] = 11
+version['name'] = '1.3.1'
 
 apply plugin: 'me.tatarka.retrolambda'
 

diff --git a/fab/src/main/java/uk/co/markormesher/android_fab/FloatingActionButton.java b/fab/src/main/java/uk/co/markormesher/android_fab/FloatingActionButton.java
@@ -492,15 +492,19 @@ private void setSpeedDialCoverVisible(boolean visible) {
 		busyAnimatingSpeedDialCover = true;
 
 		// animate
+		coverView.setVisibility(VISIBLE);
 		coverView.animate()
 				.scaleX(visible ? 50F : 0F)
 				.scaleY(visible ? 50F : 0F)
-				//.alpha(visible ? 1F : 0F)
+				.alpha(visible ? 1F : 0F)
 				.setDuration(SPEED_DIAL_ANIMATION_DURATION)
 				.setListener(new AnimatorListenerAdapter() {
 					@Override
 					public void onAnimationEnd(Animator animation) {
 						busyAnimatingSpeedDialCover = false;
+						if (!visible) {
+							coverView.setVisibility(GONE);
+						}
 					}
 				});
 	}

diff --git a/misc/proguard-mappings/10.txt → misc/proguard-mappings/build-10.txt b/misc/proguard-mappings/10.txt → misc/proguard-mappings/build-10.txt