Add Yelp integration to demo app

danielsaidi · danielsaidi · commit d3b569d35566 · 2025-09-30T10:15:09.000+02:00
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		A9B2328D29D346F700B85203 /* TheMovieDbScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9B2328C29D346F700B85203 /* TheMovieDbScreen.swift */; };
 		A9C008952E8A831600000CB6 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = A9C008942E8A831600000CB6 /* AppIcon.icon */; };
 		A9C008992E8A859C00000CB6 /* View+ApiKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C008982E8A859C00000CB6 /* View+ApiKeys.swift */; };
+		A9C0089B2E8A955C00000CB6 /* YelpScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C0089A2E8A955C00000CB6 /* YelpScreen.swift */; };
 		A9C026AB29D2CEFA00371AE0 /* DemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C026AA29D2CEFA00371AE0 /* DemoApp.swift */; };
 		A9C026AD29D2CEFA00371AE0 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C026AC29D2CEFA00371AE0 /* ContentView.swift */; };
 		A9C026AF29D2CEFB00371AE0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9C026AE29D2CEFB00371AE0 /* Assets.xcassets */; };
@@ -26,6 +27,7 @@
 		A9B2328C29D346F700B85203 /* TheMovieDbScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TheMovieDbScreen.swift; sourceTree = "<group>"; };
 		A9C008942E8A831600000CB6 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
 		A9C008982E8A859C00000CB6 /* View+ApiKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+ApiKeys.swift"; sourceTree = "<group>"; };
+		A9C0089A2E8A955C00000CB6 /* YelpScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YelpScreen.swift; sourceTree = "<group>"; };
 		A9C026A729D2CEFA00371AE0 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A9C026AA29D2CEFA00371AE0 /* DemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoApp.swift; sourceTree = "<group>"; };
 		A9C026AC29D2CEFA00371AE0 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -53,6 +55,7 @@
 			isa = PBXGroup;
 			children = (
 				A9B2328C29D346F700B85203 /* TheMovieDbScreen.swift */,
+				A9C0089A2E8A955C00000CB6 /* YelpScreen.swift */,
 			);
 			path = Screens;
 			sourceTree = "<group>";
@@ -194,6 +197,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A9C0089B2E8A955C00000CB6 /* YelpScreen.swift in Sources */,
 				A9C026AD29D2CEFA00371AE0 /* ContentView.swift in Sources */,
 				A9B2328D29D346F700B85203 /* TheMovieDbScreen.swift in Sources */,
 				A9C008992E8A859C00000CB6 /* View+ApiKeys.swift in Sources */,
diff --git a/Demo/Demo.xcodeproj/xcuserdata/danielsaidi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Demo/Demo.xcodeproj/xcuserdata/danielsaidi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,4 +3,38 @@
    uuid = "512808DE-AB88-454E-B5E2-A04823D3EA9B"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C8B2A896-E3E7-44F7-AB00-4517E92A1498"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Demo/Screens/YelpScreen.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "103"
+            endingLineNumber = "103"
+            landmarkName = "fetchDefaultItems()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CB77FC2D-B610-495A-B233-A62B145664E2"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Demo/Screens/TheMovieDbScreen.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "90"
+            endingLineNumber = "90"
+            landmarkName = "fetchDefaultItems()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/Demo/Demo/ContentView.swift b/Demo/Demo/ContentView.swift
@@ -23,6 +23,12 @@ struct ContentView: View {
                     apiKey: $movieDbApiKey,
                     screen: .theMovieDb(apiKey: movieDbApiKey)
                 )
+                screenSection(
+                    title: "Yelp",
+                    icon: "fork.knife",
+                    apiKey: $yelpApiKey,
+                    screen: .yelp(apiKey: yelpApiKey)
+                )
             }
             .navigationTitle("ApiKit")
             .navigationDestination(for: DemoScreen.self) { $0.body }
diff --git a/Demo/Demo/DemoScreen.swift b/Demo/Demo/DemoScreen.swift
@@ -11,13 +11,16 @@ import SwiftUI
 enum DemoScreen: Hashable, View {
 
     case theMovieDb(apiKey: String)
+    case yelp(apiKey: String)
 }
 
 extension DemoScreen {
 
+    @ViewBuilder
     var body: some View {
         switch self {
         case .theMovieDb(let apiKey): TheMovieDbScreen(apiKey: apiKey)
+        case .yelp(let apiKey): YelpScreen(apiKey: apiKey)
         }
     }
 }
diff --git a/Demo/Demo/Screens/TheMovieDbScreen.swift b/Demo/Demo/Screens/TheMovieDbScreen.swift
@@ -22,39 +22,42 @@ struct TheMovieDbScreen: View {
     @StateObject
     private var model = ViewModel()
 
-    typealias Movie = TheMovieDb.Movie
-    typealias MovieResult = TheMovieDb.MoviesPaginationResult
+    typealias Item = TheMovieDb.Movie
+    typealias ItemResult = TheMovieDb.MoviesPaginationResult
 
     class ViewModel: ObservableObject {
 
-        @Published var discoverMovies = [Movie]()
-        @Published var searchMovies = [Movie]()
+        @Published var defaultItems = [Item]()
+        @Published var searchItems = [Item]()
         @Published var searchQuery = ""
     }
 
     var body: some View {
         ScrollView(.vertical) {
             LazyVGrid(columns: gridColumns) {
-                ForEach(movies) { movie in
-                    gridItem(for: movie)
+                ForEach(items) {
+                    gridItem(for: $0)
                 }
-            }.padding()
+            }
+            .padding()
         }
-        .task { fetchDiscoverData() }
+        .task { fetchDefaultItems() }
         .searchable(text: $model.searchQuery)
-        .onReceive(model.$searchQuery
-            .throttle(for: 1, scheduler: RunLoop.main, latest: true), perform: search
-        )
+        .onReceive(model.$searchQuery.throttle(
+            for: 1,
+            scheduler: RunLoop.main,
+            latest: true
+        ), perform: search)
         .navigationTitle("The Movie DB")
     }
 }
 
 extension TheMovieDbScreen {
 
-    func gridItem(for movie: Movie) -> some View {
+    func gridItem(for item: Item) -> some View {
         VStack {
             AsyncImage(
-                url: movie.posterUrl(width: 300),
+                url: item.posterUrl(width: 300),
                 content: { image in
                     image.resizable()
                         .cornerRadius(5)
@@ -63,35 +66,32 @@ extension TheMovieDbScreen {
                 placeholder: {
                     ProgressView()
                 }
-            ).accessibilityLabel(movie.title)
+            )
+            .accessibilityLabel(item.title)
         }
     }
 }
 
 extension TheMovieDbScreen {
 
-    var movies: [Movie] {
-        model.searchMovies.isEmpty ? model.discoverMovies : model.searchMovies
+    var items: [Item] {
+        model.searchItems.isEmpty ? model.defaultItems : model.searchItems
     }
 
-    func fetchDiscoverData() {
+    func fetchDefaultItems() {
         Task {
             do {
-                let result = try await fetchDiscoverData()
-                updateDiscoverResult(with: result)
+                let result: ItemResult = try await session.request(
+                    at: TheMovieDb.Route.discoverMovies(page: 1),
+                    in: environment
+                )
+                updateDefaultItems(with: result)
             } catch {
                 print(error)
             }
         }
     }
 
-    func fetchDiscoverData() async throws -> MovieResult {
-        try await session.request<MovieResult>(
-            at: TheMovieDb.Route.discoverMovies(page: 1),
-            in: environment
-        )
-    }
-
     func search(with query: String) {
         Task {
             do {
@@ -103,7 +103,7 @@ extension TheMovieDbScreen {
         }
     }
 
-    func search(with query: String) async throws -> MovieResult {
+    func search(with query: String) async throws -> ItemResult {
         try await session.request(
             at: TheMovieDb.Route.searchMovies(query: query, page: 1),
             in: environment
@@ -114,19 +114,28 @@ extension TheMovieDbScreen {
 @MainActor
 extension TheMovieDbScreen {
 
-    func updateDiscoverResult(with result: MovieResult) {
-        model.discoverMovies = result.results
+    func updateDefaultItems(with result: ItemResult) {
+        model.defaultItems = result.results
     }
 
-    func updateSearchResult(with result: MovieResult) {
-        model.searchMovies = result.results
+    func updateSearchResult(with result: ItemResult) {
+        model.searchItems = result.results
     }
 }
 
 #Preview {
-    
-    TheMovieDbScreen(apiKey: "c9237ef2809ed01e64d7b37b0f951c7b")
-        #if os(macOS)
-        .frame(minWidth: 500)
-        #endif
+
+    struct Preview: View {
+
+        @AppStorage(Self.movieDbApiKey) var apiKey = ""
+
+        var body: some View {
+            TheMovieDbScreen(apiKey: apiKey)
+                #if os(macOS)
+                .frame(minWidth: 500)
+                #endif
+        }
+    }
+
+    return Preview()
 }
diff --git a/Demo/Demo/Screens/YelpScreen.swift b/Demo/Demo/Screens/YelpScreen.swift
@@ -0,0 +1,132 @@
+//
+//  YelpScreen.swift
+//  Demo
+//
+//  Created by Daniel Saidi on 2025-09-29.
+//  Copyright © 2025 Daniel Saidi. All rights reserved.
+//
+
+import ApiKit
+import SwiftUI
+
+struct YelpScreen: View {
+
+    init(apiKey: String) {
+        self.environment = .v3(apiToken: apiKey)
+    }
+
+    let session = URLSession.shared
+    let environment: Yelp.Environment
+    let gridColumns = [GridItem(.adaptive(minimum: 100), alignment: .top)]
+
+    @StateObject
+    private var model = ViewModel()
+
+    typealias Item = Yelp.Restaurant
+    typealias ItemResult = Yelp.RestaurantSearchResult
+
+    class ViewModel: ObservableObject {
+
+        @Published var defaultItems = [Item]()
+        @Published var searchItems = [Item]()
+        @Published var searchQuery = ""
+    }
+
+    var body: some View {
+        ScrollView(.vertical) {
+            LazyVGrid(columns: gridColumns) {
+                ForEach(items) {
+                    gridItem(for: $0)
+                }
+            }.padding()
+        }
+        .task { fetchDefaultItems() }
+//        .searchable(text: $model.searchQuery)
+//        .onReceive(model.$searchQuery.throttle(
+//            for: 1,
+//            scheduler: RunLoop.main,
+//            latest: true
+//        ), perform: search)
+        .navigationTitle("Yelp")
+    }
+}
+
+extension YelpScreen {
+
+    func gridItem(for item: Item) -> some View {
+        VStack {
+            AsyncImage(
+                url: item.imageUrl?.url,
+                content: { image in
+                    image.resizable()
+                        .cornerRadius(5)
+                        .aspectRatio(contentMode: .fit)
+                },
+                placeholder: {
+                    ProgressView()
+                }
+            )
+            .accessibilityLabel(item.name ?? item.id)
+        }
+    }
+}
+
+private extension String {
+
+    var url: URL? {
+        .init(string: self)
+    }
+}
+
+extension YelpScreen {
+
+    var items: [Item] {
+        model.searchItems.isEmpty ? model.defaultItems : model.searchItems
+    }
+
+    func fetchDefaultItems() {
+        Task {
+            do {
+                let result: ItemResult = try await session.request(
+                    at: Yelp.Route.search(
+                        params: .init(
+                            skip: 0,
+                            take: 25,
+                            radius: 5_000,
+                            coordinate: (lat: 59.3327, long: 18.0645)
+                        )
+                    ),
+                    in: environment
+                )
+                updateDefaultItems(with: result)
+            } catch {
+                print(error)
+            }
+        }
+    }
+}
+
+@MainActor
+extension YelpScreen {
+
+    func updateDefaultItems(with result: ItemResult) {
+        model.defaultItems = result.businesses
+    }
+}
+
+#Preview {
+
+    struct Preview: View {
+
+        @AppStorage(Self.yelpApiKey) var apiKey = ""
+
+        var body: some View {
+            YelpScreen(apiKey: apiKey)
+                #if os(macOS)
+                .frame(minWidth: 500)
+                #endif
+        }
+    }
+
+    return Preview()
+}
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -6,6 +6,15 @@ Until then, breaking changes can happen in any version, and deprecated features
 
 
 
+## 1.1.0
+
+### 💡 Adjustments
+
+* The package now uses Swift 6.1. 
+* The demo app now targets iOS 26. 
+
+
+
 ## 1.0.3
 
 ### 💡 Adjustments
diff --git a/Sources/ApiKit/Integrations/Yelp/Yelp+Models.swift b/Sources/ApiKit/Integrations/Yelp/Yelp+Models.swift

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,12 @@ struct ContentView: View {`
`23`	`23`	`apiKey: $movieDbApiKey,`
`24`	`24`	`screen: .theMovieDb(apiKey: movieDbApiKey)`
`25`	`25`	`)`
	`26`	`+ screenSection(`
	`27`	`+ title: "Yelp",`
	`28`	`+ icon: "fork.knife",`
	`29`	`+ apiKey: $yelpApiKey,`
	`30`	`+ screen: .yelp(apiKey: yelpApiKey)`
	`31`	`+ )`
`26`	`32`	`}`
`27`	`33`	`.navigationTitle("ApiKit")`
`28`	`34`	`.navigationDestination(for: DemoScreen.self) { $0.body }`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,16 @@ import SwiftUI`
`11`	`11`	`enum DemoScreen: Hashable, View {`
`12`	`12`
`13`	`13`	`case theMovieDb(apiKey: String)`
	`14`	`+ case yelp(apiKey: String)`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`extension DemoScreen {`
`17`	`18`
	`19`	`+ @ViewBuilder`
`18`	`20`	`var body: some View {`
`19`	`21`	`switch self {`
`20`	`22`	`case .theMovieDb(let apiKey): TheMovieDbScreen(apiKey: apiKey)`
	`23`	`+ case .yelp(let apiKey): YelpScreen(apiKey: apiKey)`
`21`	`24`	`}`
`22`	`25`	`}`
`23`	`26`	`}`