Skip to content

Use the material3 pull-to-refresh instead of accompanist (3 commits: swap LoadingContent to PullToRefreshBox; drop the accompanist dependency and declare androidx.appcompat explicitly since it was only coming in transitively; remove the leftover ScrollChildSwipeRefreshLayout styleable) #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rootkiller6788 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use the material3 pull-to-refresh instead of accompanist (3 commits: swap LoadingContent to PullToRefreshBox; drop the accompanist dependency and declare androidx.appcompat explicitly since it was only coming in transitively; remove the leftover ScrollChildSwipeRefreshLayout styleable) #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49c7452
Switch LoadingContent over to the material3 pull-to-refresh
rootkiller6788 Sep 14, 2026
9f6d426
Drop the accompanist dependency
rootkiller6788 Sep 14, 2026
3283484
Remove the leftover ScrollChildSwipeRefreshLayout styleable
rootkiller6788 Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
15 changes: 9 additions & 6 deletions app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ComposeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -46,11 +48,12 @@ fun LoadingContent(
if (empty) {
emptyContent()
} else {
SwipeRefresh(
state = rememberSwipeRefreshState(loading),
PullToRefreshBox(
isRefreshing = loading,
onRefresh = onRefresh,
modifier = modifier,
content = content,
)
) {
content()
}
}
}
21 changes: 0 additions & 21 deletions app/src/main/res/values/attrs.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[versions]
accompanist = "0.36.0"
annotation = "1.9.1"
androidDesugarJdkLibs = "2.1.3"
androidGradlePlugin = "8.7.3"
Expand Down Expand Up @@ -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" }
Expand Down