Animate transition between New Tab Page and tab switcher

DuckDuckGo/Assets.xcassets/Home.imageset/Contents.json

@@ -1,12 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "home.pdf"
+      "filename" : "home.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
-}
+}

DuckDuckGo/HomeScreenTransition.swift

@@ -19,40 +19,30 @@
 
 import Core
 
+protocol HomeScreenTransitionSource: AnyObject {
+    var snapshotView: UIView { get }
+    var rootContainerView: UIView { get }
+}
+
 class HomeScreenTransition: TabSwitcherTransition {
 
     fileprivate var homeScreenSnapshot: UIView?
     fileprivate var settingsButtonSnapshot: UIView?
 
     fileprivate let tabSwitcherSettings: TabSwitcherSettings = DefaultTabSwitcherSettings()
 
-    fileprivate func prepareSnapshots(with homeScreen: HomeViewController,
+    fileprivate func prepareSnapshots(with transitionSource: HomeScreenTransitionSource,
                                       transitionContext: UIViewControllerContextTransitioning) {
-        let viewToSnapshot: UIView
-        let frameToSnapshot: CGRect
-        if let logoContainer = homeScreen.logoContainer, !logoContainer.isHidden {
-            viewToSnapshot = logoContainer
-            frameToSnapshot = homeScreen.collectionView.convert(homeScreen.collectionView.bounds,
-                                                                to: nil)
-        } else {
-            viewToSnapshot = homeScreen.collectionView
-            frameToSnapshot = viewToSnapshot.bounds
-        }
-
+        let viewToSnapshot = transitionSource.snapshotView
+        let frameToSnapshot = transitionSource.rootContainerView.convert(transitionSource.rootContainerView.bounds, to: viewToSnapshot)
+
         if let snapshot = viewToSnapshot.resizableSnapshotView(from: frameToSnapshot,
                                                                afterScreenUpdates: false,
                                                                withCapInsets: .zero) {
             imageContainer.addSubview(snapshot)
             snapshot.frame = imageContainer.bounds
             homeScreenSnapshot = snapshot
         }
-
-        // This fixes animation glitch in centered search mode.
-        settingsButtonSnapshot = homeScreen.settingsButton.snapshotView(afterScreenUpdates: true)
-        if let settingsButton = settingsButtonSnapshot {
-            settingsButton.frame = homeScreen.view.convert(homeScreen.settingsButton.frame, to: nil)
-            transitionContext.containerView.addSubview(settingsButton)
-        }
     }
 
     fileprivate func tabSwitcherCellFrame(for attributes: UICollectionViewLayoutAttributes) -> CGRect {
@@ -100,7 +90,7 @@ class FromHomeScreenTransition: HomeScreenTransition {
         tabSwitcherViewController.view.frame = transitionContext.finalFrame(for: tabSwitcherViewController)
         tabSwitcherViewController.prepareForPresentation()
 
-        guard let homeScreen = mainViewController.homeViewController,
+        guard let homeScreen = mainViewController.homeController,
               let tab = mainViewController.tabManager.model.currentTab,
               let rowIndex = tabSwitcherViewController.tabsModel.indexOf(tab: tab),
               let layoutAttr = tabSwitcherViewController.collectionView.layoutAttributesForItem(at: IndexPath(row: rowIndex, section: 0))
@@ -112,7 +102,7 @@ class FromHomeScreenTransition: HomeScreenTransition {
 
         let theme = ThemeManager.shared.currentTheme
 
-        solidBackground.frame = homeScreen.view.convert(homeScreen.collectionView.frame, to: nil)
+        solidBackground.frame = homeScreen.view.convert(homeScreen.rootContainerView.frame, to: nil)
         solidBackground.backgroundColor = theme.backgroundColor
 
         imageContainer.frame = solidBackground.frame
@@ -173,7 +163,7 @@ class ToHomeScreenTransition: HomeScreenTransition {
         prepareSubviews(using: transitionContext)
 
         guard let mainViewController = transitionContext.viewController(forKey: .to) as? MainViewController,
-              let homeScreen = mainViewController.homeViewController,
+              let homeScreen = mainViewController.homeController,
               let tab = mainViewController.tabManager.model.currentTab,
               let rowIndex = tabSwitcherViewController.tabsModel.indexOf(tab: tab),
               let layoutAttr = tabSwitcherViewController.collectionView.layoutAttributesForItem(at: IndexPath(row: rowIndex, section: 0))
@@ -206,7 +196,7 @@ class ToHomeScreenTransition: HomeScreenTransition {
         UIView.animateKeyframes(withDuration: TabSwitcherTransition.Constants.duration, delay: 0, options: .calculationModeLinear, animations: {
 
             UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 1.0) {
-                self.imageContainer.frame = homeScreen.view.convert(homeScreen.collectionView.frame, to: nil)
+                self.imageContainer.frame = homeScreen.view.convert(homeScreen.rootContainerView.frame, to: nil)
                 self.imageContainer.layer.cornerRadius = 0
                 self.imageContainer.backgroundColor = theme.backgroundColor
                 self.imageView.frame = CGRect(origin: .zero,

DuckDuckGo/HomeViewController.swift

@@ -34,7 +34,6 @@ class HomeViewController: UIViewController, NewTabPage {
     @IBOutlet weak var ctaContainer: UIView!
 
     @IBOutlet weak var collectionView: HomeCollectionView!
-    @IBOutlet weak var settingsButton: UIButton!
 
     @IBOutlet weak var daxDialogContainer: UIView!
     @IBOutlet weak var daxDialogContainerHeight: NSLayoutConstraint!
@@ -149,7 +148,6 @@ class HomeViewController: UIViewController, NewTabPage {
 
         collectionView.homePageConfiguration = homePageConfiguration
         configureCollectionView()
-        decorate()
 
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(remoteMessagesDidChange),
@@ -366,10 +364,16 @@ extension HomeViewController: HomeMessageViewSectionRendererDelegate {
     }
 }
 
-extension HomeViewController {
+extension HomeViewController: HomeScreenTransitionSource {
+    var snapshotView: UIView {
+        if let logoContainer = logoContainer, !logoContainer.isHidden {
+            return logoContainer
+        } else {
+            return collectionView
+        }
+    }
 
-    private func decorate() {
-        let theme = ThemeManager.shared.currentTheme
-        settingsButton.tintColor = theme.barTintColor
+    var rootContainerView: UIView {
+        collectionView
     }
 }

DuckDuckGo/MainViewController.swift

@@ -78,7 +78,7 @@ class MainViewController: UIViewController {
 
     var homeViewController: HomeViewController?
     var newTabPageViewController: NewTabPageViewController?
-    var homeController: NewTabPage? {
+    var homeController: (NewTabPage & HomeScreenTransitionSource)? {
         homeViewController ?? newTabPageViewController
     }
     var tabsBarController: TabsBarViewController?
@@ -2390,7 +2390,16 @@ extension MainViewController: TabSwitcherDelegate {
 
     func tabSwitcherDidRequestNewTab(tabSwitcher: TabSwitcherViewController) {
         newTab()
-        animateLogoAppearance()
+        if homeViewController != nil {
+            animateLogoAppearance()
+        } else if newTabPageViewController != nil {
+            newTabPageViewController?.view.transform = CGAffineTransform().scaledBy(x: 0.5, y: 0.5)
+            newTabPageViewController?.view.alpha = 0.0
+            UIView.animate(withDuration: 0.2, delay: 0.1, options: [.curveEaseInOut, .beginFromCurrentState]) {
+                self.newTabPageViewController?.view.transform = .identity
+                self.newTabPageViewController?.view.alpha = 1.0
+            }
+        }
     }
 
     func tabSwitcher(_ tabSwitcher: TabSwitcherViewController, didSelectTab tab: Tab) {

DuckDuckGo/NavigationSearchHomeViewSectionRenderer.swift

@@ -38,7 +38,6 @@ class NavigationSearchHomeViewSectionRenderer: HomeViewSectionRenderer {
         controller.disableContentUnderflow()
         controller.chromeDelegate?.setNavigationBarHidden(false)
         controller.collectionView.isScrollEnabled = !fixed
-        controller.settingsButton.isHidden = true
 
         if !fixed {
             controller.hideLogo()

DuckDuckGo/NewTabPageDaxLogoView.swift

@@ -21,8 +21,11 @@ import SwiftUI
 
 struct NewTabPageDaxLogoView: View {
     var body: some View {
-        VStack {
+        VStack(spacing: 12) {
             Image(.home)
+                .resizable()
+                .aspectRatio(1, contentMode: .fit)
+                .frame(width: 96)
             Image(.textDuckDuckGo)
         }
     }

DuckDuckGo/NewTabPageViewController.swift

@@ -164,3 +164,13 @@ final class NewTabPageViewController: UIHostingController<NewTabPageView<Favorit
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+extension NewTabPageViewController: HomeScreenTransitionSource {
+    var snapshotView: UIView {
+        view
+    }
+
+    var rootContainerView: UIView {
+        view
+    }
+}