Merge branch 'trunk' into issue/6204-remove-stripe-ipp-from-experimental

koke · koke · commit b1ebb3123645 · 2022-02-18T11:52:11.000+01:00
diff --git a/Experiments/Experiments/DefaultFeatureFlagService.swift b/Experiments/Experiments/DefaultFeatureFlagService.swift
@@ -7,8 +7,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .barcodeScanner:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .largeTitles:
-            return true
         case .shippingLabelsM2M3:
             return true
         case .shippingLabelsInternational:
diff --git a/Experiments/Experiments/FeatureFlag.swift b/Experiments/Experiments/FeatureFlag.swift
@@ -10,10 +10,6 @@ public enum FeatureFlag: Int {
     ///
     case barcodeScanner
 
-    /// Large titles on the main tabs
-    ///
-    case largeTitles
-
     /// Product Reviews
     ///
     case reviews
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -345,4 +345,4 @@ DEPENDENCIES
   xcpretty-travis-formatter
 
 BUNDLED WITH
-   2.2.27
+   2.3.7
diff --git a/WooCommerce/Classes/Extensions/UINavigationBar+Appearance.swift b/WooCommerce/Classes/Extensions/UINavigationBar+Appearance.swift
@@ -9,24 +9,16 @@ extension UINavigationBar {
     /// Applies the default WC's Appearance
     ///
     class func applyWooAppearance() {
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-            let appearance = UINavigationBarAppearance()
-            appearance.configureWithOpaqueBackground()
-            appearance.backgroundColor = .listForeground
-            appearance.titleTextAttributes = [.foregroundColor: UIColor.text]
-            appearance.largeTitleTextAttributes = [.foregroundColor: UIColor.text]
+        let appearance = UINavigationBarAppearance()
+        appearance.configureWithOpaqueBackground()
+        appearance.backgroundColor = .listForeground
+        appearance.titleTextAttributes = [.foregroundColor: UIColor.text]
+        appearance.largeTitleTextAttributes = [.foregroundColor: UIColor.text]
 
-            UINavigationBar.appearance().tintColor = .accent // The color of bar button items in the navigation bar
-            UINavigationBar.appearance().standardAppearance = appearance
-            UINavigationBar.appearance().compactAppearance = appearance
-            UINavigationBar.appearance().scrollEdgeAppearance = appearance
-        } else {
-            let appearance = UINavigationBar.appearance()
-            appearance.barTintColor = .appBar
-            appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
-            appearance.isTranslucent = false
-            appearance.tintColor = .white
-        }
+        UINavigationBar.appearance().tintColor = .accent // The color of bar button items in the navigation bar
+        UINavigationBar.appearance().standardAppearance = appearance
+        UINavigationBar.appearance().compactAppearance = appearance
+        UINavigationBar.appearance().scrollEdgeAppearance = appearance
     }
 
     /// Applies UIKit's Default Appearance
diff --git a/WooCommerce/Classes/Styles/UIColor+SemanticColors.swift b/WooCommerce/Classes/Styles/UIColor+SemanticColors.swift
@@ -158,12 +158,7 @@ extension UIColor {
     /// App Navigation Bar.
     ///
     static var appBar: UIColor {
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-            return UIColor(light: .white, dark: .black)
-        } else {
-            return UIColor(light: .withColorStudio(.wooCommercePurple, shade: .shade60),
-                           dark: .systemColor(.secondarySystemGroupedBackground))
-        }
+        UIColor(light: .white, dark: .black)
     }
 
     /// App Tab Bar.
@@ -283,11 +278,7 @@ extension UIColor {
     /// Color for loading indicators within navigation bars
     ///
     static var navigationBarLoadingIndicator: UIColor {
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-            return .systemGray
-        } else {
-            return .white
-        }
+        .systemGray
     }
 
     /// SearchBar background color.
diff --git a/WooCommerce/Classes/System/WooTabNavigationController.swift b/WooCommerce/Classes/System/WooTabNavigationController.swift
@@ -6,18 +6,16 @@ import UIKit
 final class WooTabNavigationController: WooNavigationController {
     init() {
         super.init(nibName: nil, bundle: nil)
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-            navigationBar.prefersLargeTitles = true
-            delegate = self
-        }
+        navigationBar.prefersLargeTitles = true
+        delegate = self
     }
 
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) ? .default : StyleManager.statusBarLight
+        .default
     }
 
     private func updateNavigationBarAppearance(largeTitleDisplayMode: UINavigationItem.LargeTitleDisplayMode) {
diff --git a/WooCommerce/Classes/Tools/InfiniteScroll/PaginationTracker.swift b/WooCommerce/Classes/Tools/InfiniteScroll/PaginationTracker.swift
@@ -16,7 +16,7 @@ protocol PaginationTrackerDelegate: AnyObject {
 /// Keeps track of the pagination for API syncing to support infinite scroll.
 final class PaginationTracker {
     /// Default Settings
-    private enum Defaults {
+    enum Defaults {
         static let pageFirstIndex = Store.Default.firstPageNumber
         static let pageSize = 25
     }
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift
@@ -213,13 +213,11 @@ private extension DashboardViewController {
     }
 
     func configureDashboardUIContainer() {
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-            hiddenScrollView.configureForLargeTitleWorkaround()
-            // Adds the "hidden" scroll view to the root of the UIViewController for large titles.
-            view.addSubview(hiddenScrollView)
-            hiddenScrollView.translatesAutoresizingMaskIntoConstraints = false
-            view.pinSubviewToAllEdges(hiddenScrollView, insets: .zero)
-        }
+        hiddenScrollView.configureForLargeTitleWorkaround()
+        // Adds the "hidden" scroll view to the root of the UIViewController for large titles.
+        view.addSubview(hiddenScrollView)
+        hiddenScrollView.translatesAutoresizingMaskIntoConstraints = false
+        view.pinSubviewToAllEdges(hiddenScrollView, insets: .zero)
 
         // A container view is added to respond to safe area insets from the view controller.
         // This is needed when the child view controller's view has to use a frame-based layout
@@ -265,9 +263,7 @@ private extension DashboardViewController {
 
     func reloadDashboardUIStatsVersion(forced: Bool) {
         dashboardUIFactory.reloadDashboardUI(onUIUpdate: { [weak self] dashboardUI in
-            if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-                dashboardUI.scrollDelegate = self
-            }
+            dashboardUI.scrollDelegate = self
             self?.onDashboardUIUpdate(forced: forced, updatedDashboardUI: dashboardUI)
         })
     }
@@ -287,8 +283,7 @@ private extension DashboardViewController {
     }
 
     func updateUI(site: Site?) {
-        guard let siteName = site?.name, siteName.isEmpty == false,
-              ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) else {
+        guard let siteName = site?.name, siteName.isEmpty == false else {
             shouldShowStoreNameAsSubtitle = false
             storeNameLabel.text = nil
             return
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsMenuViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsMenuViewController.swift
@@ -130,7 +130,7 @@ private extension InPersonPaymentsMenuViewController {
 //
 extension InPersonPaymentsMenuViewController {
     func orderCardReaderWasPressed() {
-        WebviewHelper.launch(Constants.woocommercePurchaseCardReaderURL, with: self)
+        WebviewHelper.launch(configurationLoader.configuration.purchaseCardReaderUrl, with: self)
     }
 
     func manageCardReaderWasPressed() {
@@ -246,7 +246,6 @@ private enum Row: CaseIterable {
 }
 
 private enum Constants {
-    static let woocommercePurchaseCardReaderURL = URL(string: "https://woocommerce.com/products/m2-card-reader/")!
     static let bbposChipper2XBTManualURL = URL(string: "https://developer.bbpos.com/quick_start_guide/Chipper%202X%20BT%20Quick%20Start%20Guide.pdf")!
     static let stripeM2ManualURL = URL(string: "https://stripe.com/files/docs/terminal/m2_product_sheet.pdf")!
     static let wisepad3ManualURL = URL(string: "https://stripe.com/files/docs/terminal/wp3_product_sheet.pdf")!
diff --git a/WooCommerce/Classes/ViewRelated/Inbox/Inbox.swift b/WooCommerce/Classes/ViewRelated/Inbox/Inbox.swift
@@ -23,7 +23,6 @@ struct Inbox: View {
                     .background(Constants.listForeground)
                 }
             case .empty:
-                // TODO: 5954 - update empty state
                 EmptyState(title: Localization.emptyStateTitle,
                            description: Localization.emptyStateMessage,
                            image: .emptyInboxNotesImage)
diff --git a/WooCommerce/Classes/ViewRelated/Inbox/InboxViewModel.swift b/WooCommerce/Classes/ViewRelated/Inbox/InboxViewModel.swift
@@ -1,3 +1,4 @@
+import protocol Storage.StorageManagerType
 import Yosemite
 import Combine
 import Foundation
@@ -7,9 +8,6 @@ final class InboxViewModel: ObservableObject {
     /// Trigger to perform any one time setups.
     let onLoadTrigger: PassthroughSubject<Void, Never> = PassthroughSubject()
 
-    /// All inbox notes.
-    @Published private var notes: [InboxNote] = []
-
     /// View models for inbox note rows.
     @Published private(set) var noteRowViewModels: [InboxNoteRowViewModel] = []
 
@@ -35,6 +33,19 @@ final class InboxViewModel: ObservableObject {
     /// Supports infinite scroll.
     private let paginationTracker: PaginationTracker
 
+    private let pageFirstIndex: Int = PaginationTracker.Defaults.pageFirstIndex
+
+    /// Storage to fetch inbox notes.
+    private let storageManager: StorageManagerType
+
+    /// Inbox notes ResultsController.
+    private lazy var resultsController: ResultsController<StorageInboxNote> = {
+        let predicate = NSPredicate(format: "siteID == %lld", siteID)
+        let descriptor = NSSortDescriptor(keyPath: \StorageInboxNote.dateCreated, ascending: false)
+        let resultsController = ResultsController<StorageInboxNote>(storageManager: storageManager, matching: predicate, sortedBy: [descriptor])
+        return resultsController
+    }()
+
     /// Stores to sync inbox notes and handle note actions.
     private let stores: StoresManager
 
@@ -43,15 +54,16 @@ final class InboxViewModel: ObservableObject {
 
     init(siteID: Int64,
          syncState: SyncState = .empty,
-         pageSize: Int = SyncingCoordinator.Defaults.pageSize,
-         stores: StoresManager = ServiceLocator.stores) {
+         pageSize: Int = PaginationTracker.Defaults.pageSize,
+         stores: StoresManager = ServiceLocator.stores,
+         storageManager: StorageManagerType = ServiceLocator.storageManager) {
         self.siteID = siteID
         self.stores = stores
+        self.storageManager = storageManager
         self.syncState = syncState
-        self.paginationTracker = PaginationTracker(pageSize: pageSize)
-
-        $notes.map { $0.map { InboxNoteRowViewModel(note: $0) } }.assign(to: &$noteRowViewModels)
+        self.paginationTracker = PaginationTracker(pageFirstIndex: pageFirstIndex, pageSize: pageSize)
 
+        configureResultsController()
         configurePaginationTracker()
         configureFirstPageLoad()
     }
@@ -84,14 +96,17 @@ extension InboxViewModel: PaginationTrackerDelegate {
             guard let self = self else { return }
             switch result {
             case .success(let notes):
-                self.notes.append(contentsOf: notes)
                 let hasNextPage = notes.count == pageSize
                 onCompletion?(.success(hasNextPage))
+                // If the store has no inbox notes and thus there are no inbox notes for the first page, `ResultsController`'s
+                // callbacks from storage layer changes are not triggered and we have to manually update to `SyncState.empty` in this case.
+                if pageNumber == self.pageFirstIndex && notes.isEmpty {
+                    self.syncState = .empty
+                }
             case .failure(let error):
                 DDLogError("⛔️ Error synchronizing inbox notes: \(error)")
                 onCompletion?(.failure(error))
             }
-            self.transitionToResultsUpdatedState()
         }
         stores.dispatch(action)
     }
@@ -113,6 +128,24 @@ private extension InboxViewModel {
             }
             .store(in: &subscriptions)
     }
+
+    /// Performs initial fetch from storage and updates results.
+    func configureResultsController() {
+        resultsController.onDidChangeContent = updateResults
+        resultsController.onDidResetContent = updateResults
+
+        do {
+            try resultsController.performFetch()
+        } catch {
+            ServiceLocator.crashLogging.logError(error)
+        }
+    }
+
+    /// Updates row view models and sync state.
+    func updateResults() {
+        noteRowViewModels = resultsController.fetchedObjects.map { .init(note: $0) }
+        transitionToResultsUpdatedState()
+    }
 }
 
 // MARK: - State Machine
@@ -128,14 +161,14 @@ extension InboxViewModel {
     /// Update states for sync from remote.
     func transitionToSyncingState() {
         shouldShowBottomActivityIndicator = true
-        if notes.isEmpty {
+        if noteRowViewModels.isEmpty {
             syncState = .syncingFirstPage
         }
     }
 
     /// Update states after sync is complete.
     func transitionToResultsUpdatedState() {
         shouldShowBottomActivityIndicator = false
-        syncState = notes.isNotEmpty ? .results: .empty
+        syncState = noteRowViewModels.isNotEmpty ? .results: .empty
     }
 }
diff --git a/WooCommerce/Classes/ViewRelated/MainTabBarController.swift b/WooCommerce/Classes/ViewRelated/MainTabBarController.swift
@@ -83,7 +83,7 @@ final class MainTabBarController: UITabBarController {
     /// Used for overriding the status bar style for all child view controllers
     ///
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) ? .default: StyleManager.statusBarLight
+        .default
     }
 
     /// Notifications badge
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
@@ -186,15 +186,13 @@ private extension OrdersRootViewController {
 
     func configureChildViewController() {
         // Configure large title using the `hiddenScrollView` trick.
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {
-            hiddenScrollView.configureForLargeTitleWorkaround()
-            // Adds the "hidden" scroll view to the root of the UIViewController for large title workaround.
-            view.addSubview(hiddenScrollView)
-            view.sendSubviewToBack(hiddenScrollView)
-            hiddenScrollView.translatesAutoresizingMaskIntoConstraints = false
-            view.pinSubviewToAllEdges(hiddenScrollView, insets: .zero)
-            ordersViewController.delegate = self
-        }
+        hiddenScrollView.configureForLargeTitleWorkaround()
+        // Adds the "hidden" scroll view to the root of the UIViewController for large title workaround.
+        view.addSubview(hiddenScrollView)
+        view.sendSubviewToBack(hiddenScrollView)
+        hiddenScrollView.translatesAutoresizingMaskIntoConstraints = false
+        view.pinSubviewToAllEdges(hiddenScrollView, insets: .zero)
+        ordersViewController.delegate = self
 
         // Add contentView to stackview
         let contentView = ordersViewController.view!
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Inbox/InboxViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Inbox/InboxViewModelTests.swift
diff --git a/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift b/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift
diff --git a/Yosemite/Yosemite/Stores/InboxNotesStore.swift b/Yosemite/Yosemite/Stores/InboxNotesStore.swift

Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,16 @@ import UIKit`
`6`	`6`	`final class WooTabNavigationController: WooNavigationController {`
`7`	`7`	`init() {`
`8`	`8`	`super.init(nibName: nil, bundle: nil)`
`9`		`- if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) {`
`10`		`- navigationBar.prefersLargeTitles = true`
`11`		`- delegate = self`
`12`		`- }`
	`9`	`+ navigationBar.prefersLargeTitles = true`
	`10`	`+ delegate = self`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`required init?(coder aDecoder: NSCoder) {`
`16`	`14`	`fatalError("init(coder:) has not been implemented")`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`override var preferredStatusBarStyle: UIStatusBarStyle {`
`20`		`- ServiceLocator.featureFlagService.isFeatureFlagEnabled(.largeTitles) ? .default : StyleManager.statusBarLight`
	`18`	`+ .default`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`private func updateNavigationBarAppearance(largeTitleDisplayMode: UINavigationItem.LargeTitleDisplayMode) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protocol PaginationTrackerDelegate: AnyObject {`
`16`	`16`	`/// Keeps track of the pagination for API syncing to support infinite scroll.`
`17`	`17`	`final class PaginationTracker {`
`18`	`18`	`/// Default Settings`
`19`		`- private enum Defaults {`
	`19`	`+ enum Defaults {`
`20`	`20`	`static let pageFirstIndex = Store.Default.firstPageNumber`
`21`	`21`	`static let pageSize = 25`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private extension InPersonPaymentsMenuViewController {`
`130`	`130`	`//`
`131`	`131`	`extension InPersonPaymentsMenuViewController {`
`132`	`132`	`func orderCardReaderWasPressed() {`
`133`		`- WebviewHelper.launch(Constants.woocommercePurchaseCardReaderURL, with: self)`
	`133`	`+ WebviewHelper.launch(configurationLoader.configuration.purchaseCardReaderUrl, with: self)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`func manageCardReaderWasPressed() {`
`@@ -246,7 +246,6 @@ private enum Row: CaseIterable {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`private enum Constants {`
`249`		`- static let woocommercePurchaseCardReaderURL = URL(string: "https://woocommerce.com/products/m2-card-reader/")!`
`250`	`249`	`static let bbposChipper2XBTManualURL = URL(string: "https://developer.bbpos.com/quick_start_guide/Chipper%202X%20BT%20Quick%20Start%20Guide.pdf")!`
`251`	`250`	`static let stripeM2ManualURL = URL(string: "https://stripe.com/files/docs/terminal/m2_product_sheet.pdf")!`
`252`	`251`	`static let wisepad3ManualURL = URL(string: "https://stripe.com/files/docs/terminal/wp3_product_sheet.pdf")!`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ struct Inbox: View {`
`23`	`23`	`.background(Constants.listForeground)`
`24`	`24`	`}`
`25`	`25`	`case .empty:`
`26`		`- // TODO: 5954 - update empty state`
`27`	`26`	`EmptyState(title: Localization.emptyStateTitle,`
`28`	`27`	`description: Localization.emptyStateMessage,`
`29`	`28`	`image: .emptyInboxNotesImage)`