Merge pull request #241 from cocoatype/213-update-onboarding

Update onboarding

Author: Arclite

Modules/Onboarding/Resources/Media.xcassets/Paywall Onboarding.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Paywall Onboarding.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Paywall Onboarding@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Paywall Onboarding@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/Onboarding/Resources/Media.xcassets/Paywall Onboarding.imageset/Paywall Onboarding.png

@@ -2,17 +2,15 @@
 "AddPage.headline" = "Add";
 
 // Body for the add page
-"AddPage.body%@%@" = "You can add barcodes to Barc by entering them manually by tapping the %@ button, or scanning them by tapping the %@ button.
-
-Scanning for barcodes requires permission to access your phone’s camera. If you prefer not to grant this permission, other methods of adding barcodes will still be available.";
+"AddPage.body%@%@" = "You can add barcodes to Barc by entering them manually by tapping the %@ button, or scanning them by tapping the %@ button.";
 
 // Headline for the add page
 "ImportPage.headline" = "Import";
 
 // Body for the add page
 "ImportPage.body%@" = "You can import barcodes from other apps by sharing them or taking a screenshot.
 
-Try it now! Take a screenshot of this page. Next, tap the screenshot preview in the lower-left. On the page that appears, tap the %@ button. Then, find Barc in the menu it brings up (it may be in the “More” menu at the end of the list). Tapping the Barc icon will add this code to Barc.";
+Try it now! Take a screenshot of this page, and send it to the Barc app. (Barc may be in the “More” menu at the end of the list)";
 
 // Headline for the intro page
 "IntroPage.headline" = "Welcome to Barc.";
@@ -32,16 +30,28 @@ Either way, I hope you have a great time using Barc! If you have any questions o
 // Title for the button on the intro page that starts onboarding.
 "IntroPage.startButtonTitle" = "Get Started";
 
+// Headline for the paywall page
+"PaywallPage.headline" = "Unleash";
+
+// Primary button for the paywall page
+"PaywallPage.primaryButtonTitle" = "Learn More";
+
+// Secondary button for the paywall page
+"PaywallPage.secondaryButtonTitle" = "Not Yet";
+
+// Body for the paywall page
+"PaywallPage.body%@" = "Unlock unlimited barcodes and Apple Wallet support. Keep all of the barcodes you have, wherever you want them.
+
+As an indie developer, I built Barc to be the barcode app that I would use myself. Your support helps me keep making it better.";
+
 // Title for the button on all standard pages that continues onboarding.
 "StandardPage.continueButtonTitle" = "Continue";
 
 // Headline for the add page
 "TagPage.headline" = "Tag";
 
 // Body for the add page
-"TagPage.body" = "After adding a code, give it a name to help you remember it later. You can also add relevant places and dates to barcodes to let Barc know when best to show them to you.
-
-Using places to surface barcodes requires permission to access your location. If you prefer not to grant this permission, you can still use dates to help show barcodes when they’re important.";
+"TagPage.body" = "After adding a code, give it a name to help you remember it later. You can also add relevant places and dates to barcodes to let Barc know when best to show them to you.";
 
 // Headline for the add page
 "ViewPage.headline" = "Fetch";

Modules/Onboarding/Resources/Media.xcassets/Paywall Onboarding.imageset/Paywall Onboarding@2x.png

@@ -18,13 +18,11 @@ public struct OnboardingView: View {
             case .tag: TagPage()
             case .import: ImportPage()
             case .view: ViewPage()
-            case .paywall: PaywallView()
+            case .paywall: PaywallPage()
             }
         }.environment(\.advance, AdvanceAction {
             guard let nextPage = currentPage.next else { return dismiss() }
             currentPage = nextPage
-        }).environment(\.paywall, PaywallAction {
-            currentPage = .paywall
         })
     }
 }

Modules/Onboarding/Resources/Media.xcassets/Paywall Onboarding.imageset/Paywall Onboarding@3x.png

@@ -5,17 +5,14 @@ import Permission
 import SwiftUI
 
 struct AddPage: View {
-    private let requester = Permission.cameraPermissionRequester
     var body: some View {
         StandardPage(
             imageLight: Asset.addOnboarding.swiftUIImage,
             imageDark: Asset.addOnboardingDark.swiftUIImage,
             headline: OnboardingStrings.AddPage.headline,
             message: LocalizedStringKey("AddPage.body\(Image(systemName: "plus"))\(Image(systemName: "barcode.viewfinder"))"),
             pageIndex: 0
-        ) {
-            _ = await requester.requestPermission()
-        }
+        )
     }
 }
 

Modules/Onboarding/Resources/en.lproj/Localizable.strings

@@ -4,7 +4,7 @@
 import SwiftUI
 
 struct IntroPage: View {
-    @Environment(\.paywall) private var paywall
+    @Environment(\.dismiss) private var dismiss
     @Environment(\.advance) private var advance
 
     var body: some View {
@@ -16,7 +16,7 @@ struct IntroPage: View {
             )
             Spacer()
             HStack(spacing: 16) {
-                SecondaryButton(title: Strings.skipButtonTitle) { paywall() }
+                SecondaryButton(title: Strings.skipButtonTitle) { dismiss() }
                 PrimaryButton(title: Strings.startButtonTitle) { advance() }
             }
             .padding(.horizontal, 32)

Modules/Onboarding/Sources/Advancement/PaywallAction.swift

@@ -0,0 +1,46 @@
+//  Created by Geoff Pado on 12/23/24.
+//  Copyright © 2024 Cocoatype, LLC. All rights reserved.
+
+import Paywall
+import SwiftUI
+
+struct PaywallPage: View {
+    @Environment(\.dismiss) private var dismiss
+    @State private var isShowingPaywall = false
+    var body: some View {
+        VStack {
+            ScrollIfNecessary {
+                VStack {
+                    Asset.paywallOnboarding.swiftUIImage
+                        .padding(.top, 16)
+                    TextStack(
+                        headline: OnboardingStrings.PaywallPage.headline,
+                        message: OnboardingStrings.PaywallPage.body
+                    )
+                }
+            }
+            Spacer()
+            VStack {
+                HStack(spacing: 16) {
+                    SecondaryButton(title: OnboardingStrings.PaywallPage.secondaryButtonTitle) {
+                        dismiss()
+                    }
+                    PrimaryButton(title: OnboardingStrings.PaywallPage.primaryButtonTitle) {
+                        isShowingPaywall = true
+                    }
+                }
+                .padding(.horizontal, 32)
+                .padding(.bottom, 16)
+            }
+        }
+        .sheet(isPresented: $isShowingPaywall) {
+            dismiss()
+        } content: {
+            PaywallView()
+        }
+    }
+}
+
+#Preview {
+    PaywallPage()
+}