Bump build number

Fix selecting video details tab on sidebar visibility change
Fix restoring queue
2025-12-13 03:28:14 +00:00 · 2022-01-09 16:52:12 +01:00 · 2022-01-09 16:38:17 +01:00 · 2022-01-09 16:38:05 +01:00 · 2022-01-09 15:47:48 +01:00 · 2022-01-09 15:47:24 +01:00
10 changed files with 49 additions and 23 deletions
--- a/Model/NavigationModel.swift
+++ b/Model/NavigationModel.swift
@@ -47,7 +47,7 @@ final class NavigationModel: ObservableObject {
        recents: RecentsModel,
        navigation: NavigationModel,
        navigationStyle: NavigationStyle,
-        delay: Bool = false
+        delay: Bool = true
    ) {
        let recent = RecentItem(from: channel)
        #if os(macOS)
--- a/Model/Player/PlayerModel.swift
+++ b/Model/Player/PlayerModel.swift
@@ -33,7 +33,7 @@ final class PlayerModel: ObservableObject {
    @Published var streamSelection: Stream? { didSet { rebuildTVMenu() } }

    @Published var queue = [PlayerQueueItem]() { didSet { Defaults[.queue] = queue } }
-    @Published var currentItem: PlayerQueueItem! { didSet { updateWindowTitle() } }
+    @Published var currentItem: PlayerQueueItem! { didSet { handleCurrentItemChange() } }
    @Published var historyVideos = [Video]()

    @Published var preservedTime: CMTime?
@@ -804,10 +804,12 @@ final class PlayerModel: ObservableObject {
        }
    #endif

-    func updateWindowTitle() {
+    func handleCurrentItemChange() {
        #if os(macOS)
            Windows.player.window?.title = windowTitle
        #endif
+
+        Defaults[.lastPlayed] = currentItem
    }

    #if os(macOS)
--- a/Model/Player/PlayerQueue.swift
+++ b/Model/Player/PlayerQueue.swift
@@ -201,4 +201,21 @@ extension PlayerModel {
    func removeQueueItems() {
        queue.removeAll()
    }
+
+    func restoreQueue() {
+        guard !accounts.current.isNil else {
+            return
+        }
+
+        queue = ([Defaults[.lastPlayed]] + Defaults[.queue]).compactMap { $0 }
+        Defaults[.lastPlayed] = nil
+
+        queue.forEach { item in
+            accounts.api.loadDetails(item) { newItem in
+                if let index = self.queue.firstIndex(where: { $0.id == item.id }) {
+                    self.queue[index] = newItem
+                }
+            }
+        }
+    }
 }
--- a/Shared/Defaults.swift
+++ b/Shared/Defaults.swift
@@ -64,6 +64,7 @@ extension Defaults.Keys {
    static let recentlyOpened = Key<[RecentItem]>("recentlyOpened", default: [])

    static let queue = Key<[PlayerQueueItem]>("queue", default: [])
+    static let lastPlayed = Key<PlayerQueueItem?>("lastPlayed")

    static let saveHistory = Key<Bool>("saveHistory", default: true)
    static let showWatchingProgress = Key<Bool>("showWatchingProgress", default: true)
--- a/Shared/EnvironmentValues.swift
+++ b/Shared/EnvironmentValues.swift
@@ -30,10 +30,10 @@ private struct CurrentPlaylistID: EnvironmentKey {
 }

 private struct LoadMoreContentHandler: EnvironmentKey {
-    static let defaultValue: LoadMoreContentHandlerClosure = { print("infinite load") }
+    static let defaultValue: LoadMoreContentHandlerType = {}
 }

-typealias LoadMoreContentHandlerClosure = () -> Void
+typealias LoadMoreContentHandlerType = () -> Void

 extension EnvironmentValues {
    var inNavigationView: Bool {
@@ -66,7 +66,7 @@ extension EnvironmentValues {
        set { self[CurrentPlaylistID.self] = newValue }
    }

-    var loadMoreContentHandler: LoadMoreContentHandlerClosure {
+    var loadMoreContentHandler: LoadMoreContentHandlerType {
        get { self[LoadMoreContentHandler.self] }
        set { self[LoadMoreContentHandler.self] = newValue }
    }
--- a/Shared/MenuCommands.swift
+++ b/Shared/MenuCommands.swift
@@ -25,7 +25,7 @@ struct MenuCommands: Commands {
            Button("Popular") {
                model.navigation?.tabSelection = .popular
            }
-            .disabled(!(model.accounts?.app.supportsPopular ?? true))
+            .disabled(!(model.accounts?.app.supportsPopular ?? false))
            .keyboardShortcut("3")

            Button("Trending") {
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -139,6 +139,10 @@ struct ContentView: View {
        player.accounts = accounts
        player.comments = comments

+        if !accounts.current.isNil {
+            player.restoreQueue()
+        }
+
        if !Defaults[.saveRecents] {
            recents.clear()
        }
--- a/Shared/Player/VideoDetails.swift
+++ b/Shared/Player/VideoDetails.swift
@@ -5,7 +5,7 @@ import SwiftUI

 struct VideoDetails: View {
    enum Page {
-        case info, queue, related, comments
+        case info, comments, related, queue
    }

    @Binding var sidebarQueue: Bool
@@ -129,7 +129,7 @@ struct VideoDetails: View {
        }
        .onChange(of: sidebarQueue) { queue in
            if queue {
-                if currentPage == .queue {
+                if currentPage == .related || currentPage == .queue {
                    currentPage = .info
                }
            } else if video.isNil {
--- a/Shared/Search/SearchSuggestions.swift
+++ b/Shared/Search/SearchSuggestions.swift
@@ -30,10 +30,12 @@ struct SearchSuggestions: View {
                        HStack {
                            Image(systemName: "magnifyingglass")
                            HStack(spacing: 0) {
-                                Text(state.suggestionsText)
-                                    .lineLimit(1)
-                                    .layoutPriority(2)
-                                    .foregroundColor(.secondary)
+                                if suggestion.hasPrefix(state.suggestionsText.lowercased()) {
+                                    Text(state.suggestionsText.lowercased())
+                                        .lineLimit(1)
+                                        .layoutPriority(2)
+                                        .foregroundColor(.secondary)
+                                }

                                Text(querySuffix(suggestion))
                                    .lineLimit(1)
--- a/Yattee.xcodeproj/project.pbxproj
+++ b/Yattee.xcodeproj/project.pbxproj
@@ -2458,7 +2458,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2492,7 +2492,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2524,7 +2524,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2556,7 +2556,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2719,7 +2719,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2751,7 +2751,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2787,7 +2787,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2820,7 +2820,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2951,7 +2951,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -2983,7 +2983,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
Author	SHA1	Message	Date
Arkadiusz Fal	db4a817164	Bump build number	2022-01-09 16:52:12 +01:00
Arkadiusz Fal	ce8a8cbef3	Fix selecting video details tab on sidebar visibility change	2022-01-09 16:38:17 +01:00
Arkadiusz Fal	a04827cc56	Fix restoring queue	2022-01-09 16:38:05 +01:00
Arkadiusz Fal	534f356471	Fix search suggestion prefix	2022-01-09 15:47:48 +01:00
Arkadiusz Fal	5050ad5d02	Fix menu command for Popular	2022-01-09 15:47:24 +01:00
Arkadiusz Fal	ca38133b1d	Fix opening channel from video details	2022-01-09 15:47:00 +01:00