Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-09 20:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Layout fixes

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-11-12 02:39:44 +01:00
parent eb1e440ed2
commit eb9924bd4a
8 changed files with 117 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/Settings/BrowsingSettings.swift
View File

@@ -120,7 +120,9 @@ struct BrowsingSettings: View {
private var interfaceSettings: some View {
Section(header: SettingsHeader(text: "Interface".localized())) {
Toggle("Show Open Videos toolbar button", isOn: $showOpenActionsToolbarItem)
#if !os(tvOS)
Toggle("Show Open Videos toolbar button", isOn: $showOpenActionsToolbarItem)
#endif
#if os(iOS)
Toggle("Lock portrait mode", isOn: $lockPortraitWhenBrowsing)
.onChange(of: lockPortraitWhenBrowsing) { lock in

118
Shared/Settings/EditFavorites.swift
View File

@@ -10,51 +10,69 @@ struct EditFavorites: View {
var body: some View {
Group {
List {
Section(header: Text("Favorites")) {
if favorites.isEmpty {
Text("Favorites is empty")
.foregroundColor(.secondary)
}
ForEach(favorites) { item in
HStack {
Text(label(item))
Spacer()
HStack(spacing: 30) {
Button {
model.moveUp(item)
} label: {
Label("Move Up", systemImage: "arrow.up")
}
Button {
model.moveDown(item)
} label: {
Label("Move Down", systemImage: "arrow.down")
}
Button {
model.remove(item)
} label: {
Label("Remove", systemImage: "trash")
}
}
#if !os(tvOS)
.buttonStyle(.borderless)
#endif
}
#if os(tvOS)
ScrollView {
VStack {
editor
}
}
#if os(tvOS)
.padding(.trailing, 40)
#endif
.frame(width: 1000)
#else
List {
editor
}
#endif
}
.navigationTitle("Favorites")
}
#if os(tvOS)
Divider()
.padding(20)
#endif
var editor: some View {
Group {
Section(header: Text("Favorites")) {
if favorites.isEmpty {
Text("Favorites is empty")
.foregroundColor(.secondary)
}
ForEach(favorites) { item in
HStack {
Text(label(item))
Spacer()
HStack(spacing: 30) {
Button {
model.moveUp(item)
} label: {
Label("Move Up", systemImage: "arrow.up")
}
Button {
model.moveDown(item)
} label: {
Label("Move Down", systemImage: "arrow.down")
}
Button {
model.remove(item)
} label: {
Label("Remove", systemImage: "trash")
}
}
#if !os(tvOS)
.buttonStyle(.borderless)
#endif
}
}
}
#if os(tvOS)
.padding(.trailing, 40)
#endif
#if os(tvOS)
Divider()
.padding(20)
#endif
if !model.addableItems().isEmpty {
Section(header: Text("Available")) {
ForEach(model.addableItems()) { item in
HStack {
@@ -70,6 +88,9 @@ struct EditFavorites: View {
.font(.system(size: 30))
#endif
}
#if !os(tvOS)
.buttonStyle(.borderless)
#endif
}
}
}
@@ -77,13 +98,8 @@ struct EditFavorites: View {
.padding(.trailing, 40)
#endif
}
.labelStyle(.iconOnly)
.frame(alignment: .leading)
#if os(tvOS)
.frame(width: 1000)
#endif
}
.navigationTitle("Favorites")
.labelStyle(.iconOnly)
}
func label(_ item: FavoriteItem) -> String {
@@ -97,9 +113,9 @@ struct EditFavorites: View {
struct EditFavorites_Previews: PreviewProvider {
static var previews: some View {
NavigationView {
EditFavorites()
}
.injectFixtureEnvironmentObjects()
// NavigationView {
EditFavorites()
// }
.injectFixtureEnvironmentObjects()
}
}

17
Shared/Settings/SettingsView.swift
View File

@@ -97,9 +97,7 @@ struct SettingsView: View {
#else
NavigationView {
settingsList
#if os(tvOS)
.navigationBarHidden(true)
#endif
.navigationTitle("Settings")
}
#endif
}
@@ -115,14 +113,6 @@ struct SettingsView: View {
#endif
Section {
#if os(tvOS)
NavigationLink {
EditFavorites()
} label: {
Label("Favorites", systemImage: "heart.fill")
}
#endif
NavigationLink {
BrowsingSettings()
} label: {
@@ -195,7 +185,6 @@ struct SettingsView: View {
}
#endif
}
.navigationTitle("Settings")
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
#if !os(tvOS)
@@ -217,9 +206,9 @@ struct SettingsView: View {
private var windowHeight: Double {
switch selection {
case nil:
return accounts.isEmpty ? 680 : 520
return accounts.isEmpty ? 680 : 580
case .browsing:
return 520
return 580
case .player:
return 680
case .quality: