prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

style preferences popover

Browse source
This commit is contained in:
Satindar Dhillon 2022-06-01 22:54:38 -07:00
parent 7fae2c6265
commit 5a2f3890df
2 changed files with 66 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
View file

@ -207,7 +207,8 @@ import WebKit
increaseMarginAction: { increaseMarginActionID = UUID() },
decreaseMarginAction: { decreaseMarginActionID = UUID() },
increaseLineHeightAction: { increaseLineHeightActionID = UUID() },
decreaseLineHeightAction: { decreaseLineHeightActionID = UUID() }
decreaseLineHeightAction: { decreaseLineHeightActionID = UUID() },
dismissAction: { showPreferencesPopover = false }
)
}
.onDisappear {

101
apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift
View file

@ -8,6 +8,7 @@ public struct WebPreferencesPopoverView: View {
let decreaseMarginAction: () -> Void
let increaseLineHeightAction: () -> Void
let decreaseLineHeightAction: () -> Void
let dismissAction: () -> Void
static let preferredWebFontSizeKey = UserDefaultKey.preferredWebFontSize.rawValue
#if os(macOS)
@ -25,7 +26,8 @@ public struct WebPreferencesPopoverView: View {
increaseMarginAction: @escaping () -> Void,
decreaseMarginAction: @escaping () -> Void,
increaseLineHeightAction: @escaping () -> Void,
decreaseLineHeightAction: @escaping () -> Void
decreaseLineHeightAction: @escaping () -> Void,
dismissAction: @escaping () -> Void
) {
self.increaseFontAction = increaseFontAction
self.decreaseFontAction = decreaseFontAction
@ -33,12 +35,25 @@ public struct WebPreferencesPopoverView: View {
self.decreaseMarginAction = decreaseMarginAction
self.increaseLineHeightAction = increaseLineHeightAction
self.decreaseLineHeightAction = decreaseLineHeightAction
self.dismissAction = dismissAction
}
public var body: some View {
VStack {
VStack(alignment: .center) {
ZStack {
Text("Preferences").font(.appTitleTwo)
HStack {
Spacer()
Button(
action: dismissAction,
label: { Image(systemName: "xmark").foregroundColor(.appGrayTextContrast) }
)
}
}
.padding()
LabelledStepper(
labelText: "Font Size (\(storedFontSize)):",
labelText: "Font Size:",
onIncrement: {
storedFontSize = min(storedFontSize + 2, 28)
increaseFontAction()
@ -49,20 +64,22 @@ public struct WebPreferencesPopoverView: View {
}
)
LabelledStepper(
labelText: "Margin (\(storedMargin)):",
onIncrement: {
storedMargin = min(storedMargin + 45, 560)
increaseMarginAction()
},
onDecrement: {
storedMargin = max(storedMargin - 45, 200)
decreaseMarginAction()
}
)
if UIDevice.isIPad {
LabelledStepper(
labelText: "Margin:",
onIncrement: {
storedMargin = min(storedMargin + 45, 560)
increaseMarginAction()
},
onDecrement: {
storedMargin = max(storedMargin - 45, 200)
decreaseMarginAction()
}
)
}
LabelledStepper(
labelText: "Line Spacing (\(storedLineSpacing)):",
labelText: "Line Spacing:",
onIncrement: {
storedLineSpacing = min(storedLineSpacing + 25, 300)
increaseLineHeightAction()
@ -72,6 +89,8 @@ public struct WebPreferencesPopoverView: View {
decreaseLineHeightAction()
}
)
Spacer()
}
.padding()
}
@ -84,29 +103,37 @@ struct LabelledStepper: View {
var body: some View {
HStack(alignment: .center, spacing: 0) {
Button(
action: onDecrement,
label: {
Image(systemName: "minus")
#if os(iOS)
.foregroundColor(.systemLabel)
.padding()
#endif
}
)
.frame(width: 55, height: 40, alignment: .center)
Text(labelText)
Button(
action: onIncrement,
label: {
Image(systemName: "plus")
#if os(iOS)
.foregroundColor(.systemLabel)
.padding()
#endif
}
)
.frame(width: 55, height: 40, alignment: .center)
Spacer()
HStack(spacing: 0) {
Button(
action: onDecrement,
label: {
Image(systemName: "minus")
#if os(iOS)
.foregroundColor(.systemLabel)
.padding()
#endif
}
)
.frame(width: 55, height: 40, alignment: .center)
Divider()
.frame(height: 30)
.background(Color.systemLabel)
Button(
action: onIncrement,
label: {
Image(systemName: "plus")
#if os(iOS)
.foregroundColor(.systemLabel)
.padding()
#endif
}
)
.frame(width: 55, height: 40, alignment: .center)
}
.background(Color.appButtonBackground)
.cornerRadius(8)
}
}
}