Skip to content

Prevent Guides View From Fetching Upon Appearance #499

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
justinwongeecs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent Guides View From Fetching Upon Appearance #499

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
48 changes: 26 additions & 22 deletions berkeley-mobile/Home/Guides/GuidesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,36 @@
import SwiftUI

struct GuidesView: View {
@State private var viewModel = GuidesViewModel()
@Environment(GuidesViewModel.self) private var viewModel

var body: some View {
if viewModel.isLoading {
ProgressView()
Spacer()
} else if viewModel.guides.isEmpty {
Text("No Guides Available")
.font(Font(BMFont.bold(20)))
.foregroundStyle(.gray)
Spacer()
} else {
List(viewModel.guides) { guide in
NavigationLink {
GuideDetailView(guide: guide)
.containerBackground(.clear, for: .navigation)
.environment(viewModel)
} label: {
GuideRowView(guide: guide)
VStack {
if viewModel.isLoading {
ProgressView()
Spacer()
} else if viewModel.guides.isEmpty {
Text("No Guides Available")
.font(Font(BMFont.bold(20)))
.foregroundStyle(.gray)
Spacer()
} else {
List(viewModel.guides) { guide in
NavigationLink {
GuideDetailView(guide: guide)
.containerBackground(.clear, for: .navigation)
} label: {
GuideRowView(guide: guide)
}
.disabled(guide.places.isEmpty)
.listRowSeparator(.hidden)
.listRowBackground(Color.clear)
}
.disabled(guide.places.isEmpty)
.listRowSeparator(.hidden)
.listRowBackground(Color.clear)
.listStyle(.plain)
.scrollContentBackground(.hidden)
}
.listStyle(.plain)
.scrollContentBackground(.hidden)
}
.onAppear {
viewModel.fetchGuides()
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions berkeley-mobile/Home/Guides/GuidesViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ class GuidesViewModel {
private let db = Firestore.firestore()
private let redirectionManager = RedirectionManager()

init() {
func fetchGuides(force: Bool = false) {
guard guides.isEmpty || force else {
return
}
Task { @MainActor in
isLoading = true
let guides = await fetchGuides()
self.guides = guides
isLoading = false
}
}
func fetchGuides() async -> [Guide] {

private func fetchGuides() async -> [Guide] {
do {
let snap = try await db.collection(kGuidesEndpoint).getDocuments()
let guides: [Guide] = snap.documents.compactMap {
Expand Down
6 changes: 4 additions & 2 deletions berkeley-mobile/Home/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ struct HomeView: View {
@State private var isPresentingDetailView = false
@State private var selectedDetent: PresentationDetent = .fraction(0.45)

private var mapViewController: MapViewController

@State private var diningHallsViewModel = DiningHallsViewModel()
@State private var guidesViewModel = GuidesViewModel()

private var mapViewController: MapViewController
private let menuIconCacheManager = MenuItemIconCacheManager()

init(mapViewController: MapViewController) {
Expand Down Expand Up @@ -81,6 +82,7 @@ struct HomeView: View {
}
default:
GuidesView()
.environment(guidesViewModel)
}
}
}
Expand Down