Add swipe to refresh

LibrePass · Oct 14, 2023 · 4fe5780 · 4fe5780
1 parent 6342d23
commit 4fe5780
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 28 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -74,6 +74,7 @@ dependencies {
     implementation(libs.androidx.ui)
     implementation(libs.coil.compose)
     implementation(libs.google.accompanist.drawablepainter)
+    implementation(libs.google.accompanist.swiperefresh)
     implementation(libs.google.accompanist.systemuicontroller)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.librepass.client)

diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/dashboard/VaultScreen.kt b/app/src/main/java/dev/medzik/librepass/android/ui/screens/dashboard/VaultScreen.kt
@@ -12,6 +12,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
 import dev.medzik.android.components.navigate
 import dev.medzik.android.components.rememberMutableBoolean
 import dev.medzik.librepass.android.data.CipherTable
@@ -150,37 +152,44 @@ fun VaultScreen(navController: NavController) {
         updateCiphers()
     }
 
-    LazyColumn(
-        modifier = Modifier.fillMaxSize()
+    // Google has not yet added pull refresh to material3 for reasons unknown to me.
+    @Suppress("DEPRECATION")
+    SwipeRefresh(
+        state = rememberSwipeRefreshState(refreshing),
+        onRefresh = { updateCiphers() },
     ) {
-        items(ciphers.size) { index ->
-            CipherCard(
-                cipher = ciphers[index],
-                onClick = { cipher ->
-                    navController.navigate(
-                        screen = Screen.CipherView,
-                        args = arrayOf(Argument.CipherId to cipher.id.toString())
-                    )
-                },
-                onEdit = { cipher ->
-                    navController.navigate(
-                        screen = Screen.CipherEdit,
-                        args = arrayOf(Argument.CipherId to cipher.id.toString())
-                    )
-                },
-                onDelete = { cipher ->
-                    scope.launch(Dispatchers.IO) {
-                        try {
-                            cipherClient.delete(cipher.id)
-                            repository.cipher.delete(cipher.id)
-
-                            ciphers = ciphers.filter { it.id != cipher.id }
-                        } catch (e: Exception) {
-                            e.showErrorToast(context)
+        LazyColumn(
+            modifier = Modifier.fillMaxSize()
+        ) {
+            items(ciphers.size) { index ->
+                CipherCard(
+                    cipher = ciphers[index],
+                    onClick = { cipher ->
+                        navController.navigate(
+                            screen = Screen.CipherView,
+                            args = arrayOf(Argument.CipherId to cipher.id.toString())
+                        )
+                    },
+                    onEdit = { cipher ->
+                        navController.navigate(
+                            screen = Screen.CipherEdit,
+                            args = arrayOf(Argument.CipherId to cipher.id.toString())
+                        )
+                    },
+                    onDelete = { cipher ->
+                        scope.launch(Dispatchers.IO) {
+                            try {
+                                cipherClient.delete(cipher.id)
+                                repository.cipher.delete(cipher.id)
+
+                                ciphers = ciphers.filter { it.id != cipher.id }
+                            } catch (e: Exception) {
+                                e.showErrorToast(context)
+                            }
                         }
                     }
-                }
-            )
+                )
+            }
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -49,6 +49,7 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" }
 commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" }
 google-accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "google-accompanist" }
+google-accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "google-accompanist" }
 google-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "google-accompanist" }
 google-material = { module = "com.google.android.material:material", version.ref = "google-material" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines-android" }