move application logic to package

FoodSpec/App/AppFeature.swift

@@ -0,0 +1,34 @@
+//
+//  AppFeature.swift
+//  FoodSpec
+//
+//  Created by Victor Socaciu on 11/12/2023.
+//
+
+import Foundation
+import ComposableArchitecture
+
+@Reducer
+struct AppFeature {
+    @ObservableState
+    struct State: Equatable {
+        var foodList: FoodListFeature.State = .init()
+    }
+
+    @CasePathable
+    enum Action {
+        case foodList(FoodListFeature.Action)
+    }
+
+    var body: some ReducerOf<Self> {
+        Scope(state: \.foodList, action: \.foodList) {
+            FoodListFeature()
+        }
+        Reduce { state, action in
+            switch action {
+                case .foodList:
+                    return .none
+            }
+        }
+    }
+}

FoodSpec/App/FoodSpecApp.swift

@@ -0,0 +1,32 @@
+//
+//  FoodSpecApp.swift
+//  FoodSpec
+//
+//  Created by Victor Socaciu on 29/11/2023.
+//
+
+import SwiftUI
+import SwiftData
+import ComposableArchitecture
+
+@main
+struct FoodSpecApp: App {
+    @State var store = Store(
+        initialState: AppFeature.State(),
+        reducer: {
+            AppFeature()
+                ._printChanges()
+        }
+    )
+
+    var body: some Scene {
+        WindowGroup {
+            FoodList(
+                store: store.scope(
+                    state: \.foodList,
+                    action: \.foodList
+                )
+            )
+        }
+    }
+}

food-spec/Sources/API/Food+API.swift

@@ -0,0 +1,8 @@
+//
+//  File.swift
+//  
+//
+//  Created by Victor Socaciu on 11/12/2023.
+//
+
+import Foundation

FoodSpec/Clients/BillboardClient.swift → food-spec/Sources/Ads/BillboardClient.swift

@@ -6,16 +6,17 @@
 //
 
 import Foundation
-import ComposableArchitecture
-import Billboard
+import Dependencies
+import DependenciesMacros
+@_exported import Billboard
 
 @DependencyClient
-struct BillboardClient {
+public struct BillboardClient {
     var getRandomBanners: () async throws -> AsyncThrowingStream<BillboardAd?, Error>
 }
 
 extension BillboardClient: DependencyKey {
-    static var liveValue: BillboardClient = .init(
+    public static var liveValue: BillboardClient = .init(
         getRandomBanners: {
             @Dependency(\.continuousClock) var continuousClock
             let first = ActorIsolated(true)
@@ -30,11 +31,11 @@ extension BillboardClient: DependencyKey {
         }
     )
 
-    static var testValue: BillboardClient = .init()
+    public static var testValue: BillboardClient = .init()
 }
 
 extension DependencyValues {
-    var billboardClient: BillboardClient {
+    public var billboardClient: BillboardClient {
         get { self[BillboardClient.self] }
         set { self[BillboardClient.self] = newValue }
     }

food-spec/Sources/Database/Food+Database.swift

@@ -0,0 +1,8 @@
+//
+//  File.swift
+//  
+//
+//  Created by Victor Socaciu on 11/12/2023.
+//
+
+import Foundation

FoodSpec/Food Comparison/Charts/EnergyBreakdownComparisonChart.swift → food-spec/Sources/FoodComparison/Charts/EnergyBreakdownComparisonChart.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Charts
+import Shared
 
 struct EnergyBreakdownComparisonChart: View {
     let foods: [Food]
@@ -93,11 +94,11 @@ Fat: \(breakdown.fatRatio.formatted(.percent.precision(.fractionLength(0...1))))
 }
 
 extension Energy: Plottable {
-    var primitivePlottable: Double {
+    public var primitivePlottable: Double {
         value
     }
 
-    init?(primitivePlottable: Double) {
+    public init?(primitivePlottable: Double) {
         self = .kcal(primitivePlottable)
     }
 }

FoodSpec/Food Comparison/Charts/MacronutrientsComparisonChart.swift → food-spec/Sources/FoodComparison/Charts/MacronutrientsComparisonChart.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Charts
+import Shared
 
 struct MacronutrientsComparisonChart: View {
     let foods: [Food]

FoodSpec/Food Comparison/Charts/QuantityComparisonChart.swift → food-spec/Sources/FoodComparison/Charts/QuantityComparisonChart.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Charts
+import Shared
 
 struct QuantityComparisonChart: View {
     let foods: [Food]
@@ -69,11 +70,11 @@ struct QuantityComparisonChart: View {
 }
 
 extension Quantity: Plottable {
-    var primitivePlottable: Double {
+    public var primitivePlottable: Double {
         value
     }
 
-    init?(primitivePlottable: Double) {
+    public init?(primitivePlottable: Double) {
         self = .grams(primitivePlottable)
     }
 }

FoodSpec/Food Comparison/FoodComparison.swift → food-spec/Sources/FoodComparison/FoodComparison.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Shared
 import ComposableArchitecture
 
 struct FoodComparison: View {

FoodSpec/Food Comparison/FoodComparisonFeature.swift → food-spec/Sources/FoodComparison/FoodComparisonFeature.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import ComposableArchitecture
+import Shared
 
 @Reducer
 struct FoodComparisonFeature {

FoodSpec/Food Comparison/FoodSelection.swift → food-spec/Sources/FoodComparison/FoodSelection.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import ComposableArchitecture
+import Shared
 
 struct FoodSelection: View {
     @Bindable var store: StoreOf<FoodComparisonFeature>

FoodSpec/Food Details/EnergyBreakdownChart.swift → food-spec/Sources/FoodDetails/EnergyBreakdownChart.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Charts
+import Shared
 
 struct EnergyBreakdownChart: View {
     let food: Food

FoodSpec/Food Details/FoodDetails.swift → food-spec/Sources/FoodDetails/FoodDetails.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import ComposableArchitecture
+import Shared
 
 struct FoodDetails: View {
     @Bindable var store: StoreOf<FoodDetailsFeature>

FoodSpec/Food Details/FoodDetailsFeature.swift → food-spec/Sources/FoodDetails/FoodDetailsFeature.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import ComposableArchitecture
+import Shared
 
 @Reducer
 struct FoodDetailsFeature {

FoodSpec/Food List/FoodList.swift → food-spec/Sources/FoodList/FoodList.swift

@@ -10,6 +10,7 @@ import SwiftData
 import ComposableArchitecture
 import CoreSpotlight
 import Billboard
+import Shared
 
 struct FoodList: View {
     @Bindable var store: StoreOf<FoodListFeature>

FoodSpec/Food List/FoodListFeature.swift → food-spec/Sources/FoodList/FoodListFeature.swift

@@ -8,6 +8,8 @@
 import Foundation
 import GRDB
 import ComposableArchitecture
+import Shared
+import API
 
 @Reducer
 struct FoodListFeature {

FoodSpec/Food List/FoodListRow.swift → food-spec/Sources/FoodList/FoodListRow.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import SwiftData
+import Shared
 
 struct FoodListRow: View {
     let food: Food

FoodSpec/Food List/SpotlightReducer.swift → food-spec/Sources/FoodList/SpotlightReducer.swift

@@ -8,6 +8,7 @@
 import Foundation
 import ComposableArchitecture
 import CoreSpotlight
+import Database
 
 @Reducer
 struct SpotlightReducer {

food-spec/Sources/Shared/Extensions/SortOrder+Extensions.swift

@@ -0,0 +1,8 @@
+//
+//  File.swift
+//  
+//
+//  Created by Victor Socaciu on 11/12/2023.
+//
+
+import Foundation

FoodSpec/Utilities/EnergyCalculator.swift → food-spec/Sources/Shared/Utilities/EnergyCalculator.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Shared
 
 struct EnergyCalculator {
     struct EnergyBreakdown: Hashable {

FoodSpec/Clients/SpotlightClient.swift → food-spec/Sources/Spotlight/SpotlightClient.swift

@@ -8,6 +8,7 @@
 import Foundation
 import CoreSpotlight
 import ComposableArchitecture
+import Shared
 
 @DependencyClient
 struct SpotlightClient {

FoodSpec/Clients/UserDefaultsClient.swift → food-spec/Sources/UserDefaults/UserDefaultsClient.swift

@@ -8,6 +8,7 @@
 import Foundation
 import ComposableArchitecture
 import XCTestDynamicOverlay
+import Shared
 
 public struct UserDefaultsClient {
     public var bool: @Sendable (_ key: String) -> Bool