From 7285b525d91836432ba344ac4fd4169fa37480be Mon Sep 17 00:00:00 2001 From: Chiara Chiappini Date: Fri, 18 Oct 2024 15:41:30 +0100 Subject: [PATCH] remove unused dependencies --- .../wearable/composestarter/presentation/MainActivity.kt | 7 +++++-- ComposeStarter/gradle/libs.versions.toml | 1 - WearSpeakerSample/gradle/libs.versions.toml | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt b/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt index 57b03bf05..030ce1644 100644 --- a/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt +++ b/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt @@ -20,6 +20,7 @@ package com.example.android.wearable.composestarter.presentation import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.gestures.ScrollableDefaults import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -39,7 +40,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.wear.compose.foundation.ExperimentalWearFoundationApi import androidx.wear.compose.foundation.rememberActiveFocusRequester -import androidx.wear.compose.foundation.rotary.RotaryScrollableDefaults.behavior +import androidx.wear.compose.foundation.rotary.RotaryScrollableBehavior +import androidx.wear.compose.foundation.rotary.RotaryScrollableDefaults import androidx.wear.compose.foundation.rotary.rotaryScrollable import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Text @@ -64,6 +66,7 @@ import com.google.android.horologist.compose.material.Button import com.google.android.horologist.compose.material.Chip import com.google.android.horologist.compose.material.ListHeaderDefaults.firstItemPadding import com.google.android.horologist.compose.material.ResponsiveListHeader +import com.google.android.horologist.compose.rotaryinput.rememberRotaryHapticHandler /** * Simple "Hello, World" app meant as a starting point for a new project using Compose for Wear OS. @@ -125,7 +128,7 @@ fun GreetingScreen(greetingName: String, onShowList: () -> Unit) { .fillMaxSize() .verticalScroll(scrollState) .rotaryScrollable( - behavior(scrollableState = scrollState), + behavior = RotaryScrollableDefaults. behavior(scrollState), focusRequester = rememberActiveFocusRequester() ) .padding(padding), diff --git a/ComposeStarter/gradle/libs.versions.toml b/ComposeStarter/gradle/libs.versions.toml index 815ee6bd4..c6429d413 100644 --- a/ComposeStarter/gradle/libs.versions.toml +++ b/ComposeStarter/gradle/libs.versions.toml @@ -26,7 +26,6 @@ compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.2" -horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" } horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" } diff --git a/WearSpeakerSample/gradle/libs.versions.toml b/WearSpeakerSample/gradle/libs.versions.toml index 62c63b202..d5177846d 100644 --- a/WearSpeakerSample/gradle/libs.versions.toml +++ b/WearSpeakerSample/gradle/libs.versions.toml @@ -27,7 +27,6 @@ compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } desugar-jdk-libs = "com.android.tools:desugar_jdk_libs:2.1.2" -horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" } horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }