Rename some variables, clean up examples.

Author: Trent Guillory

SnapToScrollDemo/Sources/Example3/Example3ContentView.swift

@@ -1,46 +1,52 @@
-//
-//  Example3ContentView.swift
-//  Example3ContentView
-//
-//  Created by Trent Guillory on 9/1/21.
-//
-
 import SnapToScroll
 import SwiftUI
 
+// MARK: - Example3ContentView
+
 struct Example3ContentView: View {
-    
-    @State private var selectedGettingStartedIndex: Int = 0
-    
+
+    // MARK: Internal
+
     var body: some View {
-       
+
         VStack {
 
             Text("Getting Started")
                 .font(.system(size: 22, weight: .semibold, design: .rounded))
                 .foregroundColor(.white)
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .padding([.top, .leading], 32)
-            
+
             HStackSnap(alignment: .center(32)) {
-                
+
                 ForEach(GettingStartedModel.exampleModels) { viewModel in
 
-                    GettingStartedView(selectedIndex: $selectedGettingStartedIndex, viewModel: viewModel)
+                    GettingStartedView(
+                        selectedIndex: $selectedGettingStartedIndex,
+                        viewModel: viewModel)
                         .snapAlignmentHelper(id: viewModel.id)
                 }
             } onSwipe: { index in
-                
+
                 selectedGettingStartedIndex = index
             }
             .frame(height: 200)
             .padding(.top, 4)
         }
         .padding([.top, .bottom], 64)
-        .background(LinearGradient(colors: [Color("Cream"), Color("LightPink")], startPoint: .top, endPoint: .bottom))
+        .background(LinearGradient(
+            colors: [Color("Cream"), Color("LightPink")],
+            startPoint: .top,
+            endPoint: .bottom))
     }
+
+    // MARK: Private
+
+    @State private var selectedGettingStartedIndex: Int = 0
 }
 
+// MARK: - Example3ContentView_Previews
+
 struct Example3ContentView_Previews: PreviewProvider {
     static var previews: some View {
         Example3ContentView()

SnapToScrollDemo/Sources/Example3/GettingStartedModel.swift

@@ -1,14 +1,30 @@
 import Foundation
 
 struct GettingStartedModel: Identifiable {
-    
+
     static let exampleModels: [GettingStartedModel] = [
-        .init(id: 0, systemImage: "camera.aperture", title: "Snap a Pic", body: "We feature the viewfinder front and center in this throwback app."),
-        .init(id: 1, systemImage: "camera.filters", title: "Filter it Up", body: "Add filters - from detailed colorization to film effects."),
-        .init(id: 2, systemImage: "paperplane", title: "Send It", body: "Share your photos with your contacts. Or the entire world."),
-        .init(id: 3, systemImage: "sparkles", title: "Be Awesome", body: "You're clearly already doing this. Just wanted to remind you. 😉")
+        .init(
+            id: 0,
+            systemImage: "camera.aperture",
+            title: "Snap a Pic",
+            body: "We feature the viewfinder front and center in this throwback app."),
+        .init(
+            id: 1,
+            systemImage: "camera.filters",
+            title: "Filter it Up",
+            body: "Add filters - from detailed colorization to film effects."),
+        .init(
+            id: 2,
+            systemImage: "paperplane",
+            title: "Send It",
+            body: "Share your photos with your contacts. Or the entire world."),
+        .init(
+            id: 3,
+            systemImage: "sparkles",
+            title: "Be Awesome",
+            body: "You're clearly already doing this. Just wanted to remind you. 😉"),
     ]
-    
+
     let id: Int
     let systemImage: String
     let title: String

SnapToScrollDemo/Sources/Example3/GettingStartedView.swift

@@ -1,29 +1,29 @@
 import SwiftUI
 
-// MARK: - TagView
+// MARK: - GettingStartedView
 
 struct GettingStartedView: View {
-    
+
     @Binding var selectedIndex: Int
-    
+
     let viewModel: GettingStartedModel
-    
+
     var body: some View {
-        
+
         VStack(alignment: .leading) {
-            
+
             Image(systemName: viewModel.systemImage)
                 .foregroundColor(isSelected ? Color("LightPink") : .gray)
                 .font(.system(size: 32))
                 .padding(.bottom, 2)
-            
+
             Text(viewModel.title)
                 .fontWeight(.semibold)
                 .foregroundColor(.black)
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .padding(.bottom, 1)
                 .opacity(0.8)
-            
+
             Text(viewModel.body)
                 .foregroundColor(.black)
                 .multilineTextAlignment(.leading)
@@ -34,18 +34,20 @@ struct GettingStartedView: View {
         .cornerRadius(12)
         .opacity(isSelected ? 1 : 0.8)
     }
-    
+
     var isSelected: Bool {
-        
+
         return selectedIndex == viewModel.id
     }
 }
 
-// MARK: - TagView_Previews
+// MARK: - GettingStartedView_Previews
 
 struct GettingStartedView_Previews: PreviewProvider {
     static var previews: some View {
-        
-        GettingStartedView(selectedIndex: .constant(0), viewModel: GettingStartedModel.exampleModels.first!)
+
+        GettingStartedView(
+            selectedIndex: .constant(0),
+            viewModel: GettingStartedModel.exampleModels.first!)
     }
 }

Sources/HStackSnap.swift

@@ -37,7 +37,7 @@ public struct HStackSnap<Content: View>: View {
                 coordinateSpace: coordinateSpace,
                 content: content,
                 onSwipe: swipeEventHandler)
-                .environmentObject(GeometryEnvironment(itemWidth: alignment.shouldSetWidth ? calculatedItemWidth(parentWidth: geometry.size.width, offset: alignment.scrollOffset) : .none))
+                .environmentObject(SizeOverride(itemWidth: alignment.shouldSetWidth ? calculatedItemWidth(parentWidth: geometry.size.width, offset: alignment.scrollOffset) : .none))
         }
     }
 

Sources/Model/GeometryEnvironment.swift renamed to Sources/Model/SizeOverride.swift

@@ -1,7 +1,7 @@
 import Foundation
 import SwiftUI
 
-class GeometryEnvironment: ObservableObject {
+class SizeOverride: ObservableObject {
 
     init(itemWidth: CGFloat?) {
 

Sources/Views/SnapAlignmentHelper.swift

@@ -5,14 +5,14 @@ import SwiftUI
 
 struct SnapAlignmentHelper<ID: Hashable>: ViewModifier {
 
-    @EnvironmentObject var geometryData: GeometryEnvironment
+    @EnvironmentObject var sizeOverride: SizeOverride
 
     var id: ID
     var coordinateSpace: String?
 
     func body(content: Content) -> some View {
 
-        switch geometryData.itemWidth {
+        switch sizeOverride.itemWidth {
 
         case let .some(value):