Merge pull request #30 from vespinola/29-add-pull-to-refresh

added pull to refresh
vespinola · Jun 26, 2024 · 85c0ef4 · 85c0ef4
2 parents 9b04390 + 84154a3
commit 85c0ef4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalView.swift b/mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalView.swift
@@ -18,14 +18,21 @@ struct PackagesForWithdrawalView: View {
       }
     }
     .onAppear {
-      Task {
-        await viewModel.getPackages()
-      }
+      getPackages()
+    }
+    .refreshable {
+      getPackages(forceUpdate: true)
     }
     .showRippleSpinner(isLoading: $viewModel.isLoading)
     .toast(message: $viewModel.toastMessage)
   }
 
+  private func getPackages(forceUpdate: Bool = false) {
+    Task {
+      await viewModel.getPackages(forceUpdate: forceUpdate)
+    }
+  }
+
   @ViewBuilder
   private func content(for groupedPackages: [GroupedPackageEntity]) -> some View {
     if groupedPackages.isEmpty {

diff --git a/mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalViewModel.swift b/mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalViewModel.swift
@@ -19,15 +19,15 @@ final class PackagesForWithdrawalViewModel: ObservableObject {
   }
 
   @MainActor
-  func getPackages() async {
-    guard groupedPackagesEntity == nil else { return }
+  func getPackages(forceUpdate: Bool = false) async {
+    guard groupedPackagesEntity == nil || forceUpdate else { return }
+
+    defer { isLoading = false }
 
     do {
       isLoading = true
       groupedPackagesEntity = try await packagesRepository.getPackagesForWithdrawl()
-      isLoading = false
     } catch {
-      isLoading = false
       toastMessage = error.localizedDescription
     }
   }

diff --git a/mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesView.swift b/mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesView.swift
@@ -18,14 +18,21 @@ struct WithdrawnPackagesView: View {
       }
     }
     .onAppear {
-      Task {
-        await viewModel.getPackages()
-      }
+      getPackages()
+    }
+    .refreshable {
+      getPackages(forceUpdate: true)
     }
     .showRippleSpinner(isLoading: $viewModel.isLoading)
     .toast(message: $viewModel.toastMessage)
   }
 
+  private func getPackages(forceUpdate: Bool = false) {
+    Task {
+      await viewModel.getPackages(forceUpdate: forceUpdate)
+    }
+  }
+
   @ViewBuilder
   private func content(for groupedPackages: [GroupedPackageEntity]) -> some View {
     if groupedPackages.isEmpty {

diff --git a/mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesViewModel.swift b/mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesViewModel.swift
@@ -19,14 +19,15 @@ final class WithdrawnPackagesViewModel: ObservableObject {
   }
 
   @MainActor
-  func getPackages() async {
-    guard groupedPackagesEntity == nil else { return }
+  func getPackages(forceUpdate: Bool = false) async {
+    guard groupedPackagesEntity == nil || forceUpdate else { return }
+
+    defer { isLoading = false }
+
     do {
       isLoading = true
       groupedPackagesEntity = try await packagesRepository.getWithdrawnPackages()
-      isLoading = false
     } catch {
-      isLoading = false
       toastMessage = error.localizedDescription
     }
   }