Skip to content

Commit 7f5a7a5

Browse files
Merge pull request #13 from Ikuzzz/master
Change `Modifier.minimumTouchTargetSize()` to `Modifier.minimumInteractiveComponentSize()`
2 parents a3f6afc + 0bcdcb8 commit 7f5a7a5

File tree

6 files changed

+8
-68
lines changed

6 files changed

+8
-68
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ android {
3636
compose true
3737
}
3838
composeOptions {
39-
kotlinCompilerExtensionVersion compose_version
39+
kotlinCompilerExtensionVersion = "1.4.0"
4040
}
4141
packagingOptions {
4242
resources {

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
22
ext {
3-
compose_version = '1.3.0-beta01'
3+
compose_version = '1.4.0-alpha05'
44
}
55
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
66
plugins {
77
id 'com.android.application' version '7.2.2' apply false
88
id 'com.android.library' version '7.2.2' apply false
9-
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
9+
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
1010
}
1111

1212
task clean(type: Delete) {

slider/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ android {
3131
compose true
3232
}
3333
composeOptions {
34-
kotlinCompilerExtensionVersion compose_version
34+
kotlinCompilerExtensionVersion = "1.4.0"
3535
}
3636

3737
packagingOptions {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.foundation.Canvas
55
import androidx.compose.foundation.gestures.detectDragGestures
66
import androidx.compose.foundation.gestures.detectTapGestures
77
import androidx.compose.foundation.layout.*
8+
import androidx.compose.material.minimumInteractiveComponentSize
89
import androidx.compose.runtime.Composable
910
import androidx.compose.runtime.mutableStateOf
1011
import androidx.compose.runtime.remember
@@ -137,7 +138,7 @@ fun ColorfulIconSlider(
137138

138139
SliderComposeLayout(
139140
modifier = modifier
140-
.minimumTouchTargetSize()
141+
.minimumInteractiveComponentSize()
141142
.requiredSizeIn(
142143
minWidth = ThumbRadius * 2,
143144
minHeight = ThumbRadius * 2,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.gestures.detectDragGestures
77
import androidx.compose.foundation.gestures.detectTapGestures
88
import androidx.compose.foundation.layout.*
99
import androidx.compose.foundation.shape.CircleShape
10+
import androidx.compose.material.minimumInteractiveComponentSize
1011
import androidx.compose.runtime.*
1112
import androidx.compose.ui.Alignment
1213
import androidx.compose.ui.Modifier
@@ -167,7 +168,7 @@ fun ColorfulSlider(
167168
}
168169
BoxWithConstraints(
169170
modifier = modifier
170-
.minimumTouchTargetSize()
171+
.minimumInteractiveComponentSize()
171172
.requiredSizeIn(
172173
minWidth = ThumbRadius * 2,
173174
minHeight = ThumbRadius * 2

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

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)