Skip to content
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

Jump to bottom

added pull to refresh #30

Merged
merged 1 commit into from
Jun 26, 2024
Merged

added pull to refresh #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
13 changes: 10 additions & 3 deletions mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Loading