diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 64ede2fbb..31ceb22d8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -112,6 +112,7 @@ dependencies { // App dependencies implementation(libs.androidx.annotation) + implementation(libs.androidx.appcompat) implementation(libs.kotlinx.coroutines.android) implementation(libs.timber) implementation(libs.androidx.test.espresso.idling.resources) @@ -142,8 +143,6 @@ dependencies { implementation(libs.androidx.navigation.compose) implementation(libs.androidx.lifecycle.runtimeCompose) implementation(libs.androidx.lifecycle.viewModelCompose) - implementation(libs.accompanist.appcompat.theme) - implementation(libs.accompanist.swiperefresh) debugImplementation(composeBom) debugImplementation(libs.androidx.compose.ui.tooling.core) diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ComposeUtils.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ComposeUtils.kt index 84d641712..fbad347c8 100644 --- a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ComposeUtils.kt +++ b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ComposeUtils.kt @@ -14,13 +14,15 @@ * limitations under the License. */ +@file:OptIn(ExperimentalMaterial3Api::class) + package com.example.android.architecture.blueprints.todoapp.util +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.pulltorefresh.PullToRefreshBox import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import com.google.accompanist.swiperefresh.SwipeRefresh -import com.google.accompanist.swiperefresh.rememberSwipeRefreshState val primaryDarkColor: Color = Color(0xFF263238) @@ -46,11 +48,12 @@ fun LoadingContent( if (empty) { emptyContent() } else { - SwipeRefresh( - state = rememberSwipeRefreshState(loading), + PullToRefreshBox( + isRefreshing = loading, onRefresh = onRefresh, modifier = modifier, - content = content, - ) + ) { + content() + } } } diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index 824764515..000000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af9da79dd..c7ab0fbc3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,4 @@ [versions] -accompanist = "0.36.0" annotation = "1.9.1" androidDesugarJdkLibs = "2.1.3" androidGradlePlugin = "8.7.3" @@ -59,11 +58,6 @@ truth = "1.4.4" turbine = "0.12.1" [libraries] -accompanist-appcompat-theme = { group = "com.google.accompanist", name = "accompanist-appcompat-theme", version.ref = "accompanist" } -accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" } -accompanist-swiperefresh = { group = "com.google.accompanist", name = "accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" } -accompanist-testharness = { group = "com.google.accompanist", name = "accompanist-testharness", version.ref = "accompanist" } android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }