Remove SVG & Add glide_slider_indicator_color

firdausmaulan · Aug 6, 2018 · fdf0f5f · fdf0f5f
1 parent c32f06f
commit fdf0f5f
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 181 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@
 .DS_Store
 /build
 /captures
-.externalNativeBuild
+.externalNativeBuild
+.idea/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.support_version = '27.0.2'
-    ext.glide_version = '4.6.1'
-    ext.androidsvg_version = '1.2.1'
+    ext.support_version = '27.1.1'
+    ext.glide_version = '4.7.1'
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
@@ -18,15 +17,12 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         mavenCentral()
         maven {
             url "https://jitpack.io"
         }
-        maven {
-            url 'https://maven.google.com'
-        }
-        google()
     }
 }
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,16 +1,14 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.firdausmaulan'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "$support_version"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 14
-        versionName "1.3.1"
+        versionCode 15
+        versionName "1.3.2"
     }
     buildTypes {
         release {
@@ -24,8 +22,8 @@ android {
 }
 
 dependencies {
+    //noinspection GradleCompatible
     implementation "com.android.support:appcompat-v7:$support_version"
     implementation "com.github.bumptech.glide:glide:$glide_version"
     annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"
-    implementation "com.caverock:androidsvg:$androidsvg_version"
 }
diff --git a/library/src/main/java/com/glide/slider/library/Indicators/PagerIndicator.java b/library/src/main/java/com/glide/slider/library/Indicators/PagerIndicator.java
@@ -7,6 +7,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.PagerAdapter;
 import android.util.AttributeSet;
 import android.view.View;
@@ -18,6 +19,7 @@
 import com.glide.slider.library.Tricks.ViewPagerEx;
 
 import java.util.ArrayList;
+import java.util.logging.Handler;
 
 /**
  * Pager Indicator.
@@ -67,9 +69,7 @@ public class PagerIndicator extends LinearLayout implements ViewPagerEx.OnPageCh
     public enum IndicatorVisibility {
         Visible,
         Invisible;
-    }
-
-    ;
+    };
 
     private GradientDrawable mUnSelectedGradientDrawable;
     private GradientDrawable mSelectedGradientDrawable;
@@ -102,7 +102,7 @@ public PagerIndicator(Context context, AttributeSet attrs) {
 
         mContext = context;
 
-        final TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.PagerIndicator, 0, 0);
+        TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.PagerIndicator, 0, 0);
 
         int visibility = attributes.getInt(R.styleable.PagerIndicator_visibility, IndicatorVisibility.Visible.ordinal());
 
@@ -127,8 +127,12 @@ public PagerIndicator(Context context, AttributeSet attrs) {
         mUserSetUnSelectedIndicatorResId = attributes.getResourceId(R.styleable.PagerIndicator_unselected_drawable,
                 0);
 
-        int mDefaultSelectedColor = attributes.getColor(R.styleable.PagerIndicator_selected_color, Color.rgb(255, 255, 255));
-        int mDefaultUnSelectedColor = attributes.getColor(R.styleable.PagerIndicator_unselected_color, Color.argb(33, 255, 255, 255));
+        int resColor = ContextCompat.getColor(context, R.color.glide_slider_indicator_color);
+        int r = Color.red(resColor);
+        int g = Color.green(resColor);
+        int b = Color.blue(resColor);
+        int mDefaultSelectedColor = attributes.getColor(R.styleable.PagerIndicator_selected_color, Color.rgb(r, g, b));
+        int mDefaultUnSelectedColor = attributes.getColor(R.styleable.PagerIndicator_unselected_color, Color.argb(33, r, g, b));
 
         float mDefaultSelectedWidth = attributes.getDimension(R.styleable.PagerIndicator_selected_width, (int) pxFromDp(6));
         float mDefaultSelectedHeight = attributes.getDimensionPixelSize(R.styleable.PagerIndicator_selected_height, (int) pxFromDp(6));

diff --git a/library/src/main/java/com/glide/slider/library/SliderLayout.java b/library/src/main/java/com/glide/slider/library/SliderLayout.java
@@ -544,7 +544,6 @@ public PagerIndicator.IndicatorVisibility getIndicatorVisibility() {
             return mIndicator.getIndicatorVisibility();
         }
         return PagerIndicator.IndicatorVisibility.Invisible;
-
     }
 
     /**

diff --git a/library/src/main/java/com/glide/slider/library/SliderTypes/TextSliderView.java b/library/src/main/java/com/glide/slider/library/SliderTypes/TextSliderView.java
@@ -5,8 +5,6 @@
 import android.support.v7.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.glide.slider.library.R;
 

diff --git a/library/src/main/java/com/glide/slider/library/svg/SvgDecoder.java b/library/src/main/java/com/glide/slider/library/svg/SvgDecoder.java
diff --git a/library/src/main/java/com/glide/slider/library/svg/SvgDrawableTranscoder.java b/library/src/main/java/com/glide/slider/library/svg/SvgDrawableTranscoder.java
diff --git a/library/src/main/java/com/glide/slider/library/svg/SvgModule.java b/library/src/main/java/com/glide/slider/library/svg/SvgModule.java
diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="glide_slider_indicator_color">#FFFFFF</color>
+</resources>