Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-11-14 01:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor UI fixes for macOS Big Sur

Browse Source
This commit is contained in:
Arkadiusz Fal 2021-12-02 20:22:55 +01:00
parent c4b5c7ce41
commit dd995105b5
10 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Backports/Badge+Backport.swift
View File

@ -5,7 +5,12 @@ extension Backport where Content: View {
if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) { if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) {
content.badge(count) content.badge(count)
} else { } else {
HStack {
content content
Spacer()
Text("\(count)")
.foregroundColor(.secondary)
}
} }
} }
} }

2
Shared/Navigation/ContentView.swift
View File

@ -68,7 +68,7 @@ struct ContentView: View {
.background( .background(
EmptyView().sheet(isPresented: $player.presentingPlayer) { EmptyView().sheet(isPresented: $player.presentingPlayer) {
videoPlayer videoPlayer
.frame(minWidth: 900, minHeight: 800) .frame(minWidth: 1000, minHeight: 750)
} }
) )
#endif #endif

2
Shared/Player/VideoPlayerView.swift
View File

@ -116,7 +116,7 @@ struct VideoPlayerView: View {
#elseif os(macOS) #elseif os(macOS)
if Defaults[.playerSidebar] != .never { if Defaults[.playerSidebar] != .never {
PlayerQueueView(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreen) PlayerQueueView(sidebarQueue: sidebarQueueBinding, fullScreen: $fullScreen)
.frame(minWidth: 250) .frame(minWidth: 300)
} }
#endif #endif
} }

4
Shared/Settings/BrowsingSettings.swift
View File

@ -18,7 +18,7 @@ struct BrowsingSettings: View {
} }
Section(header: SettingsHeader(text: "Sections")) { Section(header: SettingsHeader(text: "Sections")) {
#if os(macOS) #if os(macOS)
let list = List(VisibleSection.allCases, id: \.self) { section in let list = ForEach(VisibleSection.allCases, id: \.self) { section in
VisibleSectionSelectionRow( VisibleSectionSelectionRow(
title: section.title, title: section.title,
selected: visibleSections.contains(section) selected: visibleSections.contains(section)
@ -35,6 +35,8 @@ struct BrowsingSettings: View {
list list
.listStyle(.inset) .listStyle(.inset)
} }
Spacer()
} }
#else #else
ForEach(VisibleSection.allCases, id: \.self) { section in ForEach(VisibleSection.allCases, id: \.self) { section in

1
Shared/Settings/InstanceForm.swift
View File

@ -76,6 +76,7 @@ struct InstanceForm: View {
} }
} }
.pickerStyle(.segmented) .pickerStyle(.segmented)
.labelsHidden()
TextField("Name", text: $name) TextField("Name", text: $name)

2
Shared/Settings/ServicesSettings.swift
View File

@ -20,7 +20,7 @@ struct ServicesSettings: View {
Section(header: SettingsHeader(text: "Categories to Skip")) { Section(header: SettingsHeader(text: "Categories to Skip")) {
#if os(macOS) #if os(macOS)
let list = List(SponsorBlockAPI.categories, id: \.self) { category in let list = ForEach(SponsorBlockAPI.categories, id: \.self) { category in
SponsorBlockCategorySelectionRow( SponsorBlockCategorySelectionRow(
title: SponsorBlockAPI.categoryDescription(category) ?? "Unknown", title: SponsorBlockAPI.categoryDescription(category) ?? "Unknown",
selected: sponsorBlockCategories.contains(category) selected: sponsorBlockCategories.contains(category)

4
Shared/Settings/SettingsView.swift
View File

@ -44,7 +44,7 @@ struct SettingsView: View {
PlaybackSettings() PlaybackSettings()
} }
.tabItem { .tabItem {
Label("Playback", systemImage: "play.rectangle.on.rectangle.fill") Label("Playback", systemImage: "play.rectangle")
} }
.tag(Tabs.playback) .tag(Tabs.playback)
@ -52,7 +52,7 @@ struct SettingsView: View {
ServicesSettings() ServicesSettings()
} }
.tabItem { .tabItem {
Label("Services", systemImage: "puzzlepiece.extension") Label("Services", systemImage: "puzzlepiece")
} }
.tag(Tabs.services) .tag(Tabs.services)
} }

2
Shared/Views/DetailBadge.swift
View File

@ -31,7 +31,7 @@ struct DetailBadge: View {
.background(.thinMaterial) .background(.thinMaterial)
} else { } else {
content content
.background(Color.background) .background(Color.background.opacity(0.95))
} }
} }
} }

4
Yattee.xcodeproj/project.pbxproj
View File

@ -465,6 +465,7 @@
37DD87C7271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; }; 37DD87C7271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; };
37DD87C8271C9CFE0027CBF9 /* 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 */; }; 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 */; }; 37E084AC2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; };
37E084AD2753D95F00039B7D /* 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 */; }; 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 = "<group>"; }; 37D526E22720B4BE00ED2F5E /* View+SwipeGesture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+SwipeGesture.swift"; sourceTree = "<group>"; };
37D9169A27388A81002B1BAA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; }; 37D9169A27388A81002B1BAA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerStreams.swift; sourceTree = "<group>"; }; 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerStreams.swift; sourceTree = "<group>"; };
37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerticalScrollingFix.swift; sourceTree = "<group>"; };
37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsNavigationLink.swift; sourceTree = "<group>"; }; 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsNavigationLink.swift; sourceTree = "<group>"; };
37E2EEAA270656EC00170416 /* PlayerControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerControlsView.swift; sourceTree = "<group>"; }; 37E2EEAA270656EC00170416 /* PlayerControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerControlsView.swift; sourceTree = "<group>"; };
37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsModel.swift; sourceTree = "<group>"; }; 37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsModel.swift; sourceTree = "<group>"; };
@ -1073,6 +1075,7 @@
374108D0272B11B2006C5CC8 /* PictureInPictureDelegate.swift */, 374108D0272B11B2006C5CC8 /* PictureInPictureDelegate.swift */,
37BE0BDB26A2367F0092E2DB /* Player.swift */, 37BE0BDB26A2367F0092E2DB /* Player.swift */,
37BE0BD926A214630092E2DB /* PlayerViewController.swift */, 37BE0BD926A214630092E2DB /* PlayerViewController.swift */,
37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */,
374C0544272496FD009BDDBE /* Info.plist */, 374C0544272496FD009BDDBE /* Info.plist */,
); );
path = macOS; path = macOS;
@ -1967,6 +1970,7 @@
37EF5C232739D37B00B03725 /* MenuModel.swift in Sources */, 37EF5C232739D37B00B03725 /* MenuModel.swift in Sources */,
37599F31272B42810087F250 /* FavoriteItem.swift in Sources */, 37599F31272B42810087F250 /* FavoriteItem.swift in Sources */,
3730F75A2733481E00F385FC /* RelatedView.swift in Sources */, 3730F75A2733481E00F385FC /* RelatedView.swift in Sources */,
37E04C0F275940FB00172673 /* VerticalScrollingFix.swift in Sources */,
375168D72700FDB8008F96A6 /* Debounce.swift in Sources */, 375168D72700FDB8008F96A6 /* Debounce.swift in Sources */,
37D526DF2720AC4400ED2F5E /* VideosAPI.swift in Sources */, 37D526DF2720AC4400ED2F5E /* VideosAPI.swift in Sources */,
37D4B0E52671614900C925CA /* YatteeApp.swift in Sources */, 37D4B0E52671614900C925CA /* YatteeApp.swift in Sources */,

3
macOS/InstancesSettings.swift
View File

@ -14,6 +14,7 @@ struct InstancesSettings: View {
@State private var frontendURL = "" @State private var frontendURL = ""
@Environment(\.colorScheme) private var colorScheme
@EnvironmentObject<AccountsModel> private var accounts @EnvironmentObject<AccountsModel> private var accounts
@Default(.instances) private var instances @Default(.instances) private var instances
@ -54,7 +55,7 @@ struct InstancesSettings: View {
Button("Remove") { Button("Remove") {
presentingAccountRemovalConfirmation = true presentingAccountRemovalConfirmation = true
} }
.foregroundColor(.red) .foregroundColor(colorScheme == .dark ? .white : .red)
.opacity(account == selectedAccount ? 1 : 0) .opacity(account == selectedAccount ? 1 : 0)
} }
.tag(account) .tag(account)