Merge pull request #184 from side-codes/develop

Release v0.6.1

Author: smelfungus

README.md

@@ -21,7 +21,7 @@
 Gradle dependency:
 
 ```gradle
-implementation "codes.side:andcolorpicker:0.5.0"
+implementation "codes.side:andcolorpicker:0.6.1"
 ```
 
 ## :art: Picker types

andcolorpicker/build.gradle

@@ -1,11 +1,18 @@
 plugins {
-  id "com.github.ben-manes.versions" version "0.35.0"
+  id "com.github.ben-manes.versions" version "0.38.0"
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-android-extensions"
-apply plugin: "com.novoda.bintray-release"
+
+ext {
+  PUBLISH_GROUP_ID = "codes.side"
+  PUBLISH_VERSION = "0.6.1"
+  PUBLISH_ARTIFACT_ID = "andcolorpicker"
+}
+
+apply from: "${rootProject.projectDir}/scripts/publish-mavencentral.gradle"
 
 android {
   compileSdkVersion 30
@@ -14,8 +21,8 @@ android {
   defaultConfig {
     minSdkVersion 19
     targetSdkVersion 30
-    versionCode 1
-    versionName "1.0"
+    versionCode 7
+    versionName "0.6.1"
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     consumerProguardFiles "consumer-rules.pro"
@@ -35,24 +42,11 @@ dependencies {
   implementation fileTree(dir: "libs", include: ["*.jar"])
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-  implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
-  implementation "androidx.core:core-ktx:1.5.0-alpha04"
+  implementation "androidx.appcompat:appcompat:1.3.0-rc01"
+  implementation "androidx.core:core-ktx:1.6.0-alpha02"
   implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-  testImplementation "junit:junit:4.13.1"
+  testImplementation "junit:junit:4.13.2"
   androidTestImplementation "androidx.test.ext:junit:1.1.2"
   androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
 }
-
-publish {
-  def groupProjectID = "codes.side"
-  def artifactProjectID = "andcolorpicker"
-  def publishVersionID = "0.5.0"
-  userOrg = "side-codes"
-  repoName = "andColorPicker"
-  groupId = groupProjectID
-  artifactId = artifactProjectID
-  publishVersion = publishVersionID
-  desc = "Handy, flexible and lightning-fast material color picker view components for Android"
-  website = "https://github.com/side-codes/andColorPicker"
-}

andcolorpicker/src/main/java/codes/side/andcolorpicker/alpha/AlphaColorPickerSeekBar.kt

@@ -21,14 +21,15 @@ abstract class AlphaColorPickerSeekBar<C : Color> @JvmOverloads constructor(
   colorFactory: ColorFactory<C>,
   context: Context,
   attrs: AttributeSet? = null,
-  defStyle: Int = androidx.appcompat.R.attr.seekBarStyle
+  defStyle: Int = R.attr.seekBarStyle
 ) :
   ColorSeekBar<C>(
     colorFactory,
     context,
     attrs,
     defStyle
   ) {
+
   // TODO: Handle rounded corners
   override fun onSetupProgressDrawableLayers(layers: Array<Drawable>): Array<Drawable> {
     val layerList = layers.toMutableList()

andcolorpicker/src/main/java/codes/side/andcolorpicker/alpha/HSLAlphaColorPickerSeekBar.kt

@@ -2,16 +2,16 @@ package codes.side.andcolorpicker.alpha
 
 import android.content.Context
 import android.util.AttributeSet
+import codes.side.andcolorpicker.R
 import codes.side.andcolorpicker.converter.IntegerHSLColorConverter
 import codes.side.andcolorpicker.model.IntegerHSLColor
 import codes.side.andcolorpicker.model.factory.HSLColorFactory
-import codes.side.andcolorpicker.view.picker.ColorSeekBar
 
 // TODO: Add modes support
 class HSLAlphaColorPickerSeekBar @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
-  defStyle: Int = androidx.appcompat.R.attr.seekBarStyle
+  defStyle: Int = R.attr.seekBarStyle
 ) :
   AlphaColorPickerSeekBar<IntegerHSLColor>(
     HSLColorFactory(),
@@ -45,7 +45,7 @@ class HSLAlphaColorPickerSeekBar @JvmOverloads constructor(
     max = IntegerHSLColor.Component.A.maxValue
   }
 
-  override fun onRefreshProgressFromColor(color: IntegerHSLColor): Int? {
+  override fun onRefreshProgressFromColor(color: IntegerHSLColor): Int {
     return color.intA
   }
 
@@ -58,35 +58,4 @@ class HSLAlphaColorPickerSeekBar @JvmOverloads constructor(
       false
     }
   }
-
-  interface OnColorPickListener :
-    ColorSeekBar.OnColorPickListener<HSLAlphaColorPickerSeekBar, IntegerHSLColor>
-
-  open class DefaultOnColorPickListener : OnColorPickListener {
-    override fun onColorPicking(
-      picker: HSLAlphaColorPickerSeekBar,
-      color: IntegerHSLColor,
-      value: Int,
-      fromUser: Boolean
-    ) {
-
-    }
-
-    override fun onColorPicked(
-      picker: HSLAlphaColorPickerSeekBar,
-      color: IntegerHSLColor,
-      value: Int,
-      fromUser: Boolean
-    ) {
-
-    }
-
-    override fun onColorChanged(
-      picker: HSLAlphaColorPickerSeekBar,
-      color: IntegerHSLColor,
-      value: Int
-    ) {
-
-    }
-  }
 }

andcolorpicker/src/main/java/codes/side/andcolorpicker/cmyk/CMYKColorPickerSeekBar.kt

@@ -17,23 +17,14 @@ import codes.side.andcolorpicker.view.picker.GradientColorSeekBar
 class CMYKColorPickerSeekBar @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null,
-  defStyle: Int = androidx.appcompat.R.attr.seekBarStyle
+  defStyle: Int = R.attr.seekBarStyle
 ) :
   GradientColorSeekBar<IntegerCMYKColor>(
     CMYKColorFactory(),
     context,
     attrs,
     defStyle
   ) {
-  companion object {
-    private const val TAG = "CMYKColorPickerSeekBar"
-
-    private val DEFAULT_MODE = Mode.MODE_C
-    private val DEFAULT_COLORING_MODE = ColoringMode.PURE_COLOR
-
-    // TODO: Make configurable
-    private const val COERCE_AT_LEAST_COMPONENT = 15
-  }
 
   override val colorConverter: IntegerCMYKColorConverter
     get() = super.colorConverter as IntegerCMYKColorConverter
@@ -324,4 +315,12 @@ class CMYKColorPickerSeekBar @JvmOverloads constructor(
       )
     ),
   }
+
+  companion object {
+    private val DEFAULT_MODE = Mode.MODE_C
+    private val DEFAULT_COLORING_MODE = ColoringMode.PURE_COLOR
+
+    // TODO: Make configurable
+    private const val COERCE_AT_LEAST_COMPONENT = 15
+  }
 }

andcolorpicker/src/main/java/codes/side/andcolorpicker/converter/ColorConverter.kt

@@ -4,6 +4,7 @@ import androidx.annotation.ColorInt
 import codes.side.andcolorpicker.model.Color
 
 interface ColorConverter {
+
   @ColorInt
   fun convertToOpaqueColorInt(color: Color): Int
 

andcolorpicker/src/main/java/codes/side/andcolorpicker/converter/ColorConverterHub.kt

@@ -3,6 +3,7 @@ package codes.side.andcolorpicker.converter
 import codes.side.andcolorpicker.model.ColorKey
 
 object ColorConverterHub {
+
   private val map = hashMapOf<ColorKey, ColorConverter>()
 
   init {

andcolorpicker/src/main/java/codes/side/andcolorpicker/converter/IntegerCMYKColorConverter.kt

@@ -4,6 +4,7 @@ import codes.side.andcolorpicker.model.Color
 import codes.side.andcolorpicker.model.IntegerCMYKColor
 
 class IntegerCMYKColorConverter : ColorConverter {
+
   override fun convertToOpaqueColorInt(color: Color): Int {
     TODO("Not yet implemented")
   }

andcolorpicker/src/main/java/codes/side/andcolorpicker/converter/IntegerHSLColorConverter.kt

@@ -7,7 +7,9 @@ import codes.side.andcolorpicker.model.IntegerHSLColor
 
 // Should it be generic?
 class IntegerHSLColorConverter : ColorConverter {
+
   private val convertToColorIntHSLCache = FloatArray(3)
+
   override fun convertToOpaqueColorInt(color: Color): Int {
     require(color is IntegerHSLColor) { "Unsupported color type supplied" }
 

andcolorpicker/src/main/java/codes/side/andcolorpicker/converter/IntegerLABColorConverter.kt

@@ -5,6 +5,7 @@ import codes.side.andcolorpicker.model.Color
 import codes.side.andcolorpicker.model.IntegerLABColor
 
 class IntegerLABColorConverter : ColorConverter {
+
   override fun convertToOpaqueColorInt(color: Color): Int {
     TODO("Not yet implemented")
   }