diff --git a/Backports/Badge+Backport.swift b/Backports/Badge+Backport.swift index 8c617733..cd9d9b02 100644 --- a/Backports/Badge+Backport.swift +++ b/Backports/Badge+Backport.swift @@ -5,7 +5,12 @@ extension Backport where Content: View { if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) { content.badge(count) } else { - content + HStack { + content + Spacer() + Text("\(count)") + .foregroundColor(.secondary) + } } } } diff --git a/Shared/Navigation/ContentView.swift b/Shared/Navigation/ContentView.swift index efd1a001..ba61f0ac 100644 --- a/Shared/Navigation/ContentView.swift +++ b/Shared/Navigation/ContentView.swift @@ -68,7 +68,7 @@ struct ContentView: View { .background( EmptyView().sheet(isPresented: $player.presentingPlayer) { videoPlayer - .frame(minWidth: 900, minHeight: 800) + .frame(minWidth: 1000, minHeight: 750) } ) #endif diff --git a/Shared/Player/VideoPlayerView.swift b/Shared/Player/VideoPlayerView.swift index aded326d..251e639b 100644 --- a/Shared/Player/VideoPlayerView.swift +++ b/Shared/Player/VideoPlayerView.swift @@ -116,7 +116,7 @@ struct VideoPlayerView: View { #elseif os(macOS) if Defaults[.playerSidebar] != .never { PlayerQueueView(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreen) - .frame(minWidth: 250) + .frame(minWidth: 300) } #endif } diff --git a/Shared/Settings/BrowsingSettings.swift b/Shared/Settings/BrowsingSettings.swift index 555efbc8..b5af8235 100644 --- a/Shared/Settings/BrowsingSettings.swift +++ b/Shared/Settings/BrowsingSettings.swift @@ -18,7 +18,7 @@ struct BrowsingSettings: View { } Section(header: SettingsHeader(text: "Sections")) { #if os(macOS) - let list = List(VisibleSection.allCases, id: \.self) { section in + let list = ForEach(VisibleSection.allCases, id: \.self) { section in VisibleSectionSelectionRow( title: section.title, selected: visibleSections.contains(section) @@ -35,6 +35,8 @@ struct BrowsingSettings: View { list .listStyle(.inset) } + + Spacer() } #else ForEach(VisibleSection.allCases, id: \.self) { section in diff --git a/Shared/Settings/InstanceForm.swift b/Shared/Settings/InstanceForm.swift index 4497d732..e410681a 100644 --- a/Shared/Settings/InstanceForm.swift +++ b/Shared/Settings/InstanceForm.swift @@ -76,6 +76,7 @@ struct InstanceForm: View { } } .pickerStyle(.segmented) + .labelsHidden() TextField("Name", text: $name) diff --git a/Shared/Settings/ServicesSettings.swift b/Shared/Settings/ServicesSettings.swift index 06cd1cd8..52069682 100644 --- a/Shared/Settings/ServicesSettings.swift +++ b/Shared/Settings/ServicesSettings.swift @@ -20,7 +20,7 @@ struct ServicesSettings: View { Section(header: SettingsHeader(text: "Categories to Skip")) { #if os(macOS) - let list = List(SponsorBlockAPI.categories, id: \.self) { category in + let list = ForEach(SponsorBlockAPI.categories, id: \.self) { category in SponsorBlockCategorySelectionRow( title: SponsorBlockAPI.categoryDescription(category) ?? "Unknown", selected: sponsorBlockCategories.contains(category) diff --git a/Shared/Settings/SettingsView.swift b/Shared/Settings/SettingsView.swift index 387ce99b..5d78d140 100644 --- a/Shared/Settings/SettingsView.swift +++ b/Shared/Settings/SettingsView.swift @@ -44,7 +44,7 @@ struct SettingsView: View { PlaybackSettings() } .tabItem { - Label("Playback", systemImage: "play.rectangle.on.rectangle.fill") + Label("Playback", systemImage: "play.rectangle") } .tag(Tabs.playback) @@ -52,7 +52,7 @@ struct SettingsView: View { ServicesSettings() } .tabItem { - Label("Services", systemImage: "puzzlepiece.extension") + Label("Services", systemImage: "puzzlepiece") } .tag(Tabs.services) } diff --git a/Shared/Views/DetailBadge.swift b/Shared/Views/DetailBadge.swift index 00e64d3b..c527dc2f 100644 --- a/Shared/Views/DetailBadge.swift +++ b/Shared/Views/DetailBadge.swift @@ -31,7 +31,7 @@ struct DetailBadge: View { .background(.thinMaterial) } else { content - .background(Color.background) + .background(Color.background.opacity(0.95)) } } } diff --git a/Yattee.xcodeproj/project.pbxproj b/Yattee.xcodeproj/project.pbxproj index d132921e..9f362862 100644 --- a/Yattee.xcodeproj/project.pbxproj +++ b/Yattee.xcodeproj/project.pbxproj @@ -465,6 +465,7 @@ 37DD87C7271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; }; 37DD87C8271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; }; 37DD87C9271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; }; + 37E04C0F275940FB00172673 /* VerticalScrollingFix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */; }; 37E084AC2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; }; 37E084AD2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; }; 37E2EEAB270656EC00170416 /* PlayerControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E2EEAA270656EC00170416 /* PlayerControlsView.swift */; }; @@ -703,6 +704,7 @@ 37D526E22720B4BE00ED2F5E /* View+SwipeGesture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+SwipeGesture.swift"; sourceTree = ""; }; 37D9169A27388A81002B1BAA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerStreams.swift; sourceTree = ""; }; + 37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerticalScrollingFix.swift; sourceTree = ""; }; 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsNavigationLink.swift; sourceTree = ""; }; 37E2EEAA270656EC00170416 /* PlayerControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerControlsView.swift; sourceTree = ""; }; 37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsModel.swift; sourceTree = ""; }; @@ -1073,6 +1075,7 @@ 374108D0272B11B2006C5CC8 /* PictureInPictureDelegate.swift */, 37BE0BDB26A2367F0092E2DB /* Player.swift */, 37BE0BD926A214630092E2DB /* PlayerViewController.swift */, + 37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */, 374C0544272496FD009BDDBE /* Info.plist */, ); path = macOS; @@ -1967,6 +1970,7 @@ 37EF5C232739D37B00B03725 /* MenuModel.swift in Sources */, 37599F31272B42810087F250 /* FavoriteItem.swift in Sources */, 3730F75A2733481E00F385FC /* RelatedView.swift in Sources */, + 37E04C0F275940FB00172673 /* VerticalScrollingFix.swift in Sources */, 375168D72700FDB8008F96A6 /* Debounce.swift in Sources */, 37D526DF2720AC4400ED2F5E /* VideosAPI.swift in Sources */, 37D4B0E52671614900C925CA /* YatteeApp.swift in Sources */, diff --git a/macOS/InstancesSettings.swift b/macOS/InstancesSettings.swift index 81aaee6e..86596919 100644 --- a/macOS/InstancesSettings.swift +++ b/macOS/InstancesSettings.swift @@ -14,6 +14,7 @@ struct InstancesSettings: View { @State private var frontendURL = "" + @Environment(\.colorScheme) private var colorScheme @EnvironmentObject private var accounts @Default(.instances) private var instances @@ -54,7 +55,7 @@ struct InstancesSettings: View { Button("Remove") { presentingAccountRemovalConfirmation = true } - .foregroundColor(.red) + .foregroundColor(colorScheme == .dark ? .white : .red) .opacity(account == selectedAccount ? 1 : 0) } .tag(account)