Merge pull request #2062 from omnivore-app/fix/ios-1.26-beta

Bump iOS version, update Chinese string translation, show Reader Preferences from a popover on iPad

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 = "";

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()
       }

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" = "继续使用电子邮件";