#18 setColorSeeds(int[] colors) not working

rtugeek · Oct 31, 2017 · 3749d42 · 3749d42
1 parent 3217d2b
commit 3749d42
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@
 .idea/**/dataSources.local.xml
 .idea/**/sqlDataSources.xml
 .idea/**/dynamic.xml
+.idea/misc.xml
 .idea/**/uiDesigner.xml
 
 # Gradle:

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.1'
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "com.rtugeek.android.colorseekbardemo"
         minSdkVersion 9
         targetSdkVersion 23
-        versionCode 2
-        versionName "1.2.2"
+        versionCode 3
+        versionName "1.5.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/rtugeek/android/colorseekbardemo/MainActivity.java b/app/src/main/java/com/rtugeek/android/colorseekbardemo/MainActivity.java
@@ -1,24 +1,28 @@
 package com.rtugeek.android.colorseekbardemo;
 
 import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Handler;
+import android.support.v4.graphics.ColorUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.rtugeek.android.colorseekbar.ColorSeekBar;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
     private ColorSeekBar mColorSeekBar;
     private SharedPreferences sp;
     private SharedPreferences.Editor spe;
     private static final String TAG = "ColorSeekBar";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -32,7 +36,6 @@ protected void onCreate(Bundle savedInstanceState) {
         final CheckBox showAlphaCheckBox = (CheckBox) findViewById(R.id.checkBox);
         final SeekBar barHeightSeekBar = (SeekBar) findViewById(R.id.seekBar);
         final SeekBar thumbHeightSeekBar = (SeekBar) findViewById(R.id.seekBar2);
-
 //        mColorSeekBar.setAlphaBarPosition(10);
 //        mColorSeekBar.setBarMargin(10);
 //        mColorSeekBar.setBarHeight(5);
@@ -43,7 +46,6 @@ protected void onCreate(Bundle savedInstanceState) {
         mColorSeekBar.setMaxPosition(100);
         mColorSeekBar.setShowAlphaBar(true);
         mColorSeekBar.setThumbHeight(30);
-        mColorSeekBar.setColorSeeds(R.array.material_colors);
 
         mColorSeekBar.setOnInitDoneListener(new ColorSeekBar.OnInitDoneListener() {
             @Override

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -24,11 +24,10 @@
 
     <com.rtugeek.android.colorseekbar.ColorSeekBar
         android:id="@+id/colorSlider"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textView"
         android:layout_margin="6dp"
-        app:isVertical="false"
         app:colorSeeds="@array/material_colors" />
 
     <CheckBox

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/colorseekbar/build.gradle b/colorseekbar/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.1'
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 23
-        versionCode 3
-        versionName "1.4.3"
+        versionCode 4
+        versionName "1.5.1"
     }
     buildTypes {
         release {

diff --git a/colorseekbar/src/main/java/com/rtugeek/android/colorseekbar/ColorSeekBar.java b/colorseekbar/src/main/java/com/rtugeek/android/colorseekbar/ColorSeekBar.java
@@ -519,9 +519,8 @@ public void setColorSeeds(@ArrayRes int resId) {
 
     public void setColorSeeds(int[] colors) {
         mColorSeeds = colors;
+        init();
         invalidate();
-        cacheColors();
-        setAlphaValue();
         if (mOnColorChangeLister != null)
             mOnColorChangeLister.onColorChangeListener(mColorBarPosition, mAlphaBarPosition, getColor());
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 21 08:35:46 CST 2017
+#Tue Oct 31 21:08:40 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip