From 132eb7b064bed937f93b1dce7c76abc5cc39080f Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Mon, 19 Jul 2021 23:27:18 +0200 Subject: [PATCH] Fix tab navigation selection --- Model/PlayerState.swift | 2 +- Pearvidious.xcodeproj/project.pbxproj | 2 +- {Apple TV => Shared}/AppTabNavigation.swift | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) rename {Apple TV => Shared}/AppTabNavigation.swift (93%) diff --git a/Model/PlayerState.swift b/Model/PlayerState.swift index 202dbab9..80592623 100644 --- a/Model/PlayerState.swift +++ b/Model/PlayerState.swift @@ -114,7 +114,7 @@ final class PlayerState: ObservableObject { logger.info("ALL assets loaded: \(stream.type), \(stream.description)") playStream(stream) - + if loadBest { await self.loadBestStream() } diff --git a/Pearvidious.xcodeproj/project.pbxproj b/Pearvidious.xcodeproj/project.pbxproj index 26e52e31..115d9776 100644 --- a/Pearvidious.xcodeproj/project.pbxproj +++ b/Pearvidious.xcodeproj/project.pbxproj @@ -421,6 +421,7 @@ isa = PBXGroup; children = ( 37BD07BA2698AB60003EBB87 /* AppSidebarNavigation.swift */, + 37D4B0C32671614700C925CA /* AppTabNavigation.swift */, 37BD07B42698AA4D003EBB87 /* ContentView.swift */, 37141672267A8E10006CA35D /* Country.swift */, 372915E52687E3B900F5A35B /* Defaults.swift */, @@ -469,7 +470,6 @@ isa = PBXGroup; children = ( 373CFAEE2697A78B003CB2C6 /* AddToPlaylistView.swift */, - 37D4B0C32671614700C925CA /* AppTabNavigation.swift */, 37AAF2892673AB89007FC770 /* ChannelView.swift */, 373CFAC126966159003CB2C6 /* CoverSectionRowView.swift */, 373CFABD26966115003CB2C6 /* CoverSectionView.swift */, diff --git a/Apple TV/AppTabNavigation.swift b/Shared/AppTabNavigation.swift similarity index 93% rename from Apple TV/AppTabNavigation.swift rename to Shared/AppTabNavigation.swift index 5d6570ca..e2f65d70 100644 --- a/Apple TV/AppTabNavigation.swift +++ b/Shared/AppTabNavigation.swift @@ -2,9 +2,7 @@ import Defaults import SwiftUI struct AppTabNavigation: View { - @State private var showingOptions = false - - @State private var tabSelection: TabSelection? = .subscriptions + @State private var tabSelection: TabSelection = .subscriptions var body: some View { TabView(selection: $tabSelection) {