update dependencies and compose version to 1.2.0-beta02

SmartToolFactory · SmartToolFactory · commit 7d5986c41238 · 2022-05-23T15:00:49.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,14 +43,15 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.smarttoolfactory.composecolorpicker'
 }
 
 dependencies {
 
     implementation project(':colorpicker')
 
-    implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.1'
-    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.0.0'
+    implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.2'
+    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.2.0'
     implementation 'com.github.SmartToolFactory:Compose-Extended-Colors:1.0.0-alpha07'
 
     // Jetpack Compose
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.smarttoolfactory.composecolorpicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -12,7 +11,6 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.ComposeColorPicker">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/smarttoolfactory/composecolorpicker/MainActivity.kt b/app/src/main/java/com/smarttoolfactory/composecolorpicker/MainActivity.kt
@@ -40,7 +40,6 @@ class MainActivity : ComponentActivity() {
 }
 
 @ExperimentalPagerApi
-@OptIn(ExperimentalAnimationApi::class)
 @Composable
 private fun HomeContent() {
 
@@ -82,7 +81,7 @@ private fun HomeContent() {
             2 -> GradientSelectionDemo()
             3 -> HexConversionDemo()
             4 -> SaturationSelectorDemo()
-           5 -> HSVHSLGradientDemo()
+            5 -> HSVHSLGradientDemo()
             else -> ColorfulSliderDemo()
         }
     }
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     ext {
-        compose_version = '1.2.0-alpha07'
+        compose_version = '1.2.0-beta02'
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.1.3' apply false
-    id 'com.android.library' version '7.1.3' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'com.android.application' version '7.2.0' apply false
+    id 'com.android.library' version '7.2.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }
 
 task clean(type: Delete) {
diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle
@@ -39,16 +39,18 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.smarttoolfactory.colorpicker'
 }
 
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'
 
-    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.0.0'
-    implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.1'
-    implementation 'com.github.SmartToolFactory:Compose-Screenshot:1.0.0'
+    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.2.0'
     implementation 'com.github.SmartToolFactory:Compose-Extended-Colors:1.0.0-alpha07'
+    implementation 'com.github.SmartToolFactory:Compose-Screenshot:1.0.3'
+    implementation 'com.github.SmartToolFactory:Compose-Color-Detector:1.0.0'
+    implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.2'
 
     // Jetpack Compose
     implementation "androidx.compose.ui:ui:$compose_version"
diff --git a/colorpicker/src/main/AndroidManifest.xml b/colorpicker/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.smarttoolfactory.colorpicker">
+<manifest>
 
 </manifest>
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorCircleHueSaturation.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorCircleHueSaturation.kt
@@ -8,8 +8,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import com.smarttoolfactory.colorpicker.ui.gradientColorScaleHSVReversed
@@ -80,7 +78,7 @@ fun SelectorCircleHueSaturationHSV(
                         val hueChange = calculateAngleFomLocalCoordinates(center, position)
                         val saturationChange = (distance / radius).coerceIn(0f, 1f)
                         onChange(hueChange, saturationChange)
-                        it.consumeDownChange()
+                        it.consume()
                     }
 
                 },
@@ -94,13 +92,13 @@ fun SelectorCircleHueSaturationHSV(
 
                         val saturationChange = (distance / radius).coerceIn(0f, 1f)
                         onChange(hueChange, saturationChange)
-                        it.consumePositionChange()
+                        it.consume()
                     }
 
                 },
                 onUp = {
                     if (isTouched) {
-                        it.consumeDownChange()
+                        it.consume()
                     }
                     isTouched = false
 
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorDiamondSaturationLightness.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorDiamondSaturationLightness.kt
@@ -15,8 +15,6 @@ import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
@@ -249,7 +247,7 @@ private fun SelectorDiamond(
                         // lightness increases while going up but android drawing system is opposite
                         onChange(posXInPercent, 1 - posYInPercent)
                     }
-                    it.consumeDownChange()
+                    it.consume()
 
                 },
                 onMove = {
@@ -266,11 +264,11 @@ private fun SelectorDiamond(
                         // lightness increases while going up but android drawing system is opposite
                         onChange(posXInPercent, 1 - posYInPercent)
                     }
-                    it.consumePositionChange()
+                    it.consume()
                 },
                 onUp = {
                     isTouched = false
-                    it.consumeDownChange()
+                    it.consume()
                 }
             )
 
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRectHueLightnessValue.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRectHueLightnessValue.kt
@@ -7,8 +7,6 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import com.smarttoolfactory.colorpicker.ui.brush.transparentToBlackVerticalGradient
@@ -256,7 +254,7 @@ private fun SelectorRect(
                         (1 - (position.y / height)).coerceIn(0f, 1f)
                     }
                     onChange(hueChange, propertyChange)
-                    it.consumeDownChange()
+                    it.consume()
 
                 },
                 onMove = {
@@ -268,7 +266,7 @@ private fun SelectorRect(
                         (1 - (position.y / height)).coerceIn(0f, 1f)
                     }
                     onChange(hueChange, propertyChange)
-                    it.consumePositionChange()
+                    it.consume()
                 },
                 delayAfterDownInMillis = 20
             )
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRectSaturationLightnessValue.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRectSaturationLightnessValue.kt
@@ -8,8 +8,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import com.smarttoolfactory.colorpicker.model.ColorModel
@@ -139,15 +137,15 @@ private fun SelectorRect(
                     val saturationChange = (position.x / width).coerceIn(0f, 1f)
                     val valueChange = (1 - (position.y / height)).coerceIn(0f, 1f)
                     onChange(saturationChange, valueChange)
-                    it.consumeDownChange()
+                    it.consume()
 
                 },
                 onMove = {
                     val position = it.position
                     val saturationChange = (position.x / width).coerceIn(0f, 1f)
                     val valueChange = (1 - (position.y / height)).coerceIn(0f, 1f)
                     onChange(saturationChange, valueChange)
-                    it.consumePositionChange()
+                    it.consume()
                 },
                 delayAfterDownInMillis = 20
             )
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRingHue.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/selector/SelectorRingHue.kt
@@ -10,8 +10,6 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.drawscope.withTransform
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.layout.*
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
@@ -74,7 +72,7 @@ fun SelectorRingHue(
         val coerced = hue.coerceIn(0f, 360f)
 
         /**
-         * Circle selector radius for setting [angle] which sets hue
+         * Circle selector radius for setting **angle** which sets hue
          */
         val selectorRadius =
             if (selectionRadius == Dp.Unspecified)
@@ -93,7 +91,7 @@ fun SelectorRingHue(
                     if (isTouched) {
                         angle = calculateAngleFomLocalCoordinates(center, position)
                         onChange(angle)
-                        it.consumeDownChange()
+                        it.consume()
                     }
 
                 },
@@ -102,13 +100,13 @@ fun SelectorRingHue(
                         val position = it.position
                         angle = calculateAngleFomLocalCoordinates(center, position)
                         onChange(angle)
-                        it.consumePositionChange()
+                        it.consume()
                     }
 
                 },
                 onUp = {
                     if (isTouched) {
-                        it.consumeDownChange()
+                        it.consume()
                     }
                     isTouched = false
 
diff --git a/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/util/DimensionUtil.kt b/colorpicker/src/main/java/com/smarttoolfactory/colorpicker/util/DimensionUtil.kt
@@ -11,7 +11,7 @@ import kotlin.math.*
  * @param amount e closed unit interval [0, 1]
  */
 fun lerp(start: Float, end: Float, amount: Float): Float {
-    return (1 - amount) * start + amount * (end - start)
+    return (1 - amount) * start + amount * end
 }
 
 /**
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Mar 09 09:44:35 TRT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,15 @@ android {`
`43`	`43`	`excludes += '/META-INF/{AL2.0,LGPL2.1}'`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+ namespace 'com.smarttoolfactory.composecolorpicker'`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`dependencies {`
`49`	`50`
`50`	`51`	`implementation project(':colorpicker')`
`51`	`52`
`52`		`- implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.1'`
`53`		`- implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.0.0'`
	`53`	`+ implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.2'`
	`54`	`+ implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.2.0'`
`54`	`55`	`implementation 'com.github.SmartToolFactory:Compose-Extended-Colors:1.0.0-alpha07'`
`55`	`56`
`56`	`57`	`// Jetpack Compose`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ class MainActivity : ComponentActivity() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@ExperimentalPagerApi`
`43`		`-@OptIn(ExperimentalAnimationApi::class)`
`44`	`43`	`@Composable`
`45`	`44`	`private fun HomeContent() {`
`46`	`45`
`@@ -82,7 +81,7 @@ private fun HomeContent() {`
`82`	`81`	`2 -> GradientSelectionDemo()`
`83`	`82`	`3 -> HexConversionDemo()`
`84`	`83`	`4 -> SaturationSelectorDemo()`
`85`		`- 5 -> HSVHSLGradientDemo()`
	`84`	`+ 5 -> HSVHSLGradientDemo()`
`86`	`85`	`else -> ColorfulSliderDemo()`
`87`	`86`	`}`
`88`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,16 +39,18 @@ android {`
`39`	`39`	`excludes += '/META-INF/{AL2.0,LGPL2.1}'`
`40`	`40`	`}`
`41`	`41`	`}`
	`42`	`+ namespace 'com.smarttoolfactory.colorpicker'`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`dependencies {`
`45`	`46`
`46`	`47`	`implementation 'androidx.core:core-ktx:1.7.0'`
`47`	`48`
`48`		`- implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.0.0'`
`49`		`- implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.1'`
`50`		`- implementation 'com.github.SmartToolFactory:Compose-Screenshot:1.0.0'`
	`49`	`+ implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.2.0'`
`51`	`50`	`implementation 'com.github.SmartToolFactory:Compose-Extended-Colors:1.0.0-alpha07'`
	`51`	`+ implementation 'com.github.SmartToolFactory:Compose-Screenshot:1.0.3'`
	`52`	`+ implementation 'com.github.SmartToolFactory:Compose-Color-Detector:1.0.0'`
	`53`	`+ implementation 'com.github.SmartToolFactory:Compose-Colorful-Sliders:1.0.2'`
`52`	`54`
`53`	`55`	`// Jetpack Compose`
`54`	`56`	`implementation "androidx.compose.ui:ui:$compose_version"`