Merge pull request #8 from mutualmobile/development

Development

Author: Tushar-Acharya

README.md

@@ -26,7 +26,7 @@ Sample app APK - https://github.com/mutualmobile/CardStackUI/releases
 ```
 dependencies {
     ...
-    compile 'com.mutualmobile.android:cardstack:0.1'
+    compile 'com.mutualmobile.android:cardstack:0.2'
 }
 ```
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha7'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
 

cardstack/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray'
 def siteUrl = 'https://github.com/mutualmobile/CardStackUI'
 def gitUrl = 'https://github.com/mutualmobile/CardStackUI.git'
 group = "com.mutualmobile.android"
-version = "0.1"
+version = "0.2"
 
 android {
     compileSdkVersion 23
@@ -14,7 +14,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 1
+        versionCode 2
         versionName version
     }
     buildTypes {
@@ -74,7 +74,7 @@ artifacts {
     archives sourcesJar
 }
 
-/* Fails in CI, un-comment only to deploy new binaries to Bintray
+// Fails in CI, un-comment only to deploy new binaries to Bintray
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
@@ -95,5 +95,4 @@ bintray {
         publicDownloadNumbers = true
     }
 }
-apply plugin: 'maven'
-*/
+apply plugin: 'maven'

cardstack/src/main/java/com/mutualmobile/cardstack/CardStackLayout.java

@@ -43,22 +43,28 @@ public CardStackLayout(Context context, AttributeSet attrs) {
     }
 
     public CardStackLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
+        super(context, attrs, defStyleAttr);
+        handleArgs(context, attrs, defStyleAttr, 0);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public CardStackLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        handleArgs(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    private void handleArgs(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         resetDefaults();
+
         final TypedArray a = context.getTheme().obtainStyledAttributes(
                 attrs, R.styleable.CardStackLayout, defStyleAttr, defStyleRes);
         mParallaxEnabled = a.getBoolean(R.styleable.CardStackLayout_parallax_enabled, PARALLAX_ENABLED_DEFAULT);
         mShowInitAnimation = a.getBoolean(R.styleable.CardStackLayout_showInitAnimation, SHOW_INIT_ANIMATION_DEFAULT);
         mParallaxScale = a.getInteger(R.styleable.CardStackLayout_parallax_scale, getResources().getInteger(R.integer.parallax_scale_default));
         mCardGap = a.getDimension(R.styleable.CardStackLayout_card_gap, getResources().getDimension(R.dimen.card_gap));
         mCardGapBottom = a.getDimension(R.styleable.CardStackLayout_card_gap_bottom, getResources().getDimension(R.dimen.card_gap_bottom));
-        a.recycle();
 
+        a.recycle();
     }
 
     public CardStackAdapter getAdapter() {