Remove getter and setter from ColorConverter.kt class and implement t…

…hem inside the model classes: RGBA, HSV, HSL, HWB, CMYK, HEX.
slaviboy · Apr 18, 2020 · d6aa319 · d6aa319
1 parent 2d6ce1d
commit d6aa319
Show file tree

Hide file tree

Showing 16 changed files with 504 additions and 906 deletions.
diff --git a/app/src/main/java/com/slaviboy/colorpickerkotlinexample/MainActivity.kt b/app/src/main/java/com/slaviboy/colorpickerkotlinexample/MainActivity.kt
@@ -94,7 +94,7 @@ class MainActivity : AppCompatActivity() {
  val r = range.random()
  val g = range.random()
  val b = range.random()
- colorConverter.setRGBA(r, g, b, (1..100).random())
+ colorConverter.rgba.setRGBA(r, g, b, (1..100).random())
  updater.updateViews()
 
  Log.i("color-picker", "$r, $g, $b")

diff --git a/colorpicker/src/main/java/com/slaviboy/colorpicker/ColorHolder.kt b/colorpicker/src/main/java/com/slaviboy/colorpicker/ColorHolder.kt
@@ -42,10 +42,10 @@ class ColorHolder(
  override fun onConvert(colorConverter: ColorConverter) {
 
  // get the channels red, green, blue and hue
- val r: Int = colorConverter.r
- val g: Int = colorConverter.g
- val b: Int = colorConverter.getB(ColorConverter.MODEL_RGBA)
- val h: Int = colorConverter.h
+ val r: Int = colorConverter.rgba.r
+ val g: Int = colorConverter.rgba.g
+ val b: Int = colorConverter.rgba.b
+ val h: Int = colorConverter.hsv.h
 
  // set selector fill color (color picker color)
  selectedColor = ColorConverter.RGBtoColor(r, g, b)