Merge pull request #1

Migrate from SwipeRefresh to PullToRefreshBox for better Material 3 integration android#955
shahrukhahmed94 · Jan 6, 2025 · 55558ba · 55558ba
2 parents ff2046b + 12734b1
commit 55558ba
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.kotlin/sessions/kotlin-compiler-18309537381016433432.salive b/.kotlin/sessions/kotlin-compiler-18309537381016433432.salive
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -143,7 +143,6 @@ dependencies {
     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
@@ -16,11 +16,14 @@
 
 package com.example.android.architecture.blueprints.todoapp.util
 
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.Indicator
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 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)
 
@@ -34,6 +37,7 @@ val primaryDarkColor: Color = Color(0xFF263238)
  * @param modifier the modifier to apply to this layout.
  * @param content (slot) the main content to show
  */
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LoadingContent(
     loading: Boolean,
@@ -45,12 +49,27 @@ fun LoadingContent(
 ) {
     if (empty) {
         emptyContent()
-    } else {
-        SwipeRefresh(
-            state = rememberSwipeRefreshState(loading),
-            onRefresh = onRefresh,
+    }  else {
+        // Initialize the PullToRefresh state using remember
+        val pullToRefreshState = rememberPullToRefreshState()
+
+        PullToRefreshBox(
+            isRefreshing = loading,  // use the loading directly for refreshing state
+            onRefresh = onRefresh,  // define the onRefresh event
+            state = pullToRefreshState,  // pass the remembered state
             modifier = modifier,
-            content = content,
-        )
+            contentAlignment = Alignment.TopStart,
+            indicator = {
+                // Define the indicator for pull-to-refresh
+                Indicator(
+                    modifier = Modifier.align(Alignment.TopCenter),
+                    isRefreshing = loading,
+                    state = pullToRefreshState
+                )
+            }
+        ) {
+            content()  // Main content
+        }
     }
+
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,6 +44,7 @@ kotlinxSerializationJson = "1.7.3"
 ksp = "2.1.0-1.0.29"
 lint = "31.7.3"
 # @keep
+materialZ = "1.8.0-alpha07"
 minSdk = "21"
 okhttp = "4.10.0"
 protobuf = "3.21.12"
@@ -61,7 +62,6 @@ 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" }