Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-04-25 16:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #338

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-11-11 19:53:52 +01:00
parent 5d033cbdfc
commit 611bcde238
3 changed files with 28 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Shared/Settings/BrowsingSettings.swift
View File

@ -89,7 +89,7 @@ struct BrowsingSettings: View {
Section(header: SettingsHeader(text: "Sections".localized())) {
#if os(macOS)
let list = ForEach(VisibleSection.allCases, id: \.self) { section in
VisibleSectionSelectionRow(
MultiselectRow(
title: section.title,
selected: visibleSections.contains(section)
) { value in
@ -110,7 +110,7 @@ struct BrowsingSettings: View {
}
#else
ForEach(VisibleSection.allCases, id: \.self) { section in
VisibleSectionSelectionRow(
MultiselectRow(
title: section.title,
selected: visibleSections.contains(section)
) { value in
@ -128,51 +128,13 @@ struct BrowsingSettings: View {
visibleSections.remove(section)
}
}
struct VisibleSectionSelectionRow: View {
let title: String
let selected: Bool
var action: (Bool) -> Void
@State private var toggleChecked = false
var body: some View {
Button(action: { action(!selected) }) {
HStack {
#if os(macOS)
Toggle(isOn: $toggleChecked) {
Text(self.title)
Spacer()
}
.onAppear {
toggleChecked = selected
}
.onChange(of: toggleChecked) { new in
action(new)
}
#else
Text(self.title)
Spacer()
if selected {
Image(systemName: "checkmark")
#if os(iOS)
.foregroundColor(.accentColor)
#endif
}
#endif
}
.contentShape(Rectangle())
}
#if !os(tvOS)
.buttonStyle(.plain)
#endif
}
}
}
struct BrowsingSettings_Previews: PreviewProvider {
static var previews: some View {
BrowsingSettings()
.injectFixtureEnvironmentObjects()
VStack {
BrowsingSettings()
}
.injectFixtureEnvironmentObjects()
}
}

40
Shared/Settings/MultiselectRow.swift
View File

@ -9,21 +9,19 @@ struct MultiselectRow: View {
@State private var toggleChecked = false
var body: some View {
Button(action: { action(!selected) }) {
HStack {
#if os(macOS)
Toggle(isOn: $toggleChecked) {
Text(self.title)
Spacer()
}
.onAppear {
guard !disabled else { return }
toggleChecked = selected
}
.onChange(of: toggleChecked) { new in
action(new)
}
#else
#if os(macOS)
Toggle(title, isOn: $toggleChecked)
.toggleStyle(.checkbox)
.onAppear {
guard !disabled else { return }
toggleChecked = selected
}
.onChange(of: toggleChecked) { new in
action(new)
}
#else
Button(action: { action(!selected) }) {
HStack {
Text(self.title)
Spacer()
if selected {
@ -32,13 +30,13 @@ struct MultiselectRow: View {
.foregroundColor(.accentColor)
#endif
}
#endif
}
.contentShape(Rectangle())
}
.contentShape(Rectangle())
}
.disabled(disabled)
#if !os(tvOS)
.buttonStyle(.plain)
.disabled(disabled)
#if !os(tvOS)
.buttonStyle(.plain)
#endif
#endif
}
}

5
Shared/Settings/SponsorBlockSettings.swift
View File

@ -19,8 +19,8 @@ struct SponsorBlockSettings: View {
}
#if os(tvOS)
.frame(maxWidth: 1000)
#elseif os(iOS)
.listStyle(.insetGrouped)
#else
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
#endif
.navigationTitle("SponsorBlock")
}
@ -106,5 +106,6 @@ struct SponsorBlockSettings_Previews: PreviewProvider {
VStack {
SponsorBlockSettings()
}
.frame(maxHeight: 600)
}
}