From 4f9eb135633d0b27e833d37cab5cbd32dacea1c2 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Thu, 24 Feb 2022 20:25:07 +0100 Subject: [PATCH] Update Jetpack Compose --- settings.gradle.kts | 4 ++-- .../launcher2/ui/component/preferences/SliderPreference.kt | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9c8a063f..ee6bbc23 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -61,7 +61,7 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.2.0-alpha03") + version("androidx.compose", "1.2.0-alpha04") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") .versionRef("androidx.compose") @@ -94,7 +94,7 @@ dependencyResolutionManagement { .versionRef("androidx.compose") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha05") + .version("1.0.0-alpha06") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt index 7f4c135d..b4dead19 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt @@ -1,7 +1,7 @@ package de.mm20.launcher2.ui.component.preferences import androidx.compose.foundation.layout.* -import androidx.compose.material.Slider +import androidx.compose.material3.Slider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -11,11 +11,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import de.mm20.launcher2.ktx.ceilToInt import java.text.DecimalFormat import kotlin.math.floor import kotlin.math.log -import kotlin.math.pow import kotlin.math.roundToInt @Composable