Gradle update and scaling but no animation issue fixed.

ceryle · Mar 3, 2017 · 9d4f654 · 9d4f654
1 parent ada2482
commit 9d4f654
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 19 17:41:56 EEST 2016
+#Fri Mar 03 09:20:49 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/src/main/java/co/ceryle/radiorealbutton/library/RadioRealButtonGroup.java b/library/src/main/java/co/ceryle/radiorealbutton/library/RadioRealButtonGroup.java
@@ -156,13 +156,11 @@ private void setBottomLineAttrs() {
     }
 
     private void setSelectorAttrs() {
-        View selectorView = selectorContainer;
-
-        FrameLayout.LayoutParams selectorParams = (FrameLayout.LayoutParams) selectorView.getLayoutParams();
+        FrameLayout.LayoutParams selectorParams = (FrameLayout.LayoutParams) selectorContainer.getLayoutParams();
         FrameLayout.LayoutParams bottomLineParams = (FrameLayout.LayoutParams) v_bottomLine.getLayoutParams();
 
         if (selectorBringToFront)
-            selectorView.bringToFront();
+            selectorContainer.bringToFront();
 
         selectorParams.height = selectorSize;
 
@@ -237,9 +235,9 @@ private void setBorderAttrs() {
 
     private float radius, animateImagesScale, animateTextsScale;
 
-    private boolean bottomLineBringToFront, selectorBringToFront, selectorAboveOfBottomLine, selectorTop, selectorBottom,
-            hasPadding, hasPaddingLeft, hasPaddingRight, hasPaddingTop, hasPaddingBottom, hasDividerBackgroundColor, clickable,
-            enabled, enableDeselection, hasEnabled, hasClickable, hasBorder, hasAnimateImages, hasAnimateTexts, hasAnimation;
+    private boolean bottomLineBringToFront, selectorBringToFront, selectorAboveOfBottomLine, selectorTop, selectorBottom, hasPadding,
+            hasPaddingLeft, hasPaddingRight, hasPaddingTop, hasPaddingBottom, hasDividerBackgroundColor, clickable, enabled,
+            enableDeselection, hasEnabled, hasClickable, hasBorder, hasAnimateImages, hasAnimateTexts, hasAnimation;
 
     private void getAttributes(AttributeSet attrs) {
         TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.RadioRealButtonGroup);
@@ -359,8 +357,11 @@ else if (checkedButtonId == NO_ID && button.isChecked())
 
             if (lastPosition == position) {
                 button.setChecked(true);
-                button.bounceDrawable(animateImagesScale + 1);
-                button.bounceText(animateTextsScale + 1);
+
+                if (hasAnimateImages)
+                    button.bounceDrawable(animateImagesScale + 1);
+                if (hasAnimateTexts)
+                    button.bounceText(animateTextsScale + 1);
             } else
                 button.setChecked(false);