update compose to 1.2.0-beta02 and gestures to 1.2.0

Author: SmartToolFactory

app/build.gradle

@@ -43,6 +43,7 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.smarttoolfactory.composematerialslider'
 }
 
 dependencies {

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.composematerialslider">
+<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.ComposeMaterialSlider">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Mar 14 14:21:27 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

slider/build.gradle

@@ -39,13 +39,14 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.smarttoolfactory.slider'
 }
 
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'
 
-    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.0.0'
+    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:1.2.0'
 
     // Jetpack Compose
     implementation "androidx.compose.ui:ui:$compose_version"

slider/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.slider">
+<manifest>
 
 </manifest>

slider/src/main/java/com/smarttoolfactory/slider/ColorfulIconSlider.kt

@@ -14,8 +14,6 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.platform.LocalDensity
@@ -200,7 +198,7 @@ fun ColorfulIconSlider(
                         scaleToUserValue(offsetInTrack),
                         Offset(rawOffset.value.coerceIn(trackStart, trackEnd), strokeRadius)
                     )
-                    it.consumeDownChange()
+                    it.consume()
                 }
             },
             onMove = {
@@ -211,14 +209,14 @@ fun ColorfulIconSlider(
                         scaleToUserValue(offsetInTrack),
                         Offset(rawOffset.value.coerceIn(trackStart, trackEnd), strokeRadius)
                     )
-                    it.consumePositionChange()
+                    it.consume()
                 }
 
             },
             onUp = {
                 if (enabled) {
                     onValueChangeFinished?.invoke()
-                    it.consumeDownChange()
+                    it.consume()
                 }
             }
         )

slider/src/main/java/com/smarttoolfactory/slider/ColorfulSlider.kt

@@ -15,8 +15,6 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.geometry.lerp
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.input.pointer.consumeDownChange
-import androidx.compose.ui.input.pointer.consumePositionChange
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.Dp
@@ -224,7 +222,7 @@ fun ColorfulSlider(
                         scaleToUserValue(offsetInTrack),
                         Offset(rawOffset.value.coerceIn(trackStart, trackEnd), strokeRadius)
                     )
-                    it.consumeDownChange()
+                    it.consume()
                 }
             },
             onMove = {
@@ -235,14 +233,14 @@ fun ColorfulSlider(
                         scaleToUserValue(offsetInTrack),
                         Offset(rawOffset.value.coerceIn(trackStart, trackEnd), strokeRadius)
                     )
-                    it.consumePositionChange()
+                    it.consume()
                 }
 
             },
             onUp = {
                 if (enabled) {
                     onValueChangeFinished?.invoke()
-                    it.consumeDownChange()
+                    it.consume()
                 }
             }
         )

slider/src/main/java/com/smarttoolfactory/slider/DimensionUtil.kt

@@ -8,7 +8,7 @@ package com.smarttoolfactory.slider
  * @param amount e closed unit interval [0, 1]
  */
 internal fun lerp(start: Float, end: Float, amount: Float): Float {
-    return (1 - amount) * start + amount * (end - start)
+    return (1 - amount) * start + amount * end
 }
 
 /**