Feat/premium subscription

.gitignore

@@ -117,7 +117,7 @@ iOSInjectionProject/
 
 # End of https://www.toptal.com/developers/gitignore/api/macos,swift
 
-Config/secrets.xcconfig
+Config/secrets*.xcconfig
 **/*.otf
 **/.swiftpm
 **/.tmp

Config/Test_Subscriptions.storekit

@@ -0,0 +1,77 @@
+{
+  "identifier" : "C203F756",
+  "nonRenewingSubscriptions" : [
+
+  ],
+  "products" : [
+
+  ],
+  "settings" : {
+
+  },
+  "subscriptionGroups" : [
+    {
+      "id" : "7BB42CF1",
+      "localizations" : [
+
+      ],
+      "name" : "Pocket Premium Alpha",
+      "subscriptions" : [
+        {
+          "adHocOffers" : [
+
+          ],
+          "codeOffers" : [
+
+          ],
+          "displayPrice" : "4.99",
+          "familyShareable" : false,
+          "groupNumber" : 1,
+          "internalID" : "EAB5EDEA",
+          "introductoryOffer" : null,
+          "localizations" : [
+            {
+              "description" : "",
+              "displayName" : "",
+              "locale" : "en_US"
+            }
+          ],
+          "productID" : "monthly.subscription.pocket",
+          "recurringSubscriptionPeriod" : "P1M",
+          "referenceName" : "Pocket Premium Monthly",
+          "subscriptionGroupID" : "7BB42CF1",
+          "type" : "RecurringSubscription"
+        },
+        {
+          "adHocOffers" : [
+
+          ],
+          "codeOffers" : [
+
+          ],
+          "displayPrice" : "44.99",
+          "familyShareable" : false,
+          "groupNumber" : 1,
+          "internalID" : "B7F87368",
+          "introductoryOffer" : null,
+          "localizations" : [
+            {
+              "description" : "",
+              "displayName" : "",
+              "locale" : "en_US"
+            }
+          ],
+          "productID" : "annual.subscription.pocket",
+          "recurringSubscriptionPeriod" : "P1M",
+          "referenceName" : "Pocket Premium Annual",
+          "subscriptionGroupID" : "7BB42CF1",
+          "type" : "RecurringSubscription"
+        }
+      ]
+    }
+  ],
+  "version" : {
+    "major" : 2,
+    "minor" : 0
+  }
+}

Info.plist

@@ -56,6 +56,10 @@
 	<string>$(POCKET_API_BASE_URL)</string>
 	<key>PocketAPIConsumerKey</key>
 	<string>$(POCKET_API_CONSUMER_KEY)</string>
+	<key>PocketPremiumMonthly</key>
+	<string>$(POCKET_PREMIUM_MONTHLY)</string>
+	<key>PocketPremiumAnnual</key>
+	<string>$(POCKET_PREMIUM_ANNUAL)</string>
 	<key>SentryDSN</key>
 	<string>$(SENTRY_DSN)</string>
 	<key>SnowplowEndpoint</key>

Pocket.xcodeproj/project.pbxproj

@@ -65,6 +65,7 @@
 		8A7765A2288EE80900127BB4 /* RecentSavesCellElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7765A1288EE80900127BB4 /* RecentSavesCellElement.swift */; };
 		8A8F5EFE28CB740000124B6D /* EditTagsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8F5EFD28CB740000124B6D /* EditTagsTests.swift */; };
 		8ADAC6B028AD4E7500DE9A62 /* AddTagsViewElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ADAC6AF28AD4E7500DE9A62 /* AddTagsViewElement.swift */; };
+		AA7D6A2B2995F0A20094FD18 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7D6A2A2995F0A20094FD18 /* StoreKit.framework */; };
 		8ADD6A9F292C189C007F419D /* SearchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ADD6A9E292C189C007F419D /* SearchTests.swift */; };
 		8ADD6AA1292C1B2C007F419D /* SearchViewElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ADD6AA0292C1B2C007F419D /* SearchViewElement.swift */; };
 		D26A5EF4297F1D8400FA5A88 /* ReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26A5EF3297F1D8400FA5A88 /* ReaderTests.swift */; };
@@ -215,9 +216,12 @@
 		8A7765A1288EE80900127BB4 /* RecentSavesCellElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentSavesCellElement.swift; sourceTree = "<group>"; };
 		8A8F5EFD28CB740000124B6D /* EditTagsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTagsTests.swift; sourceTree = "<group>"; };
 		8ADAC6AF28AD4E7500DE9A62 /* AddTagsViewElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTagsViewElement.swift; sourceTree = "<group>"; };
+		AA7D6A2A2995F0A20094FD18 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
+		D26A5EF3297F1D8400FA5A88 /* ReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderTests.swift; sourceTree = "<group>"; };
 		8ADD6A9E292C189C007F419D /* SearchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTests.swift; sourceTree = "<group>"; };
 		8ADD6AA0292C1B2C007F419D /* SearchViewElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewElement.swift; sourceTree = "<group>"; };
-		D26A5EF3297F1D8400FA5A88 /* ReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderTests.swift; sourceTree = "<group>"; };
+		AA909AC8299EFD3A00F90FA7 /* secrets_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = secrets_test.xcconfig; sourceTree = "<group>"; };
+		AA909ACC299F4D5400F90FA7 /* Test_Subscriptions.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Test_Subscriptions.storekit; sourceTree = "<group>"; };
 		F204A76027E22EC50010E155 /* SaveToPocket.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SaveToPocket.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		F204A76727E22EC50010E155 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F20BB0382744542F00AE5E70 /* AlertElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertElement.swift; sourceTree = "<group>"; };
@@ -238,6 +242,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				16BA7D6626851579009A17C1 /* PocketKit in Frameworks */,
+				AA7D6A2B2995F0A20094FD18 /* StoreKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -410,7 +415,9 @@
 		16973354263CBB290003DE2A /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				AA909AC8299EFD3A00F90FA7 /* secrets_test.xcconfig */,
 				16973355263CBB3F0003DE2A /* secrets.xcconfig */,
+				AA909ACC299F4D5400F90FA7 /* Test_Subscriptions.storekit */,
 			);
 			path = Config;
 			sourceTree = "<group>";
@@ -449,6 +456,7 @@
 		F220F2B8264DC2750064D272 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				AA7D6A2A2995F0A20094FD18 /* StoreKit.framework */,
 				F227F0C3265E96290031F985 /* CoreText.framework */,
 				65EC272628BA8AD50075E1DF /* UserNotifications.framework */,
 				65EC272828BA8AD50075E1DF /* UserNotificationsUI.framework */,
@@ -1069,7 +1077,7 @@
 		};
 		1676E5A727FBC89A00F9283A /* Debug_Test */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 16973355263CBB3F0003DE2A /* secrets.xcconfig */;
+			baseConfigurationReference = AA909AC8299EFD3A00F90FA7 /* secrets_test.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;

PocketKit/Sources/PocketKit/Keys.swift

@@ -11,6 +11,8 @@ struct Keys {
     let sentryDSN: String
     let brazeAPIEndpoint: String
     let brazeAPIKey: String
+    let pocketPremiumMonthly: String
+    let pocketPremiumAnnual: String
 
     private init() {
         guard let info = Bundle.main.infoDictionary else {
@@ -33,9 +35,19 @@ struct Keys {
             fatalError("Unable to extract BrazeAPIKey from main bundle")
         }
 
+        guard let pocketPremiumMonthly = info["PocketPremiumMonthly"] as? String else {
+            fatalError("Unable to extract PocketPremiumMonthlyAlpha from main bundle")
+        }
+
+        guard let pocketPremiumAnnual = info["PocketPremiumAnnual"] as? String else {
+            fatalError("Unable to extract PocketPremiumAnnualAlpha from main bundle")
+        }
+
         self.pocketApiConsumerKey = pocketApiConsumerKey
         self.sentryDSN = sentryDSN
         self.brazeAPIEndpoint = brazeAPIEndpoint
         self.brazeAPIKey = brazeAPIKey
+        self.pocketPremiumMonthly = pocketPremiumMonthly
+        self.pocketPremiumAnnual = pocketPremiumAnnual
     }
 }

PocketKit/Sources/PocketKit/MyList/EmptyStates/EmptyStateView.swift

@@ -25,7 +25,7 @@ open class SwiftUICollectionViewCell<Content>: UICollectionViewCell where Conten
     }
 }
 
-class EmptyStateCollectionViewCell: SwiftUICollectionViewCell<EmptyStateView> {
+class EmptyStateCollectionViewCell: SwiftUICollectionViewCell<EmptyStateView<EmptyView>> {
     func configure(parent: UIViewController, _ viewModel: EmptyStateViewModel) {
         embed(in: parent, withView: EmptyStateView(viewModel: viewModel))
         host?.view.frame = self.contentView.bounds
@@ -34,14 +34,16 @@ class EmptyStateCollectionViewCell: SwiftUICollectionViewCell<EmptyStateView> {
     }
 }
 
-struct EmptyStateView: View {
-    private var viewModel: EmptyStateViewModel
+struct EmptyStateView<Content: View>: View {
+    private let viewModel: EmptyStateViewModel
+    private var content: Content?
 
     @State
     private var showSafariView = false
 
-    init(viewModel: EmptyStateViewModel) {
+    init(viewModel: EmptyStateViewModel, content: (() -> Content)? = nil) {
         self.viewModel = viewModel
+        self.content = content?()
     }
 
     var body: some View {
@@ -64,8 +66,9 @@ struct EmptyStateView: View {
                         }
                     } else { Text(subtitle).style(.detail) }
                 }
-
-                if let buttonText = viewModel.buttonText, let webURL = viewModel.webURL {
+                if let content {
+                    content
+                } else if let buttonText = viewModel.buttonText, let webURL = viewModel.webURL {
                     Button(action: {
                         self.showSafariView = true
                     }, label: {

PocketKit/Sources/PocketKit/MyList/SearchItemsList/SearchView.swift

@@ -14,6 +14,7 @@ struct SearchView: View {
             switch viewModel.searchState {
             case .emptyState(let emptyStateViewModel):
                 SearchEmptyView(viewModel: emptyStateViewModel)
+                    .environmentObject(viewModel)
             case .recentSearches(let searches):
                 RecentSearchView(viewModel: viewModel, recentSearches: searches)
             case .searchResults(let results):
@@ -23,8 +24,6 @@ struct SearchView: View {
             default:
                 EmptyView()
             }
-        }.onAppear {
-            viewModel.trackOpenSearch()
         }
     }
 }
@@ -68,11 +67,45 @@ struct ResultsView: View {
 
 // MARK: - Search Empty States Component
 struct SearchEmptyView: View {
-    var viewModel: EmptyStateViewModel
+    private var viewModel: EmptyStateViewModel
+
+    init(viewModel: EmptyStateViewModel) {
+        self.viewModel = viewModel
+    }
 
     var body: some View {
-        EmptyStateView(viewModel: viewModel)
+        if let text = viewModel.buttonText {
+            EmptyStateView(viewModel: viewModel) {
+                GetPocketPremiumButton(text: text)
+            }
             .padding(Margins.normal.rawValue)
+        } else {
+            EmptyStateView<EmptyView>(viewModel: viewModel)
+                .padding(Margins.normal.rawValue)
+        }
+    }
+}
+
+struct GetPocketPremiumButton: View {
+    @EnvironmentObject private var searchViewModel: SearchViewModel
+    private let text: String
+
+    init(text: String) {
+        self.text = text
+    }
+
+    var body: some View {
+        Button(action: {
+            searchViewModel.showPremiumUpgrade()
+        }, label: {
+            Text(text)
+                .style(.header.sansSerif.h7.with(color: .ui.white))
+                .padding(EdgeInsets(top: 12, leading: 0, bottom: 12, trailing: 0))
+                .frame(maxWidth: 320)
+        }).buttonStyle(GetPocketPremiumButtonStyle())
+            .sheet(isPresented: $searchViewModel.isPresentingPremiumUpgrade) {
+                PremiumUpgradeView(viewModel: searchViewModel.makePremiumUpgradeViewModel())
+            }
     }
 }