From dc296fc8aea1881b4671aaed01f42b3de9987921 Mon Sep 17 00:00:00 2001
From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com>
Date: Thu, 3 Dec 2020 12:41:28 -0800
Subject: [PATCH] Move favorites and bookmarks

---
 DB/Sources/DB/Entities/Timeline.swift                   | 2 +-
 View Controllers/TableViewController.swift              | 2 +-
 ViewModels/Sources/ViewModels/NavigationViewModel.swift | 4 ++--
 Views/SecondaryNavigationView.swift                     | 8 --------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/DB/Sources/DB/Entities/Timeline.swift b/DB/Sources/DB/Entities/Timeline.swift
index 60e54cd..3f9ca30 100644
--- a/DB/Sources/DB/Entities/Timeline.swift
+++ b/DB/Sources/DB/Entities/Timeline.swift
@@ -18,7 +18,7 @@ public extension Timeline {
     typealias Id = String
 
     static let unauthenticatedDefaults: [Timeline] = [.local, .federated]
-    static let authenticatedDefaults: [Timeline] = [.home, .local, .federated]
+    static let authenticatedDefaults: [Timeline] = [.home, .local, .federated, .favorites, .bookmarks]
 
     var filterContext: Filter.Context? {
         switch self {
diff --git a/View Controllers/TableViewController.swift b/View Controllers/TableViewController.swift
index a57d635..678482b 100644
--- a/View Controllers/TableViewController.swift	
+++ b/View Controllers/TableViewController.swift	
@@ -216,7 +216,7 @@ extension TableViewController: ZoomAnimatorDelegate {
     func referenceViewFrameInTransitioningView(for zoomAnimator: ZoomAnimator) -> CGRect? {
         guard let referenceView = referenceView(for: zoomAnimator) else { return nil }
 
-        return tabBarController?.view.convert(referenceView.frame, from: referenceView.superview)
+        return parent?.view.convert(referenceView.frame, from: referenceView.superview)
     }
 }
 
diff --git a/ViewModels/Sources/ViewModels/NavigationViewModel.swift b/ViewModels/Sources/ViewModels/NavigationViewModel.swift
index 92e2ccb..a653744 100644
--- a/ViewModels/Sources/ViewModels/NavigationViewModel.swift
+++ b/ViewModels/Sources/ViewModels/NavigationViewModel.swift
@@ -93,9 +93,9 @@ public extension NavigationViewModel {
 
     var timelineSubtitle: String {
         switch timeline {
-        case .home, .list:
+        case .home, .favorites, .bookmarks, .list:
             return identification.identity.handle
-        case .local, .federated, .tag, .profile, .favorites, .bookmarks:
+        case .local, .federated, .tag, .profile:
             return identification.identity.instance?.uri ?? ""
         }
     }
diff --git a/Views/SecondaryNavigationView.swift b/Views/SecondaryNavigationView.swift
index c2b513e..75289a6 100644
--- a/Views/SecondaryNavigationView.swift
+++ b/Views/SecondaryNavigationView.swift
@@ -56,14 +56,6 @@ struct SecondaryNavigationView: View {
                     NavigationLink(destination: ListsView(viewModel: .init(identification: viewModel.identification))) {
                         Label("secondary-navigation.lists", systemImage: "scroll")
                     }
-                    NavigationLink(destination: TableView(viewModelClosure: viewModel.favoritesViewModel)
-                                    .navigationTitle(Text("favorites"))) {
-                        Label("favorites", systemImage: "star")
-                    }
-                    NavigationLink(destination: TableView(viewModelClosure: viewModel.bookmarksViewModel)
-                                    .navigationTitle(Text("bookmarks"))) {
-                        Label("bookmarks", systemImage: "bookmark")
-                    }
                 }
                 Section {
                     NavigationLink(