From 3ca4fd4915966bce1576ea1406219550ed2768c1 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 17 Apr 2023 11:09:25 +0800 Subject: [PATCH 1/2] Bump iOS version, update Chinese string translation --- apple/Omnivore.xcodeproj/project.pbxproj | 4 ++-- .../Sources/Views/Resources/zh-Hans.lproj/Localizable.strings | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index f7f6e914c..2c512da09 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -1490,7 +1490,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.25.0; + MARKETING_VERSION = 1.26.0; PRODUCT_BUNDLE_IDENTIFIER = app.omnivore.app; PRODUCT_NAME = Omnivore; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1831,7 +1831,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.25.0; + MARKETING_VERSION = 1.26.0; PRODUCT_BUNDLE_IDENTIFIER = app.omnivore.app; PRODUCT_NAME = Omnivore; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/apple/OmnivoreKit/Sources/Views/Resources/zh-Hans.lproj/Localizable.strings b/apple/OmnivoreKit/Sources/Views/Resources/zh-Hans.lproj/Localizable.strings index dc6a8b2ab..cf39c70ac 100644 --- a/apple/OmnivoreKit/Sources/Views/Resources/zh-Hans.lproj/Localizable.strings +++ b/apple/OmnivoreKit/Sources/Views/Resources/zh-Hans.lproj/Localizable.strings @@ -122,7 +122,7 @@ // Welcome View "welcomeTitle" = "认真的读者所喜爱的稍后阅读。"; "welcomeLearnMore" = "了解更多"; -"welcomeSignupAgreement" = "注册即表示您同意 Omnivore\n"; +"welcomeSignupAgreement" = "您使用我们的服务即表示您已同意本条款 Omnivore\n"; "welcomeTitleTermsOfService" = "服务条款"; "welcomeTitleAndJoiner" = " 和 "; "welcomeTitleEmailContinue" = "继续使用电子邮件"; From dc31f653bcd51fe4637660c983036bc7649d364c Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 17 Apr 2023 12:44:33 +0800 Subject: [PATCH 2/2] on iPad show the reader settings in a popover --- .../Views/WebReader/WebReaderContainer.swift | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 796ae5813..ede88ade0 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -11,6 +11,7 @@ struct WebReaderContainerView: View { let item: LinkedItem @State private var showPreferencesPopover = false + @State private var showPreferencesFormsheet = false @State private var showLabelsModal = false @State private var showHighlightLabelsModal = false @State private var showTitleEdit = false @@ -286,7 +287,13 @@ struct WebReaderContainerView: View { #endif Button( - action: { showPreferencesPopover.toggle() }, + action: { + if UIDevice.current.userInterfaceIdiom == .phone { + showPreferencesFormsheet.toggle() + } else { + showPreferencesPopover.toggle() + } + }, label: { Image(systemName: "textformat.size") .font(.appNavbarIcon) @@ -294,6 +301,14 @@ struct WebReaderContainerView: View { ) .padding(.horizontal, 5) .scaleEffect(navBarVisibilityRatio) + .popover(isPresented: $showPreferencesPopover) { + webPreferencesPopoverView + .frame(maxWidth: 400, maxHeight: 475) + } + .formSheet(isPresented: $showPreferencesFormsheet, modalSize: CGSize(width: 400, height: 475)) { + webPreferencesPopoverView + } + #if os(macOS) Spacer() #endif @@ -529,11 +544,7 @@ struct WebReaderContainerView: View { } #endif } - #if os(iOS) - .formSheet(isPresented: $showPreferencesPopover, modalSize: CGSize(width: 400, height: 475)) { - webPreferencesPopoverView - } - #else + #if os(macOS) .onReceive(NSNotification.readerSettingsChangedPublisher) { _ in readerSettingsChangedTransactionID = UUID() }