Fix FirebaseAnalyticsModifier (#268)

mikaelacaron · Nov 21, 2023 · 81507f3 · 81507f3
1 parent 88fd367
commit 81507f3
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 12 deletions.
diff --git a/Basic-Car-Maintenance.xcodeproj/xcshareddata/xcschemes/Basic-Car-Maintenance.xcscheme b/Basic-Car-Maintenance.xcodeproj/xcshareddata/xcschemes/Basic-Car-Maintenance.xcscheme
@@ -74,6 +74,10 @@
          </BuildableReference>
       </BuildableProductRunnable>
       <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-FIRAnalyticsDebugEnabled"
+            isEnabled = "NO">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "-FIRDebugEnabled"
             isEnabled = "NO">

diff --git a/Basic-Car-Maintenance/Shared/Dashboard/Views/AddMaintenanceView.swift b/Basic-Car-Maintenance/Shared/Dashboard/Views/AddMaintenanceView.swift
@@ -67,7 +67,7 @@ struct AddMaintenanceView: View {
                          comment: "Notes text field header")
                 }
             }
-            .analyticsView()
+            .analyticsView("\(Self.self)")
             .navigationTitle(Text("Add Maintenance",
                                   comment: "Nagivation title for Add Maintenance view"))
             .toolbar {

diff --git a/Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift b/Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift
@@ -69,7 +69,7 @@ struct DashboardView: View {
                 }
                 .listStyle(.inset)
             }
-            .analyticsView()
+            .analyticsView("\(Self.self)")
             .searchable(text: $viewModel.searchText)
             .overlay {
                 if viewModel.isLoading {

diff --git a/Basic-Car-Maintenance/Shared/Dashboard/Views/EditEventDetailView.swift b/Basic-Car-Maintenance/Shared/Dashboard/Views/EditEventDetailView.swift
@@ -50,7 +50,7 @@ struct EditMaintenanceEventView: View {
                     Text("Notes")
                 }
             }
-            .analyticsView()
+            .analyticsView("\(Self.self)")
             .onAppear {
                 guard let selectedEvent = selectedEvent else { return }
                 setMaintenanceEventValues(event: selectedEvent)

diff --git a/Basic-Car-Maintenance/Shared/Info.plist b/Basic-Car-Maintenance/Shared/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>FirebaseAutomaticScreenReportingEnabled</key>
+	<false/>
 	<key>UIApplicationShortcutItems</key>
 	<array>
 		<dict>

diff --git a/Basic-Car-Maintenance/Shared/Odometer/Views/AddOdometerReadingView.swift b/Basic-Car-Maintenance/Shared/Odometer/Views/AddOdometerReadingView.swift
@@ -84,6 +84,7 @@ struct AddOdometerReadingView: View {
                 }
             }
         }
+        .analyticsView("\(Self.self)")
     }
 }
 

diff --git a/Basic-Car-Maintenance/Shared/Odometer/Views/OdometerView.swift b/Basic-Car-Maintenance/Shared/Odometer/Views/OdometerView.swift
@@ -66,7 +66,7 @@ struct OdometerView: View {
                 await viewModel.getVehicles()
             }
         }
-        .analyticsView()
+        .analyticsView("\(Self.self)")
     }
 
     private func makeAddOdometerView() -> some View {

diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/AddVehicleView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/AddVehicleView.swift
@@ -72,7 +72,7 @@ struct AddVehicleView: View {
                     Text("License Plate Number")
                 }
             }
-            .analyticsView()
+            .analyticsView("\(Self.self)")
             .toolbar {
                 ToolbarItem {
                     Button {

diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/AuthenticationView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/AuthenticationView.swift
@@ -56,7 +56,7 @@ struct AuthenticationView: View {
                 }
             }
         }
-        .analyticsView()
+        .analyticsView("\(Self.self)")
     }
 }
 

diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/ChooseAppIconView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/ChooseAppIconView.swift
@@ -40,6 +40,7 @@ struct ChooseAppIconView: View {
             }
         }
         .navigationTitle("Choose App Icon")
+        .analyticsView("\(Self.self)")
     }
 }
 

diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/ContributorsListView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/ContributorsListView.swift
@@ -24,7 +24,7 @@ struct ContributorsListView: View {
                 ProgressView()
             }
         }
-        .analyticsView()
+        .analyticsView("\(Self.self)")
         .task {
             Task {
                 await viewModel.getContributors()

diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift
@@ -183,7 +183,7 @@ struct SettingsView: View {
                             .animation(.linear(duration: 0.2), value: copiedAppVersion)
                     }
             }
-            .analyticsView()
+            .analyticsView("\(Self.self)")
             .navigationDestination(isPresented: $isShowingAddVehicle) {
                 AddVehicleView() { vehicle in
                     Task {

diff --git a/Basic-Car-Maintenance/Shared/Utilities/FirebaseAnalytics+Extension.swift b/Basic-Car-Maintenance/Shared/Utilities/FirebaseAnalytics+Extension.swift
@@ -8,15 +8,18 @@
 import SwiftUI
 import FirebaseAnalyticsSwift
 
-struct FireBaseAnalyticsModifier: ViewModifier {
+struct FirebaseAnalyticsModifier: ViewModifier {
+
+    let screenName: String
+
     func body(content: Content) -> some View {
         content
-            .analyticsScreen(name: "\(Self.self)")
+            .analyticsScreen(name: screenName)
     }
 }
 
 extension View {
-    func analyticsView() -> some View {
-        modifier(FireBaseAnalyticsModifier())
+    func analyticsView(_ name: String) -> some View {
+        modifier(FirebaseAnalyticsModifier(screenName: name))
     }
 }