New Tab Page & Favicons Refactor

BraveRewardsUI/Common/PublisherIconCircleImageView.swift

@@ -7,7 +7,8 @@ import BraveUI
 
 class PublisherIconCircleImageView: UIView {
 
-  private var imageView = UIImageView()
+  private(set) var imageView = UIImageView()
+  private var backgroundColorObserver: NSKeyValueObservation?
 
   init(size: CGFloat, inset: CGFloat = 7.0) {
     super.init(frame: .zero)
@@ -33,6 +34,10 @@ class PublisherIconCircleImageView: UIView {
       $0.borderColor = Colors.neutral100.cgColor
       $0.borderWidth = 1.0 / UIScreen.main.scale
     }
+
+    backgroundColorObserver = imageView.observe(\.backgroundColor, options: [.initial, .new], changeHandler: { [weak self] imageView, _ in
+      self?.backgroundColor = imageView.backgroundColor ?? .white
+    })
   }
 
   @available(*, unavailable)

BraveRewardsUI/Pending Contributions/PendingContributionCell.swift

@@ -9,7 +9,7 @@ class PendingContributionCell: UITableViewCell, TableViewReusable {
 
   private let siteStackView = UIStackView()
 
-  let siteImageView = PublisherIconCircleImageView(size: 28)
+  let siteImageView = PublisherIconCircleImageView(size: 28, inset: 4)
 
   let verifiedStatusImageView = UIImageView(image: UIImage(frameworkResourceNamed: "icn-verify")).then {
     $0.isHidden = true

BraveRewardsUI/Pending Contributions/PendingContributionListController.swift

@@ -199,10 +199,7 @@ extension PendingContributionListController: UITableViewDataSource {
     cell.accessoryType = .disclosureIndicator
 
     if let url = URL(string: contribution.url) {
-      state.dataSource?.retrieveFavicon(for: url, faviconURL: URL(string: contribution.faviconUrl)) { data in
-        cell.siteImageView.image = data?.image ?? UIImage(frameworkResourceNamed: "defaultFavicon")
-        cell.siteImageView.backgroundColor = data?.backgroundColor
-      }
+      state.dataSource?.retrieveFavicon(for: url, on: cell.siteImageView.imageView)
     }
 
     cell.verifiedStatusImageView.isHidden = contribution.status == .notVerified

BraveRewardsUI/RewardsDataSource.swift

@@ -15,8 +15,7 @@ public protocol RewardsDataSource: AnyObject {
   ///
   /// Execute completionBlock with FaviconData
   func retrieveFavicon(for pageURL: URL,
-                       faviconURL: URL?,
-                       completion: @escaping (FaviconData?) -> Void)
+                       on imageView: UIImageView)
 
   /// Get the page HTML for the given tab id if its available
   func pageHTML(for tabId: UInt64, completionHandler: @escaping (String?) -> Void)

BraveRewardsUI/Settings/Auto-Contribute/Exclusion List/AutoContributeExclusionListController.swift

@@ -158,10 +158,7 @@ extension AutoContributeExclusionListController: UITableViewDataSource {
     }
     let cell = tableView.dequeueReusableCell(for: indexPath) as ExclusionListCell
     if let url = URL(string: publisher.url) {
-      state.dataSource?.retrieveFavicon(for: url, faviconURL: URL(string: publisher.faviconUrl)) { data in
-        cell.siteImageView.image = data?.image ?? UIImage(frameworkResourceNamed: "defaultFavicon")
-        cell.siteImageView.backgroundColor = data?.backgroundColor
-      }
+      state.dataSource?.retrieveFavicon(for: url, on: cell.siteImageView.imageView)
     }
 
     cell.verifiedStatusImageView.isHidden = publisher.status == .notVerified

BraveRewardsUI/Settings/Auto-Contribute/Exclusion List/ExclusionListCell.swift

@@ -8,7 +8,7 @@ class ExclusionListCell: UITableViewCell, TableViewReusable {
 
   private let siteStackView = UIStackView()
 
-  let siteImageView = PublisherIconCircleImageView(size: 28)
+  let siteImageView = PublisherIconCircleImageView(size: 28, inset: 4)
 
   let verifiedStatusImageView = UIImageView(image: UIImage(frameworkResourceNamed: "icn-verify")).then {
     $0.isHidden = true

BraveRewardsUI/Settings/Auto-Contribute/Supported List/AutoContributeCell.swift

@@ -20,7 +20,7 @@ class AutoContributeCell: UITableViewCell, TableViewReusable {
     $0.backgroundColor = Colors.blurple100
   }
 
-  let siteImageView = PublisherIconCircleImageView(size: 28)
+  let siteImageView = PublisherIconCircleImageView(size: 28, inset: 4)
 
   let verifiedStatusImageView = UIImageView(image: UIImage(frameworkResourceNamed: "icn-verify")).then {
     $0.isHidden = true

BraveRewardsUI/Settings/Auto-Contribute/Supported List/AutoContributeSupportedListController.swift

@@ -118,10 +118,7 @@ extension AutoContributeSupportedListController: UITableViewDataSource {
     }
     let cell = tableView.dequeueReusableCell(for: indexPath) as AutoContributeCell
     if let url = URL(string: publisher.url) {
-      state.dataSource?.retrieveFavicon(for: url, faviconURL: URL(string: publisher.faviconUrl)) { data in
-        cell.siteImageView.image = data?.image ?? UIImage(frameworkResourceNamed: "defaultFavicon")
-        cell.siteImageView.backgroundColor = data?.backgroundColor
-      }
+      state.dataSource?.retrieveFavicon(for: url, on: cell.siteImageView.imageView)
     }
 
     cell.verifiedStatusImageView.isHidden = publisher.status == .notVerified

BraveRewardsUI/Settings/Monthly Tips/Details/MonthlyTipsDetailViewController.swift

@@ -184,10 +184,7 @@ extension MonthlyTipsDetailViewController: UITableViewDataSource {
       cell.siteNameLabel.attributedText = attrName
       cell.siteImageView.image = UIImage(frameworkResourceNamed: "defaultFavicon")
       if let url = URL(string: publisher.url) {
-        state.dataSource?.retrieveFavicon(for: url, faviconURL: URL(string: publisher.faviconUrl)) { data in
-          cell.siteImageView.image = data?.image ?? UIImage(frameworkResourceNamed: "defaultFavicon")
-          cell.siteImageView.backgroundColor = data?.backgroundColor
-        }
+        state.dataSource?.retrieveFavicon(for: url, on: cell.siteImageView)
       }
       cell.verifiedStatusImageView.isHidden = publisher.status == .notVerified
       let contribution = publisher.weight

BraveRewardsUI/Settings/Tips/Details/TipsDetailViewController.swift

@@ -150,7 +150,9 @@ extension TipsDetailViewController: UITableViewDataSource, UITableViewDelegate {
       cell.siteNameLabel.attributedText = attrName
 
       cell.siteImageView.image = UIImage(frameworkResourceNamed: "defaultFavicon")
-      setFavicon(identifier: tip.id, pageURL: tip.url, faviconURL: tip.faviconUrl)
+      if let url = URL(string: tip.url) {
+        state.dataSource?.retrieveFavicon(for: url, on: cell.siteImageView)
+      }
       cell.verifiedStatusImageView.isHidden = tip.status == .notVerified
       cell.typeNameLabel.text = Strings.oneTimeText + Date.stringFrom(reconcileStamp: tip.reconcileStamp)
       cell.tokenView.batContainer.amountLabel.text = "\(tip.weight)"
@@ -171,30 +173,6 @@ extension TipsDetailViewController {
     return report
   }
 
-  fileprivate func setFavicon(identifier: String, pageURL: String, faviconURL: String?) {
-    if let pageURL = URL(string: pageURL) {
-      state.dataSource?.retrieveFavicon(for: pageURL, faviconURL: URL(string: faviconURL ?? ""), completion: {[weak self] favData in
-        guard let self = self,
-          let image = favData?.image  else {
-            return
-        }
-
-        let indices = self.tipsList.enumerated().compactMap({ $0.element.id == identifier ? $0.offset : nil })
-        if indices.isEmpty {
-          return
-        }
-
-        if let tableView = (self.view as? SettingsTableView)?.tableView {
-          for index in indices {
-            if let cell = tableView.cellForRow(at: IndexPath(row: index, section: Section.tips.rawValue)) as? TipsTableCell {
-              cell.siteImageView.image = image
-            }
-          }
-        }
-      })
-    }
-  }
-
   func setupLedgerObservers() {
     ledgerObserver.recurringTipRemoved = { [weak self] key in
       guard let self = self, self.isViewLoaded else {

BraveRewardsUI/Tipping/TippingViewController.swift

@@ -115,13 +115,8 @@ class TippingViewController: UIViewController, UIViewControllerTransitioningDele
       })
 
       if let dataSource = self.state.dataSource,
-        let pageURL = URL(string: self.publisherInfo.url),
-        let faviconURL = self.state.faviconURL {
-        dataSource.retrieveFavicon(for: pageURL, faviconURL: faviconURL, completion: { faviconData in
-          guard let faviconData = faviconData else { return }
-          self.tippingView.overviewView.faviconImageView.image = faviconData.image
-          self.tippingView.overviewView.faviconImageView.backgroundColor = faviconData.backgroundColor
-        })
+        let pageURL = URL(string: self.publisherInfo.url) {
+        dataSource.retrieveFavicon(for: pageURL, on: self.tippingView.overviewView.faviconImageView.imageView)
       }
 
       self.tippingView.overviewView.socialStackView.arrangedSubviews.forEach({ $0.removeFromSuperview() })

BraveRewardsUI/Wallet/WalletViewController.swift

@@ -299,14 +299,7 @@ class WalletViewController: UIViewController, RewardsSummaryProtocol {
       publisherView.checkAgainButton.isHidden = publisher != nil
       publisherView.setCheckAgainIsLoading(state.ledger.isLoadingPublisherList)
 
-      state.dataSource?.retrieveFavicon(for: state.url, faviconURL: URL(string: publisher?.faviconUrl ?? "") ?? state.faviconURL, completion: { [weak self] faviconData in
-        guard let data = faviconData else { return }
-
-        self?.publisherSummaryView.publisherView.faviconImageView.do {
-          $0.image = data.image
-          $0.backgroundColor = data.backgroundColor
-        }
-      })
+      state.dataSource?.retrieveFavicon(for: state.url, on: publisherSummaryView.publisherView.faviconImageView.imageView)
 
       guard let publisher = publisher else {
         publisherView.updatePublisherName(state.dataSource?.displayString(for: state.url) ?? "", provider: "")

BraveUI/Buttons/SpringButton.swift

@@ -0,0 +1,31 @@
+// Copyright 2020 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import UIKit
+
+/// A control that scales down when highlighted and back up when not
+open class SpringButton: UIControl {
+  /// The scale to adjust to when the control is highlighted
+  open var highlightScale: CGFloat = 0.95
+
+  override open var isHighlighted: Bool {
+    didSet {
+      UIViewPropertyAnimator(duration: 0.3, dampingRatio: 0.8) {
+        let scale = self.isHighlighted ? self.highlightScale : 1.0
+        self.transform = CGAffineTransform(scaleX: scale, y: scale)
+      }
+      .startAnimation()
+    }
+  }
+
+  public override init(frame: CGRect) {
+    super.init(frame: frame)
+  }
+
+  @available(*, unavailable)
+  public required init(coder: NSCoder) {
+    fatalError()
+  }
+}

BraveUI/Extensions/UICollectionViewExtensions.swift

@@ -0,0 +1,25 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import UIKit
+
+public protocol CollectionViewReusable { }
+
+extension CollectionViewReusable {
+  fileprivate static var identifier: String {
+    return String(describing: type(of: self))
+  }
+}
+
+extension UICollectionView {
+  /// Register a UICollectionViewCell subclass as a dequeable cell
+  public func register<T: UICollectionViewCell & CollectionViewReusable>(_ cellClass: T.Type) {
+    register(cellClass, forCellWithReuseIdentifier: cellClass.identifier)
+  }
+  // swiftlint:disable force_cast
+  public func dequeueReusableCell<T: UICollectionViewCell & CollectionViewReusable>(for indexPath: IndexPath) -> T {
+    return dequeueReusableCell(withReuseIdentifier: T.identifier, for: indexPath) as! T
+  }
+  // swiftlint:enable force_cast
+}