From 1044d009ae3413cce0ad263c6fec1f778fd3843a Mon Sep 17 00:00:00 2001 From: FuelBoard Contributor Date: Sun, 11 Oct 2026 09:44:02 +0100 Subject: [PATCH] Refine onboarding permission flow --- FuelBoard.xcodeproj/project.pbxproj | 229 +++++++++++++++------------- FuelBoard/OnboardingView.swift | 10 +- 2 files changed, 122 insertions(+), 117 deletions(-) diff --git a/FuelBoard.xcodeproj/project.pbxproj b/FuelBoard.xcodeproj/project.pbxproj index 7529af4..6357cd5 100644 --- a/FuelBoard.xcodeproj/project.pbxproj +++ b/FuelBoard.xcodeproj/project.pbxproj @@ -7,20 +7,20 @@ objects = { /* Begin PBXBuildFile section */ - FBA000000000000000000001 /* DataRefreshMode.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000101 /* DataRefreshMode.swift */; }; - FBA000000000000000000002 /* FuelHistory.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000102 /* FuelHistory.swift */; }; - FBA000000000000000000003 /* FuelPriceProvider.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000103 /* FuelPriceProvider.swift */; }; - FBA000000000000000000004 /* FuelStore.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000104 /* FuelStore.swift */; }; - FBA000000000000000000005 /* MirrorFuelProvider.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000105 /* MirrorFuelProvider.swift */; }; - FBA000000000000000000006 /* SiriCheapestLookup.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000106 /* SiriCheapestLookup.swift */; }; - FBA000000000000000000007 /* WidgetLocationFetcher.swift in FuelBoardShared */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000107 /* WidgetLocationFetcher.swift */; }; + ADCE5B5A3033A32C008C131C /* FuelBoardWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = ADCE5B4F3033A329008C131C /* FuelBoardWatch Watch App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + ADCE5B623033A32D008C131C /* FuelBoardWatch Watch App Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = ADCE5B633033A32D008C131C /* FuelBoardWatch Watch App Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + BB0000000000000000000001 /* FuelBoardWidgets.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = BB0000000000000000000002 /* FuelBoardWidgets.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + FBA000000000000000000001 /* DataRefreshMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000101 /* DataRefreshMode.swift */; }; + FBA000000000000000000002 /* FuelHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000102 /* FuelHistory.swift */; }; + FBA000000000000000000003 /* FuelPriceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000103 /* FuelPriceProvider.swift */; }; + FBA000000000000000000004 /* FuelStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000104 /* FuelStore.swift */; }; + FBA000000000000000000005 /* MirrorFuelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000105 /* MirrorFuelProvider.swift */; }; + FBA000000000000000000006 /* SiriCheapestLookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000106 /* SiriCheapestLookup.swift */; }; + FBA000000000000000000007 /* WidgetLocationFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000107 /* WidgetLocationFetcher.swift */; }; FBA000000000000000000008 /* FuelBoardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000108 /* FuelBoardTests.swift */; }; FBA000000000000000000009 /* FuelHistoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA000000000000000000109 /* FuelHistoryTests.swift */; }; FBA00000000000000000000A /* LiveChainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA00000000000000000010A /* LiveChainTests.swift */; }; FBA00000000000000000000B /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FBA00000000000000000010B /* XCTest.framework */; }; - ADCE5B5A3033A32C008C131C /* FuelBoardWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = ADCE5B4F3033A329008C131C /* FuelBoardWatch Watch App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - ADCE5B623033A32D008C131C /* FuelBoardWatch Watch App Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = ADCE5B633033A32D008C131C /* FuelBoardWatch Watch App Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - BB0000000000000000000001 /* FuelBoardWidgets.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = BB0000000000000000000002 /* FuelBoardWidgets.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -84,7 +84,12 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - FBA000000000000000000100 /* FuelBoardSharedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FuelBoardSharedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + AD22FCFF30682512009859D4 /* FuelBoardTips.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = FuelBoardTips.storekit; sourceTree = ""; }; + AD64FC4C30739A4B008F27A9 /* FuelBoardSharedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FuelBoardSharedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + ADCE5B4F3033A329008C131C /* FuelBoardWatch Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FuelBoardWatch Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + ADCE5B633033A32D008C131C /* FuelBoardWatch Watch App Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "FuelBoardWatch Watch App Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; + BB0000000000000000000002 /* FuelBoardWidgets.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = FuelBoardWidgets.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + BB0000000000000000000007 /* FuelBoard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FuelBoard.app; sourceTree = BUILT_PRODUCTS_DIR; }; FBA000000000000000000101 /* DataRefreshMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataRefreshMode.swift; sourceTree = ""; }; FBA000000000000000000102 /* FuelHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuelHistory.swift; sourceTree = ""; }; FBA000000000000000000103 /* FuelPriceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuelPriceProvider.swift; sourceTree = ""; }; @@ -95,12 +100,7 @@ FBA000000000000000000108 /* FuelBoardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuelBoardTests.swift; sourceTree = ""; }; FBA000000000000000000109 /* FuelHistoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuelHistoryTests.swift; sourceTree = ""; }; FBA00000000000000000010A /* LiveChainTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveChainTests.swift; sourceTree = ""; }; - FBA00000000000000000010B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = "System/Library/Frameworks/XCTest.framework"; sourceTree = SDKROOT; }; - AD22FCFF30682512009859D4 /* FuelBoardTips.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = FuelBoardTips.storekit; sourceTree = ""; }; - ADCE5B4F3033A329008C131C /* FuelBoardWatch Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FuelBoardWatch Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - ADCE5B633033A32D008C131C /* FuelBoardWatch Watch App Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "FuelBoardWatch Watch App Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; - BB0000000000000000000002 /* FuelBoardWidgets.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = FuelBoardWidgets.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - BB0000000000000000000007 /* FuelBoard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FuelBoard.app; sourceTree = BUILT_PRODUCTS_DIR; }; + FBA00000000000000000010B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = System/Library/Frameworks/XCTest.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ @@ -132,14 +132,6 @@ /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ - FBA000000000000000000302 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - FBA00000000000000000000B /* XCTest.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; ADCE5B4C3033A329008C131C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -168,20 +160,62 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FBA000000000000000000302 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FBA00000000000000000000B /* XCTest.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - FBA000000000000000000200 = { + AD64FC4B30739A4B008F27A9 /* Recovered References */ = { + isa = PBXGroup; + children = ( + FBA00000000000000000010B /* XCTest.framework */, + ); + name = "Recovered References"; + sourceTree = ""; + }; + BB000000000000000000000D = { + isa = PBXGroup; + children = ( + FBA000000000000000000200 /* FuelBoardTests */, + AD22FCFF30682512009859D4 /* FuelBoardTips.storekit */, + BB0000000000000000000008 /* FuelBoard */, + BB0000000000000000000009 /* FuelBoardWidgets */, + BB000000000000000000000A /* Shared */, + ADCE5B663033A32D008C131C /* FuelBoardWatch Wrapper */, + ADCE5B503033A329008C131C /* FuelBoardWatch Watch App */, + BB000000000000000000000E /* Products */, + AD64FC4B30739A4B008F27A9 /* Recovered References */, + ); + sourceTree = ""; + }; + BB000000000000000000000E /* Products */ = { + isa = PBXGroup; + children = ( + BB0000000000000000000007 /* FuelBoard.app */, + BB0000000000000000000002 /* FuelBoardWidgets.appex */, + ADCE5B4F3033A329008C131C /* FuelBoardWatch Watch App.app */, + ADCE5B633033A32D008C131C /* FuelBoardWatch Watch App Extension.appex */, + AD64FC4C30739A4B008F27A9 /* FuelBoardSharedTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + FBA000000000000000000200 /* FuelBoardTests */ = { isa = PBXGroup; children = ( FBA000000000000000000201 /* Sources */, FBA000000000000000000202 /* Tests */, ); - name = FuelBoardTests; path = FuelBoardTests; sourceTree = ""; }; - FBA000000000000000000201 = { + FBA000000000000000000201 /* Sources */ = { isa = PBXGroup; children = ( FBA000000000000000000101 /* DataRefreshMode.swift */, @@ -196,7 +230,7 @@ path = Sources/FuelBoardShared; sourceTree = ""; }; - FBA000000000000000000202 = { + FBA000000000000000000202 /* Tests */ = { isa = PBXGroup; children = ( FBA000000000000000000108 /* FuelBoardTests.swift */, @@ -207,51 +241,9 @@ path = Tests/FuelBoardSharedTests; sourceTree = ""; }; - BB000000000000000000000D = { - isa = PBXGroup; - children = ( - FBA000000000000000000200 /* FuelBoardTests */, - AD22FCFF30682512009859D4 /* FuelBoardTips.storekit */, - BB0000000000000000000008 /* FuelBoard */, - BB0000000000000000000009 /* FuelBoardWidgets */, - BB000000000000000000000A /* Shared */, - ADCE5B663033A32D008C131C /* FuelBoardWatch Wrapper */, - ADCE5B503033A329008C131C /* FuelBoardWatch Watch App */, - BB000000000000000000000E /* Products */, - ); - sourceTree = ""; - }; - BB000000000000000000000E = { - isa = PBXGroup; - children = ( - BB0000000000000000000007 /* FuelBoard.app */, - BB0000000000000000000002 /* FuelBoardWidgets.appex */, - ADCE5B4F3033A329008C131C /* FuelBoardWatch Watch App.app */, - ADCE5B633033A32D008C131C /* FuelBoardWatch Watch App Extension.appex */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - FBA000000000000000000300 /* FuelBoardSharedTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = FBA000000000000000000400 /* Build configuration list for PBXNativeTarget "FuelBoardSharedTests" */; - buildPhases = ( - FBA000000000000000000301 /* Sources */, - FBA000000000000000000302 /* Frameworks */, - FBA000000000000000000303 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = FuelBoardSharedTests; - productName = FuelBoardSharedTests; - productReference = FBA000000000000000000100 /* FuelBoardSharedTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; ADCE5B4E3033A329008C131C /* FuelBoardWatch Watch App Extension */ = { isa = PBXNativeTarget; buildConfigurationList = ADCE5B593033A32B008C131C /* Build configuration list for PBXNativeTarget "FuelBoardWatch Watch App Extension" */; @@ -347,6 +339,23 @@ productReference = BB0000000000000000000007 /* FuelBoard.app */; productType = "com.apple.product-type.application"; }; + FBA000000000000000000300 /* FuelBoardSharedTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = FBA000000000000000000400 /* Build configuration list for PBXNativeTarget "FuelBoardSharedTests" */; + buildPhases = ( + FBA000000000000000000301 /* Sources */, + FBA000000000000000000302 /* Frameworks */, + FBA000000000000000000303 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FuelBoardSharedTests; + productName = FuelBoardSharedTests; + productReference = AD64FC4C30739A4B008F27A9 /* FuelBoardSharedTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -397,13 +406,6 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - FBA000000000000000000303 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; ADCE5B4D3033A329008C131C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -432,26 +434,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - FBA000000000000000000301 /* Sources */ = { - isa = PBXSourcesBuildPhase; + FBA000000000000000000303 /* Resources */ = { + isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - FBA000000000000000000001 /* DataRefreshMode.swift in FuelBoardShared */, - FBA000000000000000000002 /* FuelHistory.swift in FuelBoardShared */, - FBA000000000000000000003 /* FuelPriceProvider.swift in FuelBoardShared */, - FBA000000000000000000004 /* FuelStore.swift in FuelBoardShared */, - FBA000000000000000000005 /* MirrorFuelProvider.swift in FuelBoardShared */, - FBA000000000000000000006 /* SiriCheapestLookup.swift in FuelBoardShared */, - FBA000000000000000000007 /* WidgetLocationFetcher.swift in FuelBoardShared */, - FBA000000000000000000008 /* FuelBoardTests.swift in Sources */, - FBA000000000000000000009 /* FuelHistoryTests.swift in Sources */, - FBA00000000000000000000A /* LiveChainTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ ADCE5B4B3033A329008C131C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -473,6 +465,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FBA000000000000000000301 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + FBA000000000000000000001 /* DataRefreshMode.swift in Sources */, + FBA000000000000000000002 /* FuelHistory.swift in Sources */, + FBA000000000000000000003 /* FuelPriceProvider.swift in Sources */, + FBA000000000000000000004 /* FuelStore.swift in Sources */, + FBA000000000000000000005 /* MirrorFuelProvider.swift in Sources */, + FBA000000000000000000006 /* SiriCheapestLookup.swift in Sources */, + FBA000000000000000000007 /* WidgetLocationFetcher.swift in Sources */, + FBA000000000000000000008 /* FuelBoardTests.swift in Sources */, + FBA000000000000000000009 /* FuelHistoryTests.swift in Sources */, + FBA00000000000000000000A /* LiveChainTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -524,7 +533,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = Config/WatchApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -590,7 +599,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = Config/WatchApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -654,7 +663,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -719,7 +728,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -817,7 +826,7 @@ CODE_SIGN_ENTITLEMENTS = Config/App.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = "Config/App-Info.plist"; @@ -842,7 +851,7 @@ CODE_SIGN_ENTITLEMENTS = Config/App.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = "Config/App-Info.plist"; @@ -866,7 +875,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_ENTITLEMENTS = Config/Widget.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = "Config/Widget-Info.plist"; @@ -891,7 +900,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_ENTITLEMENTS = Config/Widget.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = F3BE6NE7U3; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = "Config/Widget-Info.plist"; @@ -959,15 +968,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - FBA000000000000000000400 /* Build configuration list for PBXNativeTarget "FuelBoardSharedTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - FBA000000000000000000401 /* Debug */, - FBA000000000000000000402 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; ADCE5B593033A32B008C131C /* Build configuration list for PBXNativeTarget "FuelBoardWatch Watch App Extension" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1013,6 +1013,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + FBA000000000000000000400 /* Build configuration list for PBXNativeTarget "FuelBoardSharedTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FBA000000000000000000401 /* Debug */, + FBA000000000000000000402 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = BB0000000000000000000004 /* Project object */; diff --git a/FuelBoard/OnboardingView.swift b/FuelBoard/OnboardingView.swift index 6e49778..8c102ef 100644 --- a/FuelBoard/OnboardingView.swift +++ b/FuelBoard/OnboardingView.swift @@ -241,9 +241,7 @@ struct OnboardingView: View { case 0: primaryButton(String(localized: "Continue", comment: "Onboarding continue button")) { page = 1 } case 1: - primaryButton( - prompter.locationDenied ? String(localized: "Open Settings", comment: "Open iOS Settings button") : (prompter.locationGranted ? String(localized: "Continue", comment: "Onboarding continue button") : String(localized: "Allow Location Access", comment: "Request location permission button")) - ) { + primaryButton(String(localized: "Continue", comment: "Onboarding continue button")) { if prompter.locationDenied { openSettings() } else if prompter.locationGranted { @@ -253,14 +251,12 @@ struct OnboardingView: View { // screen (after it's been read) and BEFORE advancing — so // the prompt never covers the next page's animation. Auto- // advance on grant moves us on once the user responds; - // denying leaves the page's "Open Settings" path. + // denying leaves the page's Settings path. prompter.requestLocation() } } case 2: - primaryButton( - prompter.notificationsDenied ? String(localized: "Continue without alerts", comment: "Continue after notification permission denied") : (prompter.notificationsGranted ? String(localized: "Continue", comment: "Onboarding continue button") : String(localized: "Allow Notifications", comment: "Request notifications permission button")) - ) { + primaryButton(String(localized: "Continue", comment: "Onboarding continue button")) { if prompter.notificationsDenied || prompter.notificationsGranted { page = 3 // decided either way — move on } else {