App/Supporting Files/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSceneManifest</key>

App/View Models/TreeViewModel.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Model
 
 class TreeViewModel: ObservableObject, Identifiable {
     let tree: Tree

App/View Models/VisitableTreeViewModel.swift

@@ -1,3 +1,5 @@
+import Model
+
 class VisitableTreeViewModel: TreeViewModel {
     let isVisited: Bool
     var visitedButtonImageName: String { isVisited ? "checkmark.circle.fill" : "checkmark.circle" }

App/Views/App.swift

@@ -1,4 +1,6 @@
+import Model
 import SwiftUI
+import ViewToolbox
 
 @main
 struct Portland_Heritage_TreesApp: App {
@@ -8,6 +10,7 @@ struct Portland_Heritage_TreesApp: App {
         WindowGroup {
             HomeView()
                 .environmentObject(environment.store)
+                .onAppear() { Colors.secondaryText = .mutedText }
         }
     }
 }

App/Views/HomeView.swift

@@ -1,3 +1,4 @@
+import Model
 import SwiftUI
 
 struct HomeView: View {
@@ -17,9 +18,6 @@ struct HomeView: View {
             }
             .navigationBarTitle("Heritage Trees", displayMode: .inline)
         }
-        .onAppear {
-            store.getTrees()
-        }
     }
 
     private var mapButton: some View {

App/Views/ToggleVisitedTreeButton.swift

@@ -1,3 +1,4 @@
+import Model
 import SwiftUI
 
 struct ToggleVisitedTreeButton: View {

App/Views/TreeDetailView.swift

@@ -1,4 +1,6 @@
+import Model
 import SwiftUI
+import ViewToolbox
 
 struct TreeDetailView: View {
     let tree: Tree
@@ -18,7 +20,7 @@ struct TreeDetailView: View {
                         .padding(.vertical, 8)
                     TreeLocationRow(tree: tree)
                         .padding(.vertical, 8)
-                    TreeDimensionsView(height: viewModel.height, spread: viewModel.spread, diameter: viewModel.diameter, circumference: viewModel.circumference)
+                    DimensionsView(height: viewModel.height, spread: viewModel.spread, diameter: viewModel.diameter, circumference: viewModel.circumference)
                         .padding(.vertical, 8)
                     AttributeRow(name: "Notes", value: viewModel.notes)
                         .padding(.vertical, 8)
@@ -27,7 +29,7 @@ struct TreeDetailView: View {
                         .padding(.bottom, 64)
                 }
             }
-            
+
             VStack {
                 Spacer()
                 ToggleVisitedTreeButton(tree: tree)

App/Views/TreeListItem.swift

@@ -1,3 +1,4 @@
+import Model
 import SwiftUI
 
 struct TreeListItem: View {

App/Views/TreeListView.swift

@@ -1,3 +1,4 @@
+import Model
 import SwiftUI
 
 struct TreeListView: View {

App/Views/TreeLocationRow.swift

@@ -1,4 +1,5 @@
 import MapKit
+import Model
 import SwiftUI
 
 struct TreeLocationRow: View {

App/Views/TreeMapDetailView.swift

@@ -1,4 +1,5 @@
 import MapKit
+import Model
 import SwiftUI
 
 struct TreeMapDetailView: View {

App/Views/TreeMapView.swift

@@ -1,5 +1,7 @@
 import MapKit
+import Model
 import SwiftUI
+import ViewToolbox
 
 struct TreeMapView: View {
     @EnvironmentObject private var store: TreeStore

Library/Package.swift

@@ -4,16 +4,25 @@ import PackageDescription
 
 let package = Package(
     name: "Library",
+    platforms: [.iOS(.v14)],
     products: [
         .library(
             name: "Library",
-            targets: ["Library"]
+            targets: ["Model", "Toolbox", "ViewToolbox"]
         ),
     ],
     targets: [
         .target(
-            name: "Library",
+            name: "Model",
+            dependencies: ["Toolbox"]
+        ),
+        .target(
+            name: "Toolbox",
             dependencies: []
         ),
+        .target(
+            name: "ViewToolbox",
+            dependencies: ["Toolbox"]
+        ),
     ]
 )

App/Extensions/Tree+Coordinate.swift → Library/Sources/Model/Extensions/Tree+Coordinate.swift

@@ -1,7 +1,7 @@
 import MapKit
 
 extension Tree {
-    var coordinate: CLLocationCoordinate2D? {
+    public var coordinate: CLLocationCoordinate2D? {
         guard
             let latitude = latitude,
             let longitude = longitude

App/Models/APIError.swift → Library/Sources/Model/Models/APIError.swift

@@ -1,3 +1,3 @@
-enum APIError: Error {
+public enum APIError: Error {
     case decoding, http(Int), unknown
 }

App/Models/Environment.swift → Library/Sources/Model/Models/Environment.swift

@@ -1,9 +1,9 @@
-enum Environment {
+public enum Environment {
     case local, remote
 }
 
 extension Environment {
-    var apiService: APIService {
+    public var apiService: APIService {
         switch self {
         case .local:
             return LocalSession()
@@ -14,7 +14,7 @@ extension Environment {
 }
 
 extension Environment {
-    var store: TreeStore {
+    public var store: TreeStore {
         TreeStore(apiService: apiService)
     }
 }

App/Models/LocationManager.swift → Library/Sources/Model/Models/LocationManager.swift

@@ -1,14 +1,16 @@
 import CoreLocation
 
-struct LocationManager {
+public struct LocationManager {
     private let locationManager = CLLocationManager()
 
-    func requestAuthorization() {
+    public init() {}
+
+    public func requestAuthorization() {
         locationManager.requestWhenInUseAuthorization()
         locationManager.startUpdatingLocation()
     }
 
-    func rerequestAuthorization() {
+    public func rerequestAuthorization() {
         if locationManager.authorizationStatus == .authorizedWhenInUse {
             locationManager.requestWhenInUseAuthorization()
         }

App/Models/RequestBuilder.swift → Library/Sources/Model/Models/RequestBuilder.swift

@@ -1,5 +1,5 @@
 import Foundation
 
-protocol RequestBuilder {
+public protocol RequestBuilder {
     var urlRequest: URLRequest { get }
 }

App/Models/Tree.swift → Library/Sources/Model/Models/Tree.swift

@@ -1,25 +1,25 @@
 import Foundation
 
-struct Tree: Identifiable {
-    let address: String?
-    let circumference: Float?
-    let commonName: String
-    let diameter: Int?
-    let fact: String?
-    let height: Int
-    let id: Int
-    let latitude: Double?
-    let longitude: Double?
-    let neighborhood: String?
-    let notes: String?
-    let scientificName: String
-    let spread: Int?
+public struct Tree: Identifiable {
+    public let address: String?
+    public let circumference: Float?
+    public let commonName: String
+    public let diameter: Int?
+    public let fact: String?
+    public let height: Int
+    public let id: Int
+    public let latitude: Double?
+    public let longitude: Double?
+    public let neighborhood: String?
+    public let notes: String?
+    public let scientificName: String
+    public let spread: Int?
 }
 
 // MARK: Preview Content
 
 extension Tree {
-    static var preview: Self {
+    public static var preview: Self {
         Self(
             address: "1111 SW 10th AVE",
             circumference: 12.8,

App/View Models/TreeAnnotation.swift → Library/Sources/Model/Models/TreeAnnotation.swift

@@ -1,9 +1,10 @@
 import MapKit
 import SwiftUI
+import Toolbox
 
-class TreeAnnotation: NSObject {
-    let coordinate: CLLocationCoordinate2D
-    let tree: Tree
+public class TreeAnnotation: NSObject {
+    public let coordinate: CLLocationCoordinate2D
+    public let tree: Tree
     let isVisited: Bool
 
     init?(tree: Tree, isVisited: Bool) {
@@ -15,13 +16,13 @@ class TreeAnnotation: NSObject {
 }
 
 extension TreeAnnotation: MKAnnotation {
-    var title: String? { "Tree #\(tree.id)" }
-    var subtitle: String? { tree.commonName }
+    public var title: String? { "Tree #\(tree.id)" }
+    public var subtitle: String? { tree.commonName }
 }
 
 extension TreeAnnotation: Annotation {
-    var identifier: Int { tree.id }
-    var tintColor: UIColor { isVisited ? color.withAlphaComponent(0.5) : color }
+    public var identifier: Int { tree.id }
+    public var tintColor: UIColor { isVisited ? color.withAlphaComponent(0.5) : color }
 
     private var color: UIColor { UIColor(Color.accentColor) }
 }

App/Models/TreeStore.swift → Library/Sources/Model/Models/TreeStore.swift

@@ -1,25 +1,37 @@
 import Combine
 
-class TreeStore: ObservableObject, OpenDataService {
-    @Published private(set) var treeAnnotations = [TreeAnnotation]()
+public class TreeStore: ObservableObject, OpenDataService {
+    @Published public private(set) var treeAnnotations = [TreeAnnotation]()
     let apiService: APIService
 
-    @Published private(set) var isVisitedStatuses: [Int: Bool] {
+    @Published public private(set) var trees = [Tree]() {
         didSet { setTreeAnnotations() }
     }
 
-    @Published private(set) var trees = [Tree]() {
+    @Published private(set) var isVisitedStatuses: [Int: Bool] {
         didSet { setTreeAnnotations() }
     }
 
     private var cancellables = Set<AnyCancellable>()
 
-    init(apiService: APIService) {
+    public init(apiService: APIService) {
         self.apiService = apiService
         self.isVisitedStatuses = Persistence.isVisitedStatuses
+        getTrees()
+    }
+
+    public func isVisited(tree: Tree) -> Bool {
+        isVisitedStatuses[tree.id] ?? false
     }
 
-    func getTrees() {
+    public func toggleTreeIsVisited(_ tree: Tree) {
+        var statuses = isVisitedStatuses
+        statuses[tree.id] = !(statuses[tree.id] ?? false)
+        isVisitedStatuses = statuses
+        Persistence.isVisitedStatuses = isVisitedStatuses
+    }
+
+    private func getTrees() {
         getTrees()
             .sink(receiveCompletion: { result in
                 switch result {
@@ -35,17 +47,6 @@ class TreeStore: ObservableObject, OpenDataService {
             .store(in: &cancellables)
     }
 
-    func isVisited(tree: Tree) -> Bool {
-        isVisitedStatuses[tree.id] ?? false
-    }
-
-    func toggleTreeIsVisited(_ tree: Tree) {
-        var statuses = isVisitedStatuses
-        statuses[tree.id] = !(statuses[tree.id] ?? false)
-        isVisitedStatuses = statuses
-        Persistence.isVisitedStatuses = isVisitedStatuses
-    }
-
     private func setTreeAnnotations() {
         treeAnnotations = trees.compactMap { tree in
             let isVisited = isVisitedStatuses[tree.id] ?? false