Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Paywall Todos and Add Crashlytics #265

Merged
merged 5 commits into from
Nov 17, 2023
Merged

Make Paywall Todos and Add Crashlytics #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40ec4ba
Fix SwiftLint warning
mikaelacaron Nov 17, 2023
f0c2be9
Add todos for showing the paywall
mikaelacaron Nov 17, 2023
0969396
Add Crashlytics
mikaelacaron Nov 17, 2023
97e1a72
Follow instructions for implementing Crashlytics
mikaelacaron Nov 17, 2023
2344b8f
Uncheck based on dependency analysis
mikaelacaron Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion Basic-Car-Maintenance.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
E58499682ACDDA9A00634660 /* ContributorsProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58499672ACDDA9A00634660 /* ContributorsProfileView.swift */; };
E584996A2ACDDAFF00634660 /* Contributor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58499692ACDDAFF00634660 /* Contributor.swift */; };
FF09FC912AB6FF44006BE61A /* AuthenticationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF09FC902AB6FF44006BE61A /* AuthenticationView.swift */; };
FF153AFF2B07C3E000D0BA30 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = FF153AFE2B07C3E000D0BA30 /* FirebaseCrashlytics */; };
FF218EF62B00865F0025A533 /* AnalyticsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF218EF52B00865F0025A533 /* AnalyticsService.swift */; };
FF3DDF522AA4D28F009D91C4 /* DashboardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3DDF512AA4D28F009D91C4 /* DashboardViewModel.swift */; };
FF4E82BE2AD39863004949AF /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = FF4E82BD2AD39863004949AF /* FirebaseRemoteConfig */; };
Expand Down Expand Up @@ -175,6 +176,7 @@
FFC8CDAB2AA3867A00D129A6 /* FirebaseAuth in Frameworks */,
FFC8CDA72AA3867A00D129A6 /* FirebaseAnalytics in Frameworks */,
FF4E82C02AD39863004949AF /* FirebaseRemoteConfigSwift in Frameworks */,
FF153AFF2B07C3E000D0BA30 /* FirebaseCrashlytics in Frameworks */,
FF4E82C22AD39863004949AF /* FirebaseStorage in Frameworks */,
FFC8CDB32AA4226900D129A6 /* AdSupport.framework in Frameworks */,
);
Expand Down Expand Up @@ -490,6 +492,7 @@
FF5D13A12A86C2D600BC9BD6 /* Resources */,
FF748B5A2AB34A61004748A5 /* SwiftLintScript */,
FFDADF8F2ACD35A200DDEF79 /* Embed Foundation Extensions */,
FF50DDC22B07DF0C00E87362 /* ShellScript */,
);
buildRules = (
);
Expand All @@ -506,6 +509,7 @@
FF4E82BD2AD39863004949AF /* FirebaseRemoteConfig */,
FF4E82BF2AD39863004949AF /* FirebaseRemoteConfigSwift */,
FF4E82C12AD39863004949AF /* FirebaseStorage */,
FF153AFE2B07C3E000D0BA30 /* FirebaseCrashlytics */,
);
productName = "Basic-Car-Maintenance";
productReference = FF5D13A32A86C2D600BC9BD6 /* Basic-Car-Maintenance.app */;
Expand Down Expand Up @@ -661,6 +665,29 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
FF50DDC22B07DF0C00E87362 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
" $(SRCROOT)/${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}",
" $(SRCROOT)/${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${PRODUCT_NAME}",
" $(SRCROOT)/${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist",
" $(SRCROOT)/$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/GoogleService-Info.plist",
" $(SRCROOT)/$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\n\"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\n";
};
FF748B5A2AB34A61004748A5 /* SwiftLintScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -805,7 +832,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down Expand Up @@ -1161,6 +1188,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
FF153AFE2B07C3E000D0BA30 /* FirebaseCrashlytics */ = {
isa = XCSwiftPackageProductDependency;
package = FFC8CDA52AA3867A00D129A6 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCrashlytics;
};
FF4E82BD2AD39863004949AF /* FirebaseRemoteConfig */ = {
isa = XCSwiftPackageProductDependency;
package = FFC8CDA52AA3867A00D129A6 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
Expand Down
4 changes: 4 additions & 0 deletions Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@
}

Button {
// TODO: Show Paywall

Check warning on line 128 in Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

TODOs should be resolved (Show Paywall) (todo)
// Can only add 3 events, adding the 4th triggers the paywall
viewModel.isShowingAddMaintenanceEvent = true
} label: {
Image(systemName: SFSymbol.plus)
Expand All @@ -149,6 +151,8 @@
.onChange(of: scenePhase) { _, newScenePhase in
guard case .active = newScenePhase else { return }

// TODO: Show Paywall

Check warning on line 154 in Basic-Car-Maintenance/Shared/Dashboard/Views/DashboardView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

TODOs should be resolved (Show Paywall) (todo)

guard let action = actionService.action,
action == .newMaintenance
else {
Expand Down
2 changes: 2 additions & 0 deletions Basic-Car-Maintenance/Shared/Odometer/Views/OdometerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
.toolbar {
ToolbarItemGroup(placement: .primaryAction) {
Button {
// TODO: Show Paywall

Check warning on line 56 in Basic-Car-Maintenance/Shared/Odometer/Views/OdometerView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

TODOs should be resolved (Show Paywall) (todo)
// if adding a 4th odometer reading, show paywall
viewModel.isShowingAddOdometerReading = true
} label: {
Image(systemName: SFSymbol.plus)
Expand Down
7 changes: 6 additions & 1 deletion Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
Text(vin)
}

if let licensePlateNumber = vehicle.licensePlateNumber, !licensePlateNumber.isEmpty {
if let licensePlateNumber = vehicle.licensePlateNumber,
!licensePlateNumber.isEmpty {
Text(licensePlateNumber)
}
}
Expand All @@ -127,6 +128,8 @@
}

Button {
// TODO: Show Paywall

Check warning on line 131 in Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

TODOs should be resolved (Show Paywall) (todo)
// Show paywall if adding more than 1 vehicle, or show the `isShowingAddVehicle` view
isShowingAddVehicle = true
} label: {
Text("Add Vehicle", comment: "Label to add a vehicle.")
Expand Down Expand Up @@ -231,6 +234,8 @@
.onChange(of: scenePhase) { _, newScenePhase in
guard case .active = newScenePhase else { return }

// TODO: Show Paywall

Check warning on line 237 in Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift

View workflow job for this annotation

GitHub Actions / SwiftLint 

TODOs should be resolved (Show Paywall) (todo)

guard let action = actionService.action,
action == .addVehicle
else {
Expand Down
Loading