Apply Coordinator Pattern and Add Deep-Links

JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -109,6 +109,15 @@
           "version": "0.3.1"
         }
       },
+      {
+        "package": "Stinsen",
+        "repositoryURL": "https://github.com/rundfunk47/stinsen",
+        "state": {
+          "branch": null,
+          "revision": "3d06c7603c70f8af1bd49f8d49f17e98f25b2d6a",
+          "version": "2.0.2"
+        }
+      },
       {
         "package": "swift-log",
         "repositoryURL": "https://github.com/apple/swift-log.git",

JellyfinPlayer/Components/CardVStackView.swift → JellyfinPlayer/Components/EpisodeCardVStackView.swift

@@ -10,9 +10,10 @@
 import SwiftUI
 import JellyfinAPI
 
-struct CardVStackView: View {
+struct EpisodeCardVStackView: View {
 
     let items: [BaseItemDto]
+    let selectedAction: (BaseItemDto) -> Void
 
     private func buildCardOverlayView(item: BaseItemDto) -> some View {
         HStack {
@@ -45,8 +46,9 @@ struct CardVStackView: View {
     var body: some View {
         VStack {
             ForEach(items, id: \.id) { item in
-                NavigationLink(destination: ItemNavigationView(item: item)) {
-
+                Button {
+                    selectedAction(item)
+                } label: {
                     HStack {
 
                         // MARK: Image

JellyfinPlayer/Components/PillHStackView.swift

@@ -13,11 +13,12 @@ protocol PillStackable {
     var title: String { get }
 }
 
-struct PillHStackView<NavigationView: View, ItemType: PillStackable>: View {
+struct PillHStackView<ItemType: PillStackable>: View {
 
     let title: String
     let items: [ItemType]
-    let navigationView: (ItemType) -> NavigationView
+//    let navigationView: (ItemType) -> NavigationView
+    let selectedAction: (ItemType) -> Void
 
     var body: some View {
         VStack(alignment: .leading) {
@@ -30,14 +31,14 @@ struct PillHStackView<NavigationView: View, ItemType: PillStackable>: View {
             ScrollView(.horizontal, showsIndicators: false) {
                 HStack {
                     ForEach(items, id: \.title) { item in
-                        NavigationLink(destination: LazyView {
-                            navigationView(item)
-                        }) {
+                        Button {
+                            selectedAction(item)
+                        } label: {
                             ZStack {
                                 Color(UIColor.systemFill)
                                     .frame(maxWidth: .infinity, maxHeight: .infinity)
                                     .cornerRadius(10)
-                                
+
                                 Text(item.title)
                                     .font(.caption)
                                     .fontWeight(.semibold)

JellyfinPlayer/Components/PortraitHStackView.swift

@@ -17,20 +17,20 @@ public protocol PortraitImageStackable {
     var failureInitials: String { get }
 }
 
-struct PortraitImageHStackView<TopBarView: View, NavigationView: View, ItemType: PortraitImageStackable>: View {
+struct PortraitImageHStackView<TopBarView: View, ItemType: PortraitImageStackable>: View {
 
     let items: [ItemType]
     let maxWidth: Int
     let horizontalAlignment: HorizontalAlignment
     let topBarView: () -> TopBarView
-    let navigationView: (ItemType) -> NavigationView
+    let selectedAction: (ItemType) -> Void
 
-    init(items: [ItemType], maxWidth: Int, horizontalAlignment: HorizontalAlignment = .leading, topBarView: @escaping () -> TopBarView, navigationView: @escaping (ItemType) -> NavigationView) {
+    init(items: [ItemType], maxWidth: Int, horizontalAlignment: HorizontalAlignment = .leading, topBarView: @escaping () -> TopBarView, selectedAction: @escaping (ItemType) -> Void) {
         self.items = items
         self.maxWidth = maxWidth
         self.horizontalAlignment = horizontalAlignment
         self.topBarView = topBarView
-        self.navigationView = navigationView
+        self.selectedAction = selectedAction
     }
 
     var body: some View {
@@ -45,38 +45,36 @@ struct PortraitImageHStackView<TopBarView: View, NavigationView: View, ItemType:
                         Spacer().frame(width: 16)
 
                         ForEach(items, id: \.title) { item in
-                            NavigationLink(
-                                destination: LazyView {
-                                    navigationView(item)
-                                },
-                                label: {
-                                    VStack {
-                                        ImageView(src: item.imageURLContsructor(maxWidth: maxWidth),
-                                                  bh: item.blurHash,
-                                                  failureInitials: item.failureInitials)
-                                            .frame(width: 100, height: CGFloat(maxWidth))
-                                            .cornerRadius(10)
-                                            .shadow(radius: 4, y: 2)
-
-                                        Text(item.title)
-                                            .font(.footnote)
-                                            .fontWeight(.regular)
+                            Button {
+                                selectedAction(item)
+                            } label: {
+                                VStack {
+                                    ImageView(src: item.imageURLContsructor(maxWidth: maxWidth),
+                                              bh: item.blurHash,
+                                              failureInitials: item.failureInitials)
+                                        .frame(width: 100, height: CGFloat(maxWidth))
+                                        .cornerRadius(10)
+                                        .shadow(radius: 4, y: 2)
+
+                                    Text(item.title)
+                                        .font(.footnote)
+                                        .fontWeight(.regular)
+                                        .frame(width: 100)
+                                        .foregroundColor(.primary)
+                                        .multilineTextAlignment(.center)
+                                        .lineLimit(2)
+
+                                    if let description = item.description {
+                                        Text(description)
+                                            .font(.caption)
+                                            .fontWeight(.medium)
                                             .frame(width: 100)
-                                            .foregroundColor(.primary)
+                                            .foregroundColor(.secondary)
                                             .multilineTextAlignment(.center)
                                             .lineLimit(2)
-
-                                        if let description = item.description {
-                                            Text(description)
-                                                .font(.caption)
-                                                .fontWeight(.medium)
-                                                .frame(width: 100)
-                                                .foregroundColor(.secondary)
-                                                .multilineTextAlignment(.center)
-                                                .lineLimit(2)
-                                        }
                                     }
-                                })
+                                }
+                            }
                         }
                         Spacer().frame(width: UIDevice.current.userInterfaceIdiom == .pad ? 16 : 55)
                     }

JellyfinPlayer/Components/PortraitItemView.swift

@@ -1,91 +1,85 @@
 //
- /* 
-  * SwiftFin is subject to the terms of the Mozilla Public
-  * License, v2.0. If a copy of the MPL was not distributed with this
-  * file, you can obtain one at https://mozilla.org/MPL/2.0/.
-  *
-  * Copyright 2021 Aiden Vigue & Jellyfin Contributors
-  */
+/*
+ * SwiftFin is subject to the terms of the Mozilla Public
+ * License, v2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 2021 Aiden Vigue & Jellyfin Contributors
+ */
 
-import SwiftUI
 import JellyfinAPI
+import SwiftUI
 
 struct PortraitItemView: View {
-
     var item: BaseItemDto
 
     var body: some View {
-        NavigationLink(destination: LazyView { ItemNavigationView(item: item) }) {
-            VStack(alignment: .leading) {
-                ImageView(src: item.type != "Episode" ? item.getPrimaryImage(maxWidth: 100) : item.getSeriesPrimaryImage(maxWidth: 100), bh: item.type != "Episode" ? item.getPrimaryImageBlurHash() : item.getSeriesPrimaryImageBlurHash())
-                    .frame(width: 100, height: 150)
-                    .cornerRadius(10)
-                    .shadow(radius: 4, y: 2)
-                    .shadow(radius: 4, y: 2)
-                    .overlay(
-                        Rectangle()
-                            .fill(Color(red: 172/255, green: 92/255, blue: 195/255))
-                            .mask(ProgressBar())
-                            .frame(width: CGFloat(item.userData?.playedPercentage ?? 0), height: 7)
-                            .padding(0), alignment: .bottomLeading
-                    )
-                    .overlay(
-                        ZStack {
-                            if item.userData?.isFavorite ?? false {
-                                Image(systemName: "circle.fill")
-                                    .foregroundColor(.white)
-                                    .opacity(0.6)
-                                Image(systemName: "heart.fill")
-                                    .foregroundColor(Color(.systemRed))
-                                    .font(.system(size: 10))
-                            }
+        VStack(alignment: .leading) {
+            ImageView(src: item.type != "Episode" ? item.getPrimaryImage(maxWidth: 100) : item.getSeriesPrimaryImage(maxWidth: 100),
+                      bh: item.type != "Episode" ? item.getPrimaryImageBlurHash() : item.getSeriesPrimaryImageBlurHash())
+                .frame(width: 100, height: 150)
+                .cornerRadius(10)
+                .shadow(radius: 4, y: 2)
+                .shadow(radius: 4, y: 2)
+                .overlay(Rectangle()
+                    .fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255))
+                    .mask(ProgressBar())
+                    .frame(width: CGFloat(item.userData?.playedPercentage ?? 0), height: 7)
+                    .padding(0), alignment: .bottomLeading)
+                .overlay(ZStack {
+                    if item.userData?.isFavorite ?? false {
+                        Image(systemName: "circle.fill")
+                            .foregroundColor(.white)
+                            .opacity(0.6)
+                        Image(systemName: "heart.fill")
+                            .foregroundColor(Color(.systemRed))
+                            .font(.system(size: 10))
+                    }
+                }
+                .padding(.leading, 2)
+                .padding(.bottom, item.userData?.playedPercentage == nil ? 2 : 9)
+                .opacity(1), alignment: .bottomLeading)
+                .overlay(ZStack {
+                    if item.userData?.played ?? false {
+                        Image(systemName: "checkmark.circle.fill")
+                            .foregroundColor(.accentColor)
+                            .background(Color(.white))
+                            .clipShape(Circle().scale(0.8))
+                    } else {
+                        if item.userData?.unplayedItemCount != nil {
+                            Capsule()
+                                .fill(Color.accentColor)
+                                .frame(minWidth: 20, minHeight: 20, maxHeight: 20)
+                            Text(String(item.userData!.unplayedItemCount ?? 0))
+                                .foregroundColor(.white)
+                                .font(.caption2)
+                                .padding(2)
                         }
-                        .padding(.leading, 2)
-                        .padding(.bottom, item.userData?.playedPercentage == nil ? 2 : 9)
-                        .opacity(1), alignment: .bottomLeading)
-                    .overlay(
-                        ZStack {
-                            if item.userData?.played ?? false {
-                                Image(systemName: "checkmark.circle.fill")
-                                    .foregroundColor(.accentColor)
-                                    .background(Color(.white))
-                                    .clipShape(Circle().scale(0.8))
-                            } else {
-                                if item.userData?.unplayedItemCount != nil {
-                                    Capsule()
-                                        .fill(Color.accentColor)
-                                        .frame(minWidth: 20, minHeight: 20, maxHeight: 20)
-                                    Text(String(item.userData!.unplayedItemCount ?? 0))
-                                        .foregroundColor(.white)
-                                        .font(.caption2)
-                                        .padding(2)
-                                }
-                            }
-                        }.padding(2)
-                        .fixedSize()
-                        .opacity(1), alignment: .topTrailing).opacity(1)
-                Text(item.seriesName ?? item.name ?? "")
+                    }
+                }.padding(2)
+                    .fixedSize()
+                    .opacity(1), alignment: .topTrailing).opacity(1)
+            Text(item.seriesName ?? item.name ?? "")
+                .font(.caption)
+                .fontWeight(.semibold)
+                .foregroundColor(.primary)
+                .lineLimit(1)
+            if item.type == "Movie" || item.type == "Series" {
+                Text("\(String(item.productionYear ?? 0)) • \(item.officialRating ?? "N/A")")
+                    .foregroundColor(.secondary)
                     .font(.caption)
-                    .fontWeight(.semibold)
-                    .foregroundColor(.primary)
-                    .lineLimit(1)
-                if item.type == "Movie" || item.type == "Series" {
-                    Text("\(String(item.productionYear ?? 0)) • \(item.officialRating ?? "N/A")")
-                        .foregroundColor(.secondary)
-                        .font(.caption)
-                        .fontWeight(.medium)
-                } else if item.type == "Season" {
-                    Text("\(item.name ?? "") • \(String(item.productionYear ?? 0))")
-                        .foregroundColor(.secondary)
-                        .font(.caption)
-                        .fontWeight(.medium)
-                } else {
-                    Text("S\(String(item.parentIndexNumber ?? 0)):E\(String(item.indexNumber ?? 0))")
-                        .foregroundColor(.secondary)
-                        .font(.caption)
-                        .fontWeight(.medium)
-                }
-            }.frame(width: 100)
-        }
+                    .fontWeight(.medium)
+            } else if item.type == "Season" {
+                Text("\(item.name ?? "") • \(String(item.productionYear ?? 0))")
+                    .foregroundColor(.secondary)
+                    .font(.caption)
+                    .fontWeight(.medium)
+            } else {
+                Text("S\(String(item.parentIndexNumber ?? 0)):E\(String(item.indexNumber ?? 0))")
+                    .foregroundColor(.secondary)
+                    .font(.caption)
+                    .fontWeight(.medium)
+            }
+        }.frame(width: 100)
     }
 }

JellyfinPlayer/ConnectToServerView.swift

@@ -6,8 +6,10 @@
  */
 
 import SwiftUI
+import Stinsen
 
 struct ConnectToServerView: View {
+    @EnvironmentObject var mainRouter: MainCoordinator.Router
     @StateObject var viewModel = ConnectToServerViewModel()
     @State var username = ""
     @State var password = ""
@@ -59,6 +61,7 @@ struct ConnectToServerView: View {
                                         if SessionManager.current.doesUserHaveSavedSession(userID: publicUser.id!) {
                                             let user = SessionManager.current.getSavedSession(userID: publicUser.id!)
                                             SessionManager.current.loginWithSavedSession(user: user)
+                                            mainRouter.root(\.mainTab)
                                         } else {
                                             username = publicUser.name ?? ""
                                             viewModel.selectedPublicUser = publicUser
@@ -174,5 +177,8 @@ struct ConnectToServerView: View {
                   dismissButton: .cancel())
         }
         .navigationTitle(NSLocalizedString("Connect to Server", comment: ""))
+        .onAppear {            
+            AppURLHandler.shared.appURLState = .allowedInLogin
+        }
     }
 }