Remove unused code, minor style changes

2025-08-06 18:54:11 +00:00 · 2021-12-20 00:36:12 +01:00
parent 0a5cb5b542
commit ea90f650d8
27 changed files with 74 additions and 114 deletions
--- a/Shared/Defaults.swift
+++ b/Shared/Defaults.swift
@@ -107,10 +107,6 @@ enum PlayerSidebarSetting: String, CaseIterable, Defaults.Serializable {
 enum VisibleSection: String, CaseIterable, Comparable, Defaults.Serializable {
    case favorites, subscriptions, popular, trending, playlists

-    static func from(_ string: String) -> VisibleSection {
-        allCases.first { $0.rawValue == string }!
-    }
-
    var title: String {
        rawValue.localizedCapitalized
    }
--- a/Shared/Favorites/FavoritesView.swift
+++ b/Shared/Favorites/FavoritesView.swift
@@ -51,7 +51,7 @@ struct FavoritesView: View {
                .navigationTitle("Favorites")
            #endif
            #if os(macOS)
-            .background(Color.tertiaryBackground)
+            .background(Color.secondaryBackground)
            .frame(minWidth: 360)
            #endif
        }
--- a/Shared/Navigation/AppSidebarNavigation.swift
+++ b/Shared/Navigation/AppSidebarNavigation.swift
@@ -6,20 +6,19 @@ import SwiftUI

 struct AppSidebarNavigation: View {
    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<CommentsModel> private var comments
-    @EnvironmentObject<InstancesModel> private var instances
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<PlayerModel> private var player
-    @EnvironmentObject<PlaylistsModel> private var playlists
-    @EnvironmentObject<RecentsModel> private var recents
-    @EnvironmentObject<SearchModel> private var search
-    @EnvironmentObject<SubscriptionsModel> private var subscriptions
-    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
-
-    @Default(.visibleSections) private var visibleSections

    #if os(iOS)
        @State private var didApplyPrimaryViewWorkAround = false
+
+        @EnvironmentObject<CommentsModel> private var comments
+        @EnvironmentObject<InstancesModel> private var instances
+        @EnvironmentObject<NavigationModel> private var navigation
+        @EnvironmentObject<PlayerModel> private var player
+        @EnvironmentObject<PlaylistsModel> private var playlists
+        @EnvironmentObject<RecentsModel> private var recents
+        @EnvironmentObject<SearchModel> private var search
+        @EnvironmentObject<SubscriptionsModel> private var subscriptions
+        @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
    #endif

    var body: some View {
@@ -66,26 +65,22 @@ struct AppSidebarNavigation: View {
        #if os(iOS)
            .background(
                EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
-                    videoPlayer
+                    VideoPlayerView()
+                        .environmentObject(accounts)
+                        .environmentObject(comments)
+                        .environmentObject(instances)
+                        .environmentObject(navigation)
+                        .environmentObject(player)
+                        .environmentObject(playlists)
+                        .environmentObject(recents)
+                        .environmentObject(subscriptions)
+                        .environmentObject(thumbnailsModel)
                        .environment(\.navigationStyle, .sidebar)
                }
            )
        #endif
    }

-    private var videoPlayer: some View {
-        VideoPlayerView()
-            .environmentObject(accounts)
-            .environmentObject(comments)
-            .environmentObject(instances)
-            .environmentObject(navigation)
-            .environmentObject(player)
-            .environmentObject(playlists)
-            .environmentObject(recents)
-            .environmentObject(subscriptions)
-            .environmentObject(thumbnailsModel)
-    }
-
    var toolbarContent: some ToolbarContent {
        Group {
            #if os(iOS)
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -123,7 +123,6 @@ struct ContentView: View {
        search.accounts = accounts
        subscriptions.accounts = accounts

-        comments.accounts = accounts
        comments.player = player

        menu.accounts = accounts
--- a/Shared/Navigation/Sidebar.swift
+++ b/Shared/Navigation/Sidebar.swift
@@ -4,8 +4,6 @@ import SwiftUI
 struct Sidebar: View {
    @EnvironmentObject<AccountsModel> private var accounts
    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<PlaylistsModel> private var playlists
-    @EnvironmentObject<SubscriptionsModel> private var subscriptions

    @Default(.visibleSections) private var visibleSections

--- a/Shared/Player/CommentsView.swift
+++ b/Shared/Player/CommentsView.swift
@@ -4,7 +4,6 @@ struct CommentsView: View {
    @State private var repliesID: Comment.ID?

    @EnvironmentObject<CommentsModel> private var comments
-    @EnvironmentObject<PlayerModel> private var player

    var body: some View {
        Group {
--- a/Shared/Player/VideoPlayerView.swift
+++ b/Shared/Player/VideoPlayerView.swift
@@ -14,7 +14,7 @@ struct VideoPlayerView: View {
    }

    @State private var playerSize: CGSize = .zero
-    @State private var fullScreen = false
+    @State private var fullScreenDetails = false

    @Environment(\.colorScheme) private var colorScheme

@@ -95,15 +95,15 @@ struct VideoPlayerView: View {
                        Group {
                            #if os(iOS)
                                if verticalSizeClass == .regular {
-                                    VideoDetails(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreen)
+                                    VideoDetails(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreenDetails)
                                }

                            #else
-                                VideoDetails(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreen)
+                                VideoDetails(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreenDetails)
                            #endif
                        }
                        .background(colorScheme == .dark ? Color.black : Color.white)
-                        .modifier(VideoDetailsPaddingModifier(geometry: geometry, aspectRatio: player.controller?.aspectRatio, fullScreen: fullScreen))
+                        .modifier(VideoDetailsPaddingModifier(geometry: geometry, aspectRatio: player.controller?.aspectRatio, fullScreen: fullScreenDetails))
                    }
                #endif
            }
@@ -113,12 +113,12 @@ struct VideoPlayerView: View {
            #endif
            #if os(iOS)
                if sidebarQueue {
-                    PlayerQueueView(sidebarQueue: .constant(true), fullScreen: $fullScreen)
+                    PlayerQueueView(sidebarQueue: .constant(true), fullScreen: $fullScreenDetails)
                        .frame(maxWidth: 350)
                }
            #elseif os(macOS)
                if Defaults[.playerSidebar] != .never {
-                    PlayerQueueView(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreen)
+                    PlayerQueueView(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreenDetails)
                        .frame(minWidth: 300)
                }
            #endif
--- a/Shared/Playlists/PlaylistsView.swift
+++ b/Shared/Playlists/PlaylistsView.swift
@@ -179,7 +179,7 @@ struct PlaylistsView: View {
        }
        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
        #if os(macOS)
-            .background(Color.tertiaryBackground)
+            .background(Color.secondaryBackground)
        #endif
    }

--- a/Shared/Settings/InstanceSettings.swift
+++ b/Shared/Settings/InstanceSettings.swift
@@ -8,9 +8,6 @@ struct InstanceSettings: View {

    @State private var frontendURL = ""

-    @EnvironmentObject<AccountsModel> private var model
-    @EnvironmentObject<InstancesModel> private var instances
-
    var instance: Instance! {
        InstancesModel.find(instanceID)
    }
--- a/Shared/Settings/PlaybackSettings.swift
+++ b/Shared/Settings/PlaybackSettings.swift
@@ -8,7 +8,6 @@ struct PlaybackSettings: View {
    @Default(.playerSidebar) private var playerSidebar
    @Default(.showKeywords) private var showKeywords
    @Default(.showChannelSubscribers) private var channelSubscribers
-    @Default(.saveHistory) private var saveHistory
    @Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer
    @Default(.closePiPOnNavigation) private var closePiPOnNavigation
    @Default(.closePiPOnOpeningPlayer) private var closePiPOnOpeningPlayer
--- a/Shared/Videos/VerticalCells.swift
+++ b/Shared/Videos/VerticalCells.swift
@@ -19,7 +19,7 @@ struct VerticalCells: View {
        }
        .edgesIgnoringSafeArea(.horizontal)
        #if os(macOS)
-            .background(Color.tertiaryBackground)
+            .background(Color.secondaryBackground)
            .frame(minWidth: 360)
        #endif
    }
--- a/Shared/Videos/VideoCell.swift
+++ b/Shared/Videos/VideoCell.swift
@@ -62,7 +62,7 @@ struct VideoCell: View {
            #endif
        }
        #if os(macOS)
-        .background(Color.tertiaryBackground)
+        .background(Color.secondaryBackground)
        #endif
    }

--- a/Shared/Views/ChannelPlaylistView.swift
+++ b/Shared/Views/ChannelPlaylistView.swift
@@ -13,10 +13,10 @@ struct ChannelPlaylistView: View {

    #if os(iOS)
        @Environment(\.inNavigationView) private var inNavigationView
+        @EnvironmentObject<PlayerModel> private var player
    #endif

    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<PlayerModel> private var player

    var items: [ContentItem] {
        ContentItem.array(of: store.item?.videos ?? [])
--- a/Shared/Views/ChannelVideosView.swift
+++ b/Shared/Views/ChannelVideosView.swift
@@ -10,16 +10,15 @@ struct ChannelVideosView: View {
    @StateObject private var store = Store<Channel>()

    @Environment(\.colorScheme) private var colorScheme
-    @Environment(\.presentationMode) private var presentationMode
-    @Environment(\.inNavigationView) private var inNavigationView

    #if os(iOS)
+        @Environment(\.inNavigationView) private var inNavigationView
        @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+        @EnvironmentObject<PlayerModel> private var player
    #endif

    @EnvironmentObject<AccountsModel> private var accounts
    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<PlayerModel> private var player
    @EnvironmentObject<SubscriptionsModel> private var subscriptions

    @Namespace private var focusNamespace
--- a/Shared/Views/LazyView.swift
+++ b/Shared/Views/LazyView.swift
@@ -3,6 +3,7 @@ import SwiftUI

 struct LazyView<Content: View>: View {
    let build: () -> Content
+
    init(_ build: @autoclosure @escaping () -> Content) {
        self.build = build
    }
--- a/Shared/Views/PlayerControlsView.swift
+++ b/Shared/Views/PlayerControlsView.swift
@@ -116,7 +116,7 @@ struct PlayerControlsView<Content: View>: View {
            } else {
                controls
                #if !os(tvOS)
-                .background(Color.tertiaryBackground)
+                .background(Color.secondaryBackground)
                #endif
            }
        }
--- a/Shared/Views/VideoContextMenuView.swift
+++ b/Shared/Views/VideoContextMenuView.swift
@@ -80,14 +80,6 @@ struct VideoContextMenuView: View {
        }
    }

-    private var isShowingChannelButton: Bool {
-        if case .channel = navigation.tabSelection {
-            return false
-        }
-
-        return !inChannelView
-    }
-
    private var addToQueueButton: some View {
        Button {
            player.enqueueVideo(video)