Bump build and version number

Fix selecting best quality stream (fix #54 )
Fix displaying settings/account buttons when only search is visible (fix #56 )
2025-12-13 03:28:14 +00:00 · 2022-01-24 22:34:24 +01:00 · 2022-01-24 22:23:10 +01:00 · 2022-01-24 22:22:47 +01:00 · 2022-01-20 23:14:42 +01:00 · 2022-01-20 23:14:11 +01:00
9 changed files with 68 additions and 27 deletions
--- a/Model/Player/PlayerQueue.swift
+++ b/Model/Player/PlayerQueue.swift
@@ -95,7 +95,9 @@ extension PlayerModel {

        switch quality {
        case .best:
-            return streams.first { $0.kind == .hls } ?? streams.first
+            return streams.first { $0.kind == .hls } ??
+                streams.filter { $0.kind == .stream }.max { $0.resolution < $1.resolution } ??
+                streams.first
        default:
            let sorted = streams.filter { $0.kind != .hls }.sorted { $0.resolution > $1.resolution }
            return sorted.first(where: { $0.resolution.height <= quality.value.height })
--- a/Model/RecentsModel.swift
+++ b/Model/RecentsModel.swift
@@ -34,8 +34,9 @@ final class RecentsModel: ObservableObject {
        }
    }

-    func addQuery(_ query: String) {
+    func addQuery(_ query: String, navigation: NavigationModel? = nil) {
        if !query.isEmpty {
+            navigation?.tabSelection = .search
            add(.init(from: query))
        }
    }
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
  <img src="https://r.yattee.stream/icons/yattee-150.png" width="150" height="150" alt="Yattee logo">
  <h1>Yattee</h1>
-  <p>Videos browser and player for <a href="https://github.com/iv-org/invidious">Invidious</a> and <a href="https://github.com/TeamPiped/Piped">Piped</a> (alternative, privacy-friendly YouTube frontends)<br />built for iOS, tvOS and macOS.</p>
+  <p>Alternative YouTube frontend for iOS, tvOS and macOS<br />built with <a href="https://github.com/iv-org/invidious">Invidious</a> and <a href="https://github.com/TeamPiped/Piped">Piped</a></p>

 [![AGPL v3](https://shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0.en.html)
 [![GitHub issues](https://img.shields.io/github/issues/yattee/yattee)](https://github.com/yattee/yattee/issues)
--- a/Shared/Favorites/FavoriteResourceObserver.swift
+++ b/Shared/Favorites/FavoriteResourceObserver.swift
@@ -13,6 +13,8 @@ final class FavoriteResourceObserver: ObservableObject, ResourceObserver {
            contentItems = playlist.videos.map { ContentItem(video: $0) }
        } else if let playlist: Playlist = resource.typedContent() {
            contentItems = playlist.videos.map { ContentItem(video: $0) }
+        } else if let page: SearchPage = resource.typedContent() {
+            contentItems = page.results
        } else if let items: [ContentItem] = resource.typedContent() {
            contentItems = items
        }
--- a/Shared/Navigation/AppTabNavigation.swift
+++ b/Shared/Navigation/AppTabNavigation.swift
@@ -35,7 +35,7 @@ struct AppTabNavigation: View {
                trendingNavigationView
            }

-            if visibleSections.contains(.playlists), accounts.app.supportsUserPlaylists {
+            if playlistsVisible {
                playlistsNavigationView
            }

@@ -118,6 +118,11 @@ struct AppTabNavigation: View {
            accounts.app.supportsSubscriptions && !(accounts.current?.anonymous ?? true)
    }

+    private var playlistsVisible: Bool {
+        visibleSections.contains(.playlists) &&
+            accounts.app.supportsUserPlaylists && !(accounts.current?.anonymous ?? true)
+    }
+
    private var popularNavigationView: some View {
        NavigationView {
            LazyView(PopularView())
--- a/Shared/Search/SearchField.swift
+++ b/Shared/Search/SearchField.swift
@@ -3,6 +3,7 @@ import SwiftUI
 struct SearchTextField: View {
    @Environment(\.navigationStyle) private var navigationStyle

+    @EnvironmentObject<NavigationModel> private var navigation
    @EnvironmentObject<RecentsModel> private var recents
    @EnvironmentObject<SearchModel> private var state

@@ -29,7 +30,7 @@ struct SearchTextField: View {
                #endif
                TextField("Search...", text: $state.queryText) {
                    state.changeQuery { query in query.query = state.queryText }
-                    recents.addQuery(state.queryText)
+                    recents.addQuery(state.queryText, navigation: navigation)
                }
                .onChange(of: state.queryText) { _ in
                    if state.query.query.compare(state.queryText, options: .caseInsensitive) == .orderedSame {
--- a/Shared/Search/SearchSuggestions.swift
+++ b/Shared/Search/SearchSuggestions.swift
@@ -1,6 +1,7 @@
 import SwiftUI

 struct SearchSuggestions: View {
+    @EnvironmentObject<NavigationModel> private var navigation
    @EnvironmentObject<RecentsModel> private var recents
    @EnvironmentObject<SearchModel> private var state

@@ -76,7 +77,7 @@ struct SearchSuggestions: View {
            state.fieldIsFocused = false
        }

-        recents.addQuery(state.queryText)
+        recents.addQuery(state.queryText, navigation: navigation)
    }

    private var visibleSuggestions: [String] {
--- a/Shared/Search/SearchView.swift
+++ b/Shared/Search/SearchView.swift
@@ -177,11 +177,40 @@ struct SearchView: View {
                .navigationTitle("Search")
        #endif
        #if os(iOS)
-        .navigationBarHidden(!Defaults[.visibleSections].isEmpty || navigationStyle == .sidebar)
+        .navigationBarHidden(navigationBarHidden)
        .navigationBarTitleDisplayMode(.inline)
        #endif
    }

+    private var navigationBarHidden: Bool {
+        if navigationStyle == .sidebar {
+            return true
+        }
+
+        let preferred = Defaults[.visibleSections]
+        var visibleSections = [VisibleSection]()
+
+        if accounts.app.supportsPopular && preferred.contains(.popular) {
+            visibleSections.append(.popular)
+        }
+
+        if accounts.app.supportsSubscriptions && accounts.signedIn && preferred.contains(.subscriptions) {
+            visibleSections.append(.subscriptions)
+        }
+
+        if accounts.app.supportsUserPlaylists && preferred.contains(.playlists) {
+            visibleSections.append(.playlists)
+        }
+
+        [VisibleSection.favorites, .trending].forEach { section in
+            if preferred.contains(section) {
+                visibleSections.append(section)
+            }
+        }
+
+        return !visibleSections.isEmpty
+    }
+
    private var results: some View {
        VStack {
            if showRecentQueries {
--- 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 = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2471,7 +2471,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -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 = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2505,7 +2505,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2524,7 +2524,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2536,7 +2536,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2556,7 +2556,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2568,7 +2568,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2719,7 +2719,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2735,7 +2735,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = iphoneos;
@@ -2751,7 +2751,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2767,7 +2767,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = iphoneos;
@@ -2787,7 +2787,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2802,7 +2802,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = macosx;
@@ -2820,7 +2820,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2835,7 +2835,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = macosx;
@@ -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 = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -2966,7 +2966,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = appletvos;
@@ -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 = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -2998,7 +2998,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = appletvos;
Author	SHA1	Message	Date
Arkadiusz Fal	5f263efeb2	Bump build and version number	2022-01-24 22:34:24 +01:00
Arkadiusz Fal	a98b4eac83	Fix selecting best quality stream (fix #54 )	2022-01-24 22:23:10 +01:00
Arkadiusz Fal	975b8fe5c3	Fix displaying settings/account buttons when only search is visible (fix #56 )	2022-01-24 22:22:47 +01:00
Arkadiusz Fal	33e86710a8	Bump build number	2022-01-20 23:14:42 +01:00
Arkadiusz Fal	96f4e819a7	Update README	2022-01-20 23:14:11 +01:00
Arkadiusz Fal	8ab97ddbaf	Fix search closing when entering new query after opening recent	2022-01-20 23:14:11 +01:00
Arkadiusz Fal	df72bf99ba	Fix displaying searches in favorites	2022-01-13 21:16:25 +01:00