preventing excessive values.

Author: syslogic

README.md

@@ -8,7 +8,7 @@ The library is generally available on JitPack; either by version tag or `master-
 The JitPack repository URL would be: `maven { url 'https://jitpack.io' }`
 
     dependencies {
-        implementation "io.syslogic:androidx-colorpicker:1.1.6"
+        implementation "io.syslogic:androidx-colorpicker:1.1.7"
     }
 
 Alternatively, one can also check out the repository and depend on the local `:library` module:

build.gradle

@@ -1,7 +1,7 @@
 // Root project build.gradle
 buildscript {
     ext {
-        version_name = '1.1.6'
+        version_name = '1.1.7'
         version_code = 16
         compile_sdk = 34
         target_sdk = 34

library/build.gradle

@@ -7,6 +7,7 @@ plugins {
 }
 
 android {
+
     compileSdk compile_sdk
     namespace 'io.syslogic.colorpicker'
     defaultConfig {
@@ -16,25 +17,28 @@ android {
         targetSdk target_sdk
         minSdk min_sdk
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = 17
     }
+
     composeOptions {
+        // See the "Compose to Kotlin Compatibility Map" for compatible versions:
+        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
         kotlinCompilerExtensionVersion kotlin_compiler_extension_version
     }
-    packagingOptions {
-        resources.pickFirsts.add('META-INF/LGPL2.1')
-        resources.pickFirsts.add('META-INF/AL2.0')
-    }
+
     buildFeatures {
         buildConfig true
         dataBinding true
         compose true
     }
+
     buildTypes {
         debug {
             // it breaks the data-binding, eg. when running ./gradlew :library:publishToMavenLocal
@@ -45,13 +49,20 @@ android {
             minifyEnabled false
         }
     }
+
     lint {
         lintConfig file('../lint.xml')
         checkAllWarnings true
         warningsAsErrors true
         abortOnError false
         showAll false
     }
+
+    packagingOptions {
+        resources.pickFirsts.add('META-INF/LGPL2.1')
+        resources.pickFirsts.add('META-INF/AL2.0')
+    }
+
     publishing {
         singleVariant('release') {
             withSourcesJar()

library/src/main/java/io/syslogic/colorpicker/ColorPickerPreference.java

@@ -124,12 +124,10 @@ public boolean onPreferenceClick(@NonNull Preference preference) {
     public boolean onPreferenceChange(@NonNull Preference preference, @NonNull Object newValue) {
         this.mCurrentValue = Integer.parseInt(newValue.toString());
         this.setSummary(convertToARGB(this.mCurrentValue));
-        if (preference.getIcon() instanceof BitmapDrawable) {
-            BitmapDrawable drawable = (BitmapDrawable) preference.getIcon();
+        if (preference.getIcon() instanceof BitmapDrawable drawable) {
             drawable.setTintMode(PorterDuff.Mode.ADD);
             drawable.setTint(this.mCurrentValue);
-        } else if (preference.getIcon() instanceof VectorDrawable) {
-            VectorDrawable drawable = (VectorDrawable) preference.getIcon();
+        } else if (preference.getIcon() instanceof VectorDrawable drawable) {
             drawable.setTintMode(PorterDuff.Mode.ADD);
             drawable.setTint(this.mCurrentValue);
         } else if(mDebug) {
@@ -224,12 +222,11 @@ protected Parcelable onSaveInstanceState() {
 
     @Override
     protected void onRestoreInstanceState(@Nullable Parcelable state) {
-        if (!(state instanceof SavedState)) {
+        if (!(state instanceof SavedState myState)) {
             // didn't save state in onSaveInstanceState
             super.onRestoreInstanceState(state);
             return;
         }
-        SavedState myState = (SavedState) state;
         super.onRestoreInstanceState(myState.getSuperState());
     }
 

library/src/main/java/io/syslogic/colorpicker/ColorPickerView.java

@@ -411,20 +411,15 @@ public boolean onTrackballEvent(@NonNull MotionEvent event) {
     public boolean onTouchEvent(@NonNull MotionEvent event) {
         boolean update = false;
         switch (event.getAction()) {
-
-            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_DOWN -> {
                 mStartTouchPoint = new Point((int) event.getX(), (int) event.getY());
                 update = moveTrackersIfNeeded(event);
-                break;
-
-            case MotionEvent.ACTION_MOVE:
-                update = moveTrackersIfNeeded(event);
-                break;
-
-            case MotionEvent.ACTION_UP:
+            }
+            case MotionEvent.ACTION_MOVE -> update = moveTrackersIfNeeded(event);
+            case MotionEvent.ACTION_UP -> {
                 mStartTouchPoint = null;
                 update = moveTrackersIfNeeded(event);
-                break;
+            }
         }
 
         if (update) {

library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerComponent.kt

@@ -546,37 +546,53 @@ fun getChannelValue(color: Int, name: String): String {
 }
 
 /**
+ * Excessive values may occur and must be limited.
  * @param rect boundaries of the hue rectangle.
  * @param y the relative position on the y axis.
  * @return hue 0.0F to 360.0F.
  */
 private fun pointToHue(rect: RectF, y: Float): Float {
-    return 360f - y * 360f / rect.height()
+    val value = 360f - y * 360f / rect.height()
+    if (value <= 0f) {return 0f}
+    if (value >= 360f) {return 360f}
+    return value
 }
 
 /**
+ * Excessive values may occur and must be limited.
  * @param rect boundaries of the sat/val rectangle.
  * @param x the relative position on the x axis.
  * @return sat 0.0F to 1.0F.
  */
 private fun pointToSat(rect: RectF, x: Float): Float {
-    return 1f / rect.width() * x
+    val value = 1f / rect.width() * x
+    if (value <= 0f) {return 0f}
+    if (value >= 1f) {return 1f}
+    return value
 }
 
 /**
+ * Excessive values may occur and must be limited.
  * @param rect boundaries of the sat/val rectangle.
  * @param y the relative position on the x axis.
  * @return value 0.0F to 1.0F.
  */
 private fun pointToVal(rect: RectF, y: Float): Float {
-    return 1f - 1f / rect.height() * y
+    val value = 1f - 1f / rect.height() * y
+    if (value <= 0f) {return 0f}
+    if (value >= 1f) {return 1f}
+    return value
 }
 
 /**
+ * Excessive values may occur and must be limited.
  * @param rect boundaries of the alpha rectangle.
  * @param x the relative position on the x axis.
  * @return alpha 0.0F to 1.0F.
  */
 private fun pointToAlpha(rect: RectF, x: Float): Float {
-    return x / rect.width()
+    val value = x / rect.width()
+    if (value <= 0f) {return 0f}
+    if (value >= 1f) {return 1f}
+    return value
 }