Connect WelcomeView and WelcomeViewAddVehicle to App Flow

Basic-Car-Maintenance/Shared/BasicCarMaintenanceApp.swift

@@ -17,9 +17,6 @@ struct BasicCarMaintenanceApp: App {
     @State private var actionService = ActionService.shared
     @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
 
-    // Logic to load Onboarding screen when app was first launched
-//    @AppStorage("isFirstTime") private var isFirstTime: Bool = true
-
     var body: some Scene {
         WindowGroup {
             MainTabView()
@@ -28,10 +25,6 @@ struct BasicCarMaintenanceApp: App {
                 .task {
                   try? Tips.configure()
                 }
-//                .sheet(isPresented: $isFirstTime) {
-//                    WelcomeView()
-//                        .interactiveDismissDisabled()
-//                }
         }
     }
 }

Basic-Car-Maintenance/Shared/Localizable.xcstrings

@@ -1,6 +1,9 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "" : {
+
+    },
     "%@" : {
       "comment" : "Maintenance list item description 'Date' formatted",
       "localizations" : {
@@ -71,6 +74,9 @@
           }
         }
       }
+    },
+    "%@ added successfully! 🎉" : {
+
     },
     "%@ on %@" : {
       "comment" : "Maintenance list item for a vehicle on a date",
@@ -199,9 +205,6 @@
           }
         }
       }
-    },
-    "about" : {
-
     },
     "Add" : {
       "comment" : "Label for submit button on form to add an entry",
@@ -416,7 +419,7 @@
         }
       }
     },
-    "Add the details below" : {
+    "Add the details below about " : {
 
     },
     "Add Vehicle" : {
@@ -814,9 +817,6 @@
           }
         }
       }
-    },
-    "Back" : {
-
     },
     "Basic" : {
 
@@ -1800,6 +1800,9 @@
           }
         }
       }
+    },
+    "Error" : {
+
     },
     "Failed To Add Vehicle" : {
       "localizations" : {
@@ -4940,6 +4943,9 @@
     },
     "User-friendly interface for controlling car maintenance tasks." : {
 
+    },
+    "Validation Error" : {
+
     },
     "Vehicle" : {
       "comment" : "Maintenance event vehicle picker header",
@@ -5005,6 +5011,9 @@
           }
         }
       }
+    },
+    "Vehicle %@" : {
+
     },
     "Vehicle Color" : {
       "localizations" : {
@@ -5215,6 +5224,9 @@
           }
         }
       }
+    },
+    "Vehicle Make cannot be empty! 🚗" : {
+
     },
     "Vehicle Model" : {
       "localizations" : {
@@ -5297,6 +5309,9 @@
           }
         }
       }
+    },
+    "Vehicle Model cannot be empty! 🚗" : {
+
     },
     "Vehicle Name" : {
       "localizations" : {
@@ -5379,6 +5394,9 @@
           }
         }
       }
+    },
+    "Vehicle Name cannot be empty! 🚗" : {
+
     },
     "Vehicle VIN" : {
       "localizations" : {
@@ -5784,9 +5802,6 @@
           }
         }
       }
-    },
-    "Welcome 🥳" : {
-
     },
     "Welcome to" : {
 

Basic-Car-Maintenance/Shared/MainView/Views/MainTabView.swift

@@ -57,6 +57,9 @@ struct MainTabView: View {
     @State private var authenticationViewModel = AuthenticationViewModel()
     @State private var viewModel = MainTabViewModel()
 
+    // Logic to load `WelcomeView` when app is first launched
+    @AppStorage("isFirstTime") private var isFirstTime: Bool = true
+
     init() {
         _selectedTabId = State(initialValue: selectedTab)
     }
@@ -77,6 +80,10 @@ struct MainTabView: View {
             AlertView(alert: alert)
                 .presentationDetents([.medium])
         }
+        .sheet(isPresented: $isFirstTime) {
+            WelcomeView(authenticationViewModel: authenticationViewModel)
+                .interactiveDismissDisabled()
+        }
         .onChange(of: scenePhase) { _, newScenePhase in
             guard
                 case .active = newScenePhase,

Basic-Car-Maintenance/Shared/Onboarding/Views/WelcomeView.swift

@@ -9,6 +9,7 @@
 import SwiftUI
 
 struct WelcomeView: View {
+    var authenticationViewModel: AuthenticationViewModel
 
     var body: some View {
         NavigationView {
@@ -17,10 +18,10 @@ struct WelcomeView: View {
                     HStack(spacing: 5) {
                         Text("Welcome to")
                         Text("Basic")
-                            .foregroundStyle(Color("basicGreen"))
+                            .foregroundStyle(.basicGreen)
                     }
                     Text("Car Maintenance")
-                        .foregroundStyle(Color("basicGreen"))
+                        .foregroundStyle(.basicGreen)
                 }
                 .font(.largeTitle.bold())
                 .multilineTextAlignment(.center)
@@ -32,19 +33,19 @@ struct WelcomeView: View {
                     pointView(
                         symbol: "car",
                         title: "Dashboard",
-                        subTitle: "User-friendly interface for controlling car maintenance tasks."
+                        subtitle: "User-friendly interface for controlling car maintenance tasks."
                     )
 
                     pointView(
                         symbol: "gauge.with.dots.needle.bottom.50percent.badge.plus",
                         title: "Odometer",
-                        subTitle: "Tracks & displays total mileage, aiding timely maintenance planning."
+                        subtitle: "Tracks & displays total mileage, aiding timely maintenance planning."
                     )
 
                     pointView(
                         symbol: "lock.open",
                         title: "Open Source",
-                        subTitle: "Built collaboratively with contributors, enhancing the app functionality."
+                        subtitle: "Built collaboratively with contributors, enhancing the app functionality."
                     )
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -53,7 +54,8 @@ struct WelcomeView: View {
 
                 Spacer(minLength: 10)
 
-                NavigationLink(destination: WelcomeViewAddVehicle()) {
+                NavigationLink(
+                    destination: WelcomeViewAddVehicle()) {
                     Text("Continue")
                         .fontWeight(.bold)
                         .foregroundStyle(.white)
@@ -74,25 +76,26 @@ struct WelcomeView: View {
     }
 
     @ViewBuilder
-    func pointView(symbol: String, title: LocalizedStringKey, subTitle: LocalizedStringKey) -> some View {
+    // swiftlint:disable:next line_length
+    func pointView(symbol: String, title: LocalizedStringResource, subtitle: LocalizedStringResource) -> some View {
         HStack(spacing: 20) {
             Image(systemName: symbol)
                 .font(.largeTitle)
-                .foregroundStyle(Color("basicGreen"))
+                .foregroundStyle(.basicGreen)
                 .frame(width: 45)
 
             VStack(alignment: .leading, spacing: 6) {
                 Text(title)
                     .font(.title3)
                     .fontWeight(.semibold)
 
-                Text(subTitle)
+                Text(subtitle)
                     .foregroundStyle(.gray)
             }
         }
     }
 }
 
 #Preview {
-    WelcomeView()
+    WelcomeView(authenticationViewModel: AuthenticationViewModel())
 }