- Resolves issue #152 i.e. updates Support Library dependency to 25.4.0 & removes fallback animated vector drawables below Lollipop

Piotr Zawadzki · zawadz88 · commit 6c942c208560 · 2017-06-16T13:22:28.000+02:00
- Adds a missing test for showing bottom navigation bar
diff --git a/build.gradle b/build.gradle
@@ -19,6 +19,9 @@ allprojects {
     repositories {
         jcenter()
         mavenCentral()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 
@@ -29,7 +32,7 @@ configure(allprojects) {
         androidTargetSdkVersion             = 25
         androidCompileSdkVersion            = 25
         androidBuildToolsVersion            = '25.0.2'
-        androidSupportLibraryVersion        = '25.3.1'
+        androidSupportLibraryVersion        = '25.4.0'
 
         junitVersion                        = '4.12'
         mockitoVersion                      = '2.7.21'
diff --git a/config/quality/quality.gradle b/config/quality/quality.gradle
@@ -57,9 +57,6 @@ task findbugs(type: FindBugs,
         xml {
             destination "$reportsDir/findbugs/findbugs.xml"
         }
-        html {
-            destination "$reportsDir/findbugs/findbugs.html"
-        }
     }
 
     classpath = files()
diff --git a/material-stepper/src/main/java/com/stepstone/stepper/internal/widget/StepTab.java b/material-stepper/src/main/java/com/stepstone/stepper/internal/widget/StepTab.java
@@ -20,7 +20,6 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.support.annotation.CallSuper;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
@@ -196,20 +195,13 @@ private Drawable createWarningToCircleDrawable() {
     }
 
     /**
-     * Inflates an animated vector drawable. On Lollipop+ this uses the native {@link android.graphics.drawable.AnimatedVectorDrawable}
-     * and below it inflates the drawable as a {@link AnimatedVectorDrawableCompat}.
+     * Inflates an animated vector drawable.
      *
      * @param animatedVectorDrawableResId resource ID for the animated vector
      * @return animated vector drawable
      */
     public Drawable createAnimatedVectorDrawable(@DrawableRes int animatedVectorDrawableResId) {
-        Context context = getContext();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Drawable drawable = context.getDrawable(animatedVectorDrawableResId);
-            return drawable.getConstantState().newDrawable(context.getResources());
-        } else {
-            return AnimatedVectorDrawableCompat.create(context, animatedVectorDrawableResId);
-        }
+        return AnimatedVectorDrawableCompat.create(getContext(), animatedVectorDrawableResId);
     }
 
     /**
diff --git a/material-stepper/src/main/res/drawable-v21/ms_animated_vector_circle_to_warning_24dp.xml b/material-stepper/src/main/res/drawable-v21/ms_animated_vector_circle_to_warning_24dp.xml
diff --git a/material-stepper/src/main/res/drawable-v21/ms_animated_vector_warning_to_circle_24dp.xml b/material-stepper/src/main/res/drawable-v21/ms_animated_vector_warning_to_circle_24dp.xml
diff --git a/material-stepper/src/main/res/drawable-v21/ms_vector_circle_24dp.xml b/material-stepper/src/main/res/drawable-v21/ms_vector_circle_24dp.xml
diff --git a/material-stepper/src/main/res/drawable-v21/ms_vector_warning_24dp.xml b/material-stepper/src/main/res/drawable-v21/ms_vector_warning_24dp.xml
diff --git a/material-stepper/src/main/res/drawable/ms_animated_vector_circle_to_warning_24dp.xml b/material-stepper/src/main/res/drawable/ms_animated_vector_circle_to_warning_24dp.xml
@@ -4,47 +4,27 @@
     android:drawable="@drawable/ms_vector_circle_24dp"
     tools:targetApi="lollipop">
 
-    <target android:name="circle_group">
+    <target android:name="icon">
         <aapt:attr name="android:animation">
-            <set>
-
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:valueFrom="1"
-                    android:interpolator="@android:anim/decelerate_interpolator"
-                    android:valueTo="@integer/ms_circle_start_scale"
-                    android:duration="@integer/ms_default_error_tab_animation_duration" />
-
-                <objectAnimator
-                    android:propertyName="scaleY"
-                    android:valueFrom="1"
-                    android:valueTo="@integer/ms_circle_start_scale"
-                    android:interpolator="@android:anim/decelerate_interpolator"
-                    android:duration="@integer/ms_default_error_tab_animation_duration" />
-            </set>
+            <objectAnimator
+                android:duration="@integer/ms_default_error_tab_animation_duration"
+                android:interpolator="@android:anim/decelerate_interpolator"
+                android:propertyName="pathData"
+                android:valueFrom="@string/ms_circle_path"
+                android:valueTo="@string/ms_warning_path"
+                android:valueType="pathType" />
         </aapt:attr>
     </target>
 
     <target android:name="icon_container">
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="@integer/ms_default_error_tab_animation_duration"
+                android:interpolator="@android:anim/decelerate_interpolator"
                 android:propertyName="translateY"
                 android:valueFrom="0"
                 android:valueTo="@integer/ms_warning_end_translate_y" />
         </aapt:attr>
     </target>
 
-    <target android:name="circle">
-        <aapt:attr name="android:animation">
-            <!-- This hack is needed since setting duration to 0 and startOffset to 300 does not trigger the animation... -->
-            <objectAnimator
-                android:duration="1"
-                android:startOffset="299"
-                android:propertyName="fillAlpha"
-                android:valueFrom="1"
-                android:valueTo="0" />
-        </aapt:attr>
-    </target>
-
 </animated-vector>
diff --git a/material-stepper/src/main/res/drawable/ms_animated_vector_warning_to_circle_24dp.xml b/material-stepper/src/main/res/drawable/ms_animated_vector_warning_to_circle_24dp.xml
@@ -4,41 +4,23 @@
     android:drawable="@drawable/ms_vector_warning_24dp"
     tools:targetApi="lollipop">
 
-    <target android:name="circle">
+    <target android:name="icon">
         <aapt:attr name="android:animation">
             <objectAnimator
-                android:duration="0"
-                android:propertyName="fillAlpha"
-                android:valueFrom="0"
-                android:valueTo="1" />
-        </aapt:attr>
-    </target>
-
-    <target android:name="circle_group">
-        <aapt:attr name="android:animation">
-            <set>
-
-                <objectAnimator
-                    android:duration="@integer/ms_default_error_tab_animation_duration"
-                    android:interpolator="@android:anim/decelerate_interpolator"
-                    android:propertyName="scaleX"
-                    android:valueFrom="@integer/ms_circle_start_scale"
-                    android:valueTo="1" />
-
-                <objectAnimator
-                    android:duration="@integer/ms_default_error_tab_animation_duration"
-                    android:interpolator="@android:anim/decelerate_interpolator"
-                    android:propertyName="scaleY"
-                    android:valueFrom="@integer/ms_circle_start_scale"
-                    android:valueTo="1" />
-            </set>
+                android:duration="@integer/ms_default_error_tab_animation_duration"
+                android:interpolator="@android:anim/decelerate_interpolator"
+                android:propertyName="pathData"
+                android:valueFrom="@string/ms_warning_path"
+                android:valueTo="@string/ms_circle_path"
+                android:valueType="pathType" />
         </aapt:attr>
     </target>
 
     <target android:name="icon_container">
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="@integer/ms_default_error_tab_animation_duration"
+                android:interpolator="@android:anim/decelerate_interpolator"
                 android:propertyName="translateY"
                 android:valueFrom="@integer/ms_warning_end_translate_y"
                 android:valueTo="0" />
diff --git a/material-stepper/src/main/res/drawable/ms_vector_circle_24dp.xml b/material-stepper/src/main/res/drawable/ms_vector_circle_24dp.xml
@@ -8,24 +8,10 @@
         android:name="icon_container"
         android:translateY="0">
 
-        <group
-            android:name="circle_group"
-            android:pivotX="12"
-            android:pivotY="12"
-            android:scaleX="1"
-            android:scaleY="1">
-
-            <path
-                android:name="circle"
-                android:fillAlpha="1"
-                android:fillColor="@android:color/black"
-                android:pathData="@string/ms_circle_path" />
-
-        </group>
-
         <path
+            android:name="icon"
             android:fillColor="@android:color/black"
-            android:pathData="@string/ms_warning_path" />
+            android:pathData="@string/ms_circle_path" />
 
     </group>
 
diff --git a/material-stepper/src/main/res/drawable/ms_vector_warning_24dp.xml b/material-stepper/src/main/res/drawable/ms_vector_warning_24dp.xml
@@ -8,22 +8,8 @@
         android:name="icon_container"
         android:translateY="@integer/ms_warning_end_translate_y">
 
-        <group
-            android:name="circle_group"
-            android:pivotX="12"
-            android:pivotY="12"
-            android:scaleX="@integer/ms_circle_start_scale"
-            android:scaleY="@integer/ms_circle_start_scale">
-
-            <path
-                android:name="circle"
-                android:fillAlpha="0"
-                android:fillColor="@android:color/black"
-                android:pathData="@string/ms_circle_path" />
-
-        </group>
-
         <path
+            android:name="icon"
             android:fillColor="@android:color/black"
             android:pathData="@string/ms_warning_path" />
 
diff --git a/material-stepper/src/main/res/values/numbers.xml b/material-stepper/src/main/res/values/numbers.xml
@@ -5,6 +5,4 @@
 
     <integer name="ms_warning_end_translate_y">2</integer>
 
-    <item name="ms_circle_start_scale" type="integer" format="float">0.5</item>
-
 </resources>
diff --git a/material-stepper/src/test/java/com/stepstone/stepper/StepperLayoutTest.kt b/material-stepper/src/test/java/com/stepstone/stepper/StepperLayoutTest.kt
@@ -205,6 +205,22 @@ class StepperLayoutTest {
         assertStepperLayout().hasBottomNavigationHidden()
     }
 
+    @Test
+    fun `Bottom navigation should be shown if set programmatically`() {
+        //given
+        val attributeSet = Robolectric.buildAttributeSet()
+                .addAttribute(R.attr.ms_stepperType, TYPE_TABS)
+                .addAttribute(R.attr.ms_showBottomNavigation, "false")
+                .build()
+        stepperLayout = createStepperLayoutInActivity(attributeSet)
+
+        //when
+        stepperLayout.setShowBottomNavigation(true)
+
+        //then
+        assertStepperLayout().hasBottomNavigationShown()
+    }
+
     fun createAttributeSetWithStepperType(stepperType: String): AttributeSet {
         return Robolectric.buildAttributeSet()
                 .addAttribute(R.attr.ms_stepperType, stepperType)

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,6 @@ task findbugs(type: FindBugs,`
`57`	`57`	`xml {`
`58`	`58`	`destination "$reportsDir/findbugs/findbugs.xml"`
`59`	`59`	`}`
`60`		`- html {`
`61`		`- destination "$reportsDir/findbugs/findbugs.html"`
`62`		`- }`
`63`	`60`	`}`
`64`	`61`
`65`	`62`	`classpath = files()`