fixed issue of default color accent to checkbox images. it was not wo…

…rking with pre lollipop devices.
vansikrishna · Mar 6, 2017 · 2be334b · 2be334b
1 parent 39bf5a7
commit 2be334b
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,10 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
+        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.0'
-
+        classpath 'io.fabric.tools:gradle:1.+'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/example/build.gradle b/example/build.gradle
@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion 24
     buildToolsVersion "25.0.0"
 
     defaultConfig {
         applicationId "com.vlk.multimager.example"
-        minSdkVersion 19
+        minSdkVersion 17
         targetSdkVersion 24
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -25,6 +26,8 @@ android {
 allprojects {
     repositories {
         maven { url "https://jitpack.io" }
+        mavenCentral()
+        maven { url 'https://maven.fabric.io/public' }
     }
 }
 
@@ -37,6 +40,9 @@ dependencies {
     compile('com.github.QuadFlask:colorpicker:0.0.10@aar') {
         transitive = true;
     }
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
+        transitive = true;
+    }
     testCompile 'junit:junit:4.12'
     compile project(path: ':lib')
 }
diff --git a/example/fabric.properties b/example/fabric.properties
@@ -0,0 +1,3 @@
+#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
+#Mon Mar 06 11:55:21 IST 2017
+apiSecret=08862ee8c8cad7ce97da471d4b6ba49d16f9bf13840f964b1b25a55663f0f49a
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.vlk.multimager.example">
-
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -14,6 +14,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="d4f9088ec85f115eeba7c8499e34061bd168f69f" />
     </application>
 
 </manifest>
diff --git a/example/src/main/java/com/vlk/multimager/example/SampleActivity.java b/example/src/main/java/com/vlk/multimager/example/SampleActivity.java
@@ -20,6 +20,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.crashlytics.android.Crashlytics;
 import com.flask.colorpicker.ColorPickerView;
 import com.flask.colorpicker.OnColorSelectedListener;
 import com.flask.colorpicker.builder.ColorPickerClickListener;
@@ -38,6 +39,7 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.fabric.sdk.android.Fabric;
 
 /**
  * Created by vansikrishna on 08/06/2016.
@@ -70,9 +72,18 @@ public class SampleActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sample);
+        Fabric.with(this, new Crashlytics());
         ButterKnife.bind(this);
         selectedColor = fetchAccentColor();
         darkenedColor = Utils.getDarkColor(selectedColor);
+        Utils.setViewsColorStateList(selectedColor, darkenedColor,
+                customThemeButton,
+                multiCaptureButton,
+                multiPickerButton,
+                callImageView,
+                messageImageView,
+                contactUsTextView,
+                appNameTextView);
     }
 
     private int fetchAccentColor() {

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion 23
@@ -7,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 4
-        versionName "1.0.3"
+        versionCode 5
+        versionName "1.0.4"
     }
     buildTypes {
         release {
@@ -18,11 +19,19 @@ android {
     }
 }
 
+repositories {
+    mavenCentral()
+    maven { url 'https://maven.fabric.io/public' }
+}
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support:support-v13:23.4.0'
     compile 'com.android.support:design:23.4.0'
     compile 'com.android.support:support-annotations:24.2.1'
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
+        transitive = true;
+    }
 }
diff --git a/lib/fabric.properties b/lib/fabric.properties
@@ -0,0 +1,3 @@
+#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
+#Fri Mar 03 15:38:49 IST 2017
+apiSecret=08862ee8c8cad7ce97da471d4b6ba49d16f9bf13840f964b1b25a55663f0f49a
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-feature
         android:name="android.hardware.camera.flash"
         android:required="false" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:label="@string/app_name"
         android:supportsRtl="true">
@@ -23,6 +24,9 @@
             android:theme="@style/MultimagerTheme.NoActionBar"
             android:screenOrientation="portrait">
         </activity>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="d4f9088ec85f115eeba7c8499e34061bd168f69f" />
     </application>
 
 </manifest>
diff --git a/lib/src/main/java/com/vlk/multimager/activities/BaseActivity.java b/lib/src/main/java/com/vlk/multimager/activities/BaseActivity.java
@@ -10,11 +10,14 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 
+import com.crashlytics.android.Crashlytics;
 import com.vlk.multimager.views.CustomProgressDialog;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import io.fabric.sdk.android.Fabric;
+
 /**
  * Created by vansikrishna on 08/06/2016.
  */
@@ -27,6 +30,7 @@ public class BaseActivity extends AppCompatActivity{
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Fabric.with(this, new Crashlytics());
     }
 
     public void showProgressDialog(String message){

diff --git a/lib/src/main/java/com/vlk/multimager/utils/Utils.java b/lib/src/main/java/com/vlk/multimager/utils/Utils.java
@@ -125,12 +125,15 @@ public static void setViewsColorStateList(View view, int normalColor, int darken
     }
 
     public static void setViewsColorStateList(int normalColor, int darkenedColor, View... views) {
-        int[][] states = new int[][] {new int[] { android.R.attr.state_enabled}, new int[] { android.R.attr.state_pressed}};
+        int[][] states = new int[][] {new int[0] , new int[] { android.R.attr.state_pressed}};
         int[] colors = new int[]{normalColor, darkenedColor};
         ColorStateList colorStateList = new ColorStateList(states, colors);
         for (View view : views) {
             if(view instanceof AppCompatButton){
-                ((AppCompatButton)view).setSupportBackgroundTintList(colorStateList);
+                if(Build.VERSION.SDK_INT >= 21)
+                    ((AppCompatButton)view).setBackgroundTintList(colorStateList);
+                else
+                    ((AppCompatButton)view).setSupportBackgroundTintList(colorStateList);
             }
             if(view instanceof AppCompatImageView){
                 ((AppCompatImageView)view).setColorFilter(normalColor);
@@ -139,7 +142,6 @@ public static void setViewsColorStateList(int normalColor, int darkenedColor, Vi
                 ((AppCompatTextView)view).setTextColor(normalColor);
             }
         }
-
     }
 
     public static int getDarkColor(int color){

diff --git a/lib/src/main/res/drawable/action_button_bg.xml b/lib/src/main/res/drawable/action_button_bg.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval"
     android:useLevel="false">
-    <solid android:color="?attr/colorAccent" />
+    <!--<solid android:color="?attr/colorAccent" />-->
     <size
         android:width="@dimen/margin_56"
         android:height="@dimen/margin_56" />

diff --git a/lib/src/main/res/drawable/checked_button_bg.xml b/lib/src/main/res/drawable/checked_button_bg.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:shape="oval"
     android:useLevel="false">
     <padding android:left="@dimen/margin_2"
         android:right="@dimen/margin_2"
         android:top="@dimen/margin_2"
         android:bottom="@dimen/margin_2"/>
-    <solid android:color="?attr/colorAccent" />
+    <!--<solid android:color="?attr:colorAccent" />-->
     <size
         android:width="@dimen/margin_32"
         android:height="@dimen/margin_32" />