Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2259 from omnivore-app/fix/ios-reader-settings

Browse Source 
Allow setting margin on iPhone, fix bug with reset button
This commit is contained in:
Jackson Harper
2023-05-26 13:03:11 +08:00
committed by GitHub
parent 91c0271ea3 ee82cf9180
commit c57da8d902
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
View File

@ -244,6 +244,10 @@ struct WebReaderContainerView: View {
label: { Label("Share Original", systemImage: "square.and.arrow.up") }
)
}
Button(
action: copyDeeplink,
label: { Label("Copy Deeplink", systemImage: "link") }
)
Button(
action: delete,
label: { Label("Delete", systemImage: "trash") }
@ -587,6 +591,19 @@ struct WebReaderContainerView: View {
shareActionID = UUID()
}
func copyDeeplink() {
if let deepLink = item.deepLink {
#if os(iOS)
UIPasteboard.general.string = deepLink.absoluteString
#else
Pasteboard.general.string = deepLink.absoluteString
#endif
showInSnackbar("Deeplink Copied")
} else {
showInSnackbar("Error copying deeplink")
}
}
func delete() {
showDeleteConfirmation = true
}

26
apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift
View File

@ -222,20 +222,23 @@ public enum WebFont: String, CaseIterable {
var marginSlider: some View {
HStack {
let minValue = UIDevice.isIPad ? 40 : 70
let stepSize = UIDevice.isIPad ? 10 : 2
Button(action: {
storedMaxWidthPercentage = max(storedMaxWidthPercentage - 10, 40)
storedMaxWidthPercentage = max(storedMaxWidthPercentage - stepSize, minValue)
updateReaderPreferences()
}, label: { Image("margin-smaller", bundle: .module) })
.frame(width: 25, height: 25, alignment: .center)
CustomSlider(value: $storedMaxWidthPercentage, minValue: 40, maxValue: 100) { _ in
CustomSlider(value: $storedMaxWidthPercentage, minValue: minValue, maxValue: 100) { _ in
updateReaderPreferences()
}
.padding(.horizontal, 10)
.tint(Color(hex: "#D9D9D9"))
Button(action: {
storedMaxWidthPercentage = min(storedMaxWidthPercentage + 10, 100)
storedMaxWidthPercentage = min(storedMaxWidthPercentage + stepSize, 100)
updateReaderPreferences()
}, label: { Image("margin-larger", bundle: .module) })
@ -351,15 +354,13 @@ public enum WebFont: String, CaseIterable {
.padding(.vertical, 10)
Group {
if UIDevice.isIPad {
Text("Margin")
.font(Font.system(size: 14))
.frame(maxWidth: .infinity, alignment: .leading)
Text("Margin")
.font(Font.system(size: 14))
.frame(maxWidth: .infinity, alignment: .leading)
marginSlider
.padding(.top, 5)
.padding(.bottom, 10)
}
marginSlider
.padding(.top, 5)
.padding(.bottom, 10)
Text("Line Height")
.font(Font.system(size: 14))
@ -408,8 +409,9 @@ public enum WebFont: String, CaseIterable {
enableHighlightOnRelease = false
preferredFont = WebFont.inter.rawValue
prefersHighContrastText = true
enableHighlightOnRelease = false
updateReaderPreferences()
}, label: {
Text("Reset")
.font(Font.system(size: 12, weight: .bold))