Bump build number

Improve playback bar font colors
Fix crash caused by tab navigation
2025-12-13 03:28:14 +00:00 · 2021-12-01 00:01:08 +01:00 · 2021-11-30 23:59:24 +01:00 · 2021-11-30 23:58:46 +01:00 · 2021-11-30 23:58:27 +01:00 · 2021-11-30 23:58:11 +01:00
7 changed files with 119 additions and 99 deletions
--- a/Shared/Favorites/FavoritesView.swift
+++ b/Shared/Favorites/FavoritesView.swift
@@ -42,9 +42,6 @@ struct FavoritesView: View {
            .redrawOn(change: favoritesChanged)

            #if os(tvOS)
-                .sheet(isPresented: $presentingEditFavorites) {
-                    EditFavorites()
-                }
                .edgesIgnoringSafeArea(.horizontal)
            #else
                .onDrop(of: [UTType.text], delegate: DropFavoriteOutside(current: $dragging))
--- a/Shared/Navigation/AppTabNavigation.swift
+++ b/Shared/Navigation/AppTabNavigation.swift
@@ -72,34 +72,39 @@ struct AppTabNavigation: View {
            }
            .tag(TabSelection.search)
        }
+        .id(accounts.current?.id ?? "")
        .environment(\.navigationStyle, .tab)
-        .sheet(isPresented: $navigation.presentingChannel, onDismiss: {
-            if let channel = recents.presentedChannel {
-                recents.close(RecentItem(from: channel))
-            }
-        }) {
-            if let channel = recents.presentedChannel {
-                NavigationView {
-                    ChannelVideosView(channel: channel)
-                        .environment(\.inChannelView, true)
-                        .environment(\.inNavigationView, true)
-                        .background(playerNavigationLink)
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingChannel, onDismiss: {
+                if let channel = recents.presentedChannel {
+                    recents.close(RecentItem(from: channel))
+                }
+            }) {
+                if let channel = recents.presentedChannel {
+                    NavigationView {
+                        ChannelVideosView(channel: channel)
+                            .environment(\.inChannelView, true)
+                            .environment(\.inNavigationView, true)
+                            .background(playerNavigationLink)
+                    }
                }
            }
-        }
-        .sheet(isPresented: $navigation.presentingPlaylist, onDismiss: {
-            if let playlist = recents.presentedPlaylist {
-                recents.close(RecentItem(from: playlist))
-            }
-        }) {
-            if let playlist = recents.presentedPlaylist {
-                NavigationView {
-                    ChannelPlaylistView(playlist: playlist)
-                        .environment(\.inNavigationView, true)
-                        .background(playerNavigationLink)
+        )
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingPlaylist, onDismiss: {
+                if let playlist = recents.presentedPlaylist {
+                    recents.close(RecentItem(from: playlist))
+                }
+            }) {
+                if let playlist = recents.presentedPlaylist {
+                    NavigationView {
+                        ChannelPlaylistView(playlist: playlist)
+                            .environment(\.inNavigationView, true)
+                            .background(playerNavigationLink)
+                    }
                }
            }
-        }
+        )
    }

    private var subscriptionsVisible: Bool {
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -24,7 +24,7 @@ struct ContentView: View {
    #endif

    var body: some View {
-        Section {
+        Group {
            #if os(iOS)
                if horizontalSizeClass == .compact {
                    AppTabNavigation()
@@ -49,55 +49,66 @@ struct ContentView: View {
        .environmentObject(subscriptions)
        .environmentObject(thumbnailsModel)

-        .sheet(isPresented: $navigation.presentingWelcomeScreen) {
-            WelcomeScreen()
-                .environmentObject(accounts)
-                .environmentObject(navigation)
-        }
+        // iOS 14 has problem with multiple sheets in one view
+        // but it's ok when it's in background
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingWelcomeScreen) {
+                WelcomeScreen()
+                    .environmentObject(accounts)
+                    .environmentObject(navigation)
+            }
+        )
        #if os(iOS)
-        .fullScreenCover(isPresented: $player.presentingPlayer) {
-            VideoPlayerView()
-                .environmentObject(accounts)
-                .environmentObject(instances)
-                .environmentObject(navigation)
-                .environmentObject(player)
-                .environmentObject(playlists)
-                .environmentObject(subscriptions)
-                .environmentObject(thumbnailsModel)
-        }
+        .background(
+            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
+                videoPlayer
+            }
+        )
        #elseif os(macOS)
-        .sheet(isPresented: $player.presentingPlayer) {
-            VideoPlayerView()
-                .frame(minWidth: 900, minHeight: 800)
-                .environmentObject(accounts)
-                .environmentObject(instances)
-                .environmentObject(navigation)
-                .environmentObject(player)
-                .environmentObject(playlists)
-                .environmentObject(subscriptions)
-                .environmentObject(thumbnailsModel)
-        }
+        .background(
+            EmptyView().sheet(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .frame(minWidth: 900, minHeight: 800)
+            }
+        )
        #endif
        #if !os(tvOS)
        .handlesExternalEvents(preferring: Set(["*"]), allowing: Set(["*"]))
        .onOpenURL(perform: handleOpenedURL)
-        .sheet(isPresented: $navigation.presentingAddToPlaylist) {
-            AddToPlaylistView(video: navigation.videoToAddToPlaylist)
-                .environmentObject(playlists)
-        }
-        .sheet(isPresented: $navigation.presentingPlaylistForm) {
-            PlaylistFormView(playlist: $navigation.editedPlaylist)
-                .environmentObject(accounts)
-                .environmentObject(playlists)
-        }
-        .sheet(isPresented: $navigation.presentingSettings, onDismiss: openWelcomeScreenIfAccountEmpty) {
-            SettingsView()
-                .environmentObject(accounts)
-                .environmentObject(instances)
-        }
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
+                AddToPlaylistView(video: navigation.videoToAddToPlaylist)
+                    .environmentObject(playlists)
+            }
+        )
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
+                PlaylistFormView(playlist: $navigation.editedPlaylist)
+                    .environmentObject(accounts)
+                    .environmentObject(playlists)
+            }
+        )
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingSettings, onDismiss: openWelcomeScreenIfAccountEmpty) {
+                SettingsView()
+                    .environmentObject(accounts)
+                    .environmentObject(instances)
+            }
+        )
        #endif
    }

+    private var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playlists)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
+
    func configure() {
        SiestaLog.Category.enabled = .common
        SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
--- a/Shared/Player/PlaybackBar.swift
+++ b/Shared/Player/PlaybackBar.swift
@@ -16,13 +16,10 @@ struct PlaybackBar: View {
            if player.currentItem != nil {
                HStack {
                    Text(playbackStatus)
-
                    Text("•")
-
                    rateMenu
                }
                .font(.caption2)
-                .foregroundColor(.gray)

                Spacer()

@@ -59,12 +56,12 @@ struct PlaybackBar: View {
                    #endif
                }
                .transaction { t in t.animation = .none }
-                .foregroundColor(.gray)
                .font(.caption2)
            } else {
                Spacer()
            }
        }
+        .foregroundColor(colorScheme == .dark ? .gray : .black)
        .alert(isPresented: $player.presentingErrorDetails) {
            Alert(
                title: Text("Error"),
--- a/Shared/Player/VideoDetails.swift
+++ b/Shared/Player/VideoDetails.swift
@@ -318,17 +318,21 @@ struct VideoDetails: View {
                .foregroundColor(.secondary)
            }
        }
-        .sheet(isPresented: $presentingAddToPlaylist) {
-            if let video = video {
-                AddToPlaylistView(video: video)
+        .background(
+            EmptyView().sheet(isPresented: $presentingAddToPlaylist) {
+                if let video = video {
+                    AddToPlaylistView(video: video)
+                }
            }
-        }
+        )
        #if os(iOS)
-        .sheet(isPresented: $presentingShareSheet) {
-            if let shareURL = shareURL {
-                ShareSheet(activityItems: [shareURL])
+        .background(
+            EmptyView().sheet(isPresented: $presentingShareSheet) {
+                if let shareURL = shareURL {
+                    ShareSheet(activityItems: [shareURL])
+                }
            }
-        }
+        )
        #endif
    }

--- a/Shared/Playlists/PlaylistsView.swift
+++ b/Shared/Playlists/PlaylistsView.swift
@@ -58,14 +58,20 @@ struct PlaylistsView: View {
                .environmentObject(accounts)
        }
        #else
-                .sheet(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
-                    PlaylistFormView(playlist: $createdPlaylist)
-                        .environmentObject(accounts)
-                }
-                .sheet(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
-                    PlaylistFormView(playlist: $editedPlaylist)
-                        .environmentObject(accounts)
-                }
+                .background(
+                    EmptyView()
+                        .sheet(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
+                            PlaylistFormView(playlist: $createdPlaylist)
+                                .environmentObject(accounts)
+                        }
+                )
+                .background(
+                    EmptyView()
+                        .sheet(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
+                            PlaylistFormView(playlist: $editedPlaylist)
+                                .environmentObject(accounts)
+                        }
+                )
        #endif
                .toolbar {
                    ToolbarItemGroup {
--- a/Yattee.xcodeproj/project.pbxproj
+++ b/Yattee.xcodeproj/project.pbxproj
@@ -2217,7 +2217,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2229,7 +2229,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.2;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -2251,7 +2251,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2263,7 +2263,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.2;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -2283,7 +2283,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2315,7 +2315,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2478,7 +2478,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2509,7 +2509,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2544,7 +2544,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2577,7 +2577,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2708,7 +2708,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -2740,7 +2740,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
Author	SHA1	Message	Date
Arkadiusz Fal	500c55689b	Bump build number	2021-12-01 00:01:08 +01:00
Arkadiusz Fal	f60f7a0455	Improve playback bar font colors	2021-11-30 23:59:24 +01:00
Arkadiusz Fal	52ab162a6c	Fix crash caused by tab navigation	2021-11-30 23:58:46 +01:00
Arkadiusz Fal	c6f077dcd3	Remove unused code	2021-11-30 23:58:27 +01:00
Arkadiusz Fal	b5ffa5b267	Fix sheets and covers on iOS 14	2021-11-30 23:58:11 +01:00
Arkadiusz Fal	5ef89ac9f4	iOS 14/macOS Big Sur Support	2021-11-30 19:01:08 +01:00
Arkadiusz Fal	696751e07c	Remove alpha channel from iOS icons	2021-11-30 19:01:08 +01:00