Subscriptions Base Implementation

Core/FeatureFlag.swift

@@ -34,12 +34,13 @@ public enum FeatureFlag: String {
     case networkProtection
     case networkProtectionWaitlistAccess
     case networkProtectionWaitlistActive
+    case privacyPro
 }
 
 extension FeatureFlag: FeatureFlagSourceProviding {
     public var source: FeatureFlagSource {
         switch self {
-        case .debugMenu, .appTrackingProtection:
+        case .debugMenu, .appTrackingProtection, .privacyPro:
             return .internalOnly
         case .sync:
             return .remoteReleasable(.subfeature(SyncSubfeature.level0ShowSync))

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -156,7 +156,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo-Alpha.xcscheme

@@ -23,14 +23,14 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Alpha Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Alpha Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -51,7 +51,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Alpha"
+      buildConfiguration = "Alpha Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -68,10 +68,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Alpha">
+      buildConfiguration = "Alpha Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Alpha"
+      buildConfiguration = "Alpha Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

DuckDuckGo/AppDelegate.swift

@@ -309,6 +309,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         widgetRefreshModel.beginObservingVPNStatus()
         NetworkProtectionAccessController().refreshNetworkProtectionAccess()
 #endif
+
+#if SUBSCRIPTION
+        setupSubscriptionsEnvironment()
+#endif
 
         return true
     }
@@ -351,6 +355,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         })
     }
 
+#if SUBSCRIPTION
+    private func setupSubscriptionsEnvironment() {
+        SubscriptionPurchaseEnvironment.current = .appStore
+    }
+#endif
+
     func applicationDidBecomeActive(_ application: UIApplication) {
         guard !testing else { return }
 

DuckDuckGo/AppSettings.swift

@@ -19,6 +19,28 @@
 
 import Bookmarks
 
+enum AddressBarPosition: String, CaseIterable, CustomStringConvertible {
+    case top
+    case bottom
+
+    var isBottom: Bool {
+        self == .bottom
+    }
+
+    var description: String {
+        return descriptionText
+    }
+
+    var descriptionText: String {
+        switch self {
+        case .top:
+            return UserText.addressBarPositionTop
+        case .bottom:
+            return UserText.addressBarPositionBottom
+        }
+    }
+}
+
 protocol AppSettings: AnyObject {
     var autocomplete: Bool { get set }
     var currentThemeName: ThemeName { get set }

DuckDuckGo/AutoClearSettingsViewController.swift

@@ -20,6 +20,7 @@
 import UIKit
 import MessageUI
 import Core
+import SwiftUI
 
 class AutoClearSettingsViewController: UITableViewController {
 

DuckDuckGo/AutoconsentSettingsViewController.swift

@@ -39,7 +39,7 @@ final class AutoconsentSettingsViewController: UITableViewController {
 
         autoconsentToggle.isOn = appSettings.autoconsentEnabled
 
-        let fontSize = SettingsViewController.fontSizeForHeaderView
+        let fontSize = FontSettings.fontSizeForHeaderView
         let text = NSAttributedString(string: UserText.autoconsentInfoText, attributes: [
             NSAttributedString.Key.font: UIFont.systemFont(ofSize: fontSize)
         ])

DuckDuckGo/AutofillLoginSettingsListViewController.swift

@@ -24,9 +24,9 @@ import BrowserServicesKit
 import Common
 import DDGSync
 import DesignResourcesKit
+import SwiftUI
 
 // swiftlint:disable file_length type_body_length
-
 protocol AutofillLoginSettingsListViewControllerDelegate: AnyObject {
     func autofillLoginSettingsListViewControllerDidFinish(_ controller: AutofillLoginSettingsListViewController)
 }
@@ -102,14 +102,17 @@ final class AutofillLoginSettingsListViewController: UIViewController {
                            multiplier: 1,
                            constant: (tableView.frame.height / 2))
     }()
+
+    var selectedAccount: SecureVaultModels.WebsiteAccount?
 
-    init(appSettings: AppSettings, currentTabUrl: URL? = nil, syncService: DDGSyncing, syncDataProviders: SyncDataProviders) {
+    init(appSettings: AppSettings, currentTabUrl: URL? = nil, syncService: DDGSyncing, syncDataProviders: SyncDataProviders, selectedAccount: SecureVaultModels.WebsiteAccount?) {
         let secureVault = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)
         if secureVault == nil {
             os_log("Failed to make vault")
         }
         self.viewModel = AutofillLoginListViewModel(appSettings: appSettings, tld: tld, secureVault: secureVault, currentTabUrl: currentTabUrl)
         self.syncService = syncService
+        self.selectedAccount = selectedAccount
         super.init(nibName: nil, bundle: nil)
 
         syncUpdatesCancellable = syncDataProviders.credentialsAdapter.syncDidCompletePublisher
@@ -148,6 +151,7 @@ final class AutofillLoginSettingsListViewController: UIViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         authenticate()
+
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -290,10 +294,18 @@ final class AutofillLoginSettingsListViewController: UIViewController {
                     self.delegate?.autofillLoginSettingsListViewControllerDidFinish(self)
                 }
             } else {
+                showSelectedAccountIfRequired()
                 self.syncService.scheduler.requestSyncImmediately()
             }
         }
     }
+
+    private func showSelectedAccountIfRequired() {
+        if let account = selectedAccount {
+            showAccountDetails(account)
+            selectedAccount = nil
+        }
+    }
 
     private func presentDeleteConfirmation(for title: String, domain: String) {
         let message = title.isEmpty ? UserText.autofillLoginListLoginDeletedToastMessageNoTitle