diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index 2c512da09..1be4154fc 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -1490,7 +1490,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.26.0; + MARKETING_VERSION = 1.27.0; PRODUCT_BUNDLE_IDENTIFIER = app.omnivore.app; PRODUCT_NAME = Omnivore; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1831,7 +1831,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.26.0; + MARKETING_VERSION = 1.27.0; PRODUCT_BUNDLE_IDENTIFIER = app.omnivore.app; PRODUCT_NAME = Omnivore; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift index 248fc9e2c..621dd53dc 100644 --- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift +++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift @@ -371,7 +371,7 @@ public struct ShareExtensionView: View { viewModel.submitTitleEdit(dataService: viewModel.services.dataService, itemID: linkedItem.unwrappedID, title: viewModel.title, - description: linkedItem.description) + description: linkedItem.descriptionText ?? "") } } viewState = .mainView diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index b8c42dd4e..f4ad4f2f4 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -55,6 +55,7 @@ struct WebReader: PlatformViewRepresentable { #if os(iOS) webView.isOpaque = false + webView.tintColor = UIColor(ThemeManager.currentHighlightColor) webView.backgroundColor = UIColor(ThemeManager.currentBgColor) webView.underPageBackgroundColor = UIColor(ThemeManager.currentBgColor) webView.scrollView.backgroundColor = UIColor(ThemeManager.currentBgColor) @@ -116,6 +117,7 @@ struct WebReader: PlatformViewRepresentable { (webView as? OmnivoreWebView)?.updateJustifyText() webView.backgroundColor = UIColor(ThemeManager.currentBgColor) + webView.tintColor = UIColor(ThemeManager.currentHighlightColor) webView.underPageBackgroundColor = UIColor(ThemeManager.currentBgColor) webView.scrollView.backgroundColor = UIColor(ThemeManager.currentBgColor) webView.scrollView.indicatorStyle = ThemeManager.currentTheme.isDark ? diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift index 88d9d5603..09f48d751 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift @@ -143,8 +143,9 @@ extension WebReaderCoordinator: WKNavigationDelegate { func scrollViewShouldScrollToTop(_ scrollView: UIScrollView) -> Bool { scrollView.contentInset.top = readerViewNavBarHeight + let navBarVisible = navBarVisibilityRatio == 1 navBarVisibilityRatio = 1 - return false + return navBarVisible } } #endif diff --git a/apple/OmnivoreKit/Sources/Views/Resources/es.lproj/Localizable.strings b/apple/OmnivoreKit/Sources/Views/Resources/es.lproj/Localizable.strings index 883eabec9..848d343f5 100644 --- a/apple/OmnivoreKit/Sources/Views/Resources/es.lproj/Localizable.strings +++ b/apple/OmnivoreKit/Sources/Views/Resources/es.lproj/Localizable.strings @@ -124,7 +124,7 @@ "welcomeSignupAgreement" = "Al registrarte, aceptas de Omnivore:\n"; "welcomeTitleTermsOfService" = "Términos del Servicio"; "welcomeTitleAndJoiner" = " y "; -"welcomeTitleEmailContinue" = "Continuar con el correo electrónico; +"welcomeTitleEmailContinue" = "Continuar con el correo electrónico"; // Keyboard Commands "keyboardCommandDecreaseFont" = "Disminuir tamaño de fuente"; diff --git a/apple/OmnivoreKit/Sources/Views/Theme.swift b/apple/OmnivoreKit/Sources/Views/Theme.swift index 38e624585..0351fdd70 100644 --- a/apple/OmnivoreKit/Sources/Views/Theme.swift +++ b/apple/OmnivoreKit/Sources/Views/Theme.swift @@ -31,6 +31,20 @@ public enum Theme: String, CaseIterable { } } + public var highlightColor: Color { + switch self { + case .light, .sepia: + return Color(red: 255 / 255.0, green: 210 / 255.0, blue: 52 / 255.0) + case .dark, .apollo: + return Color(red: 134 / 255.0, green: 109 / 255.0, blue: 21 / 255.0) + case .system: + if Color.isDarkMode { + return Color(red: 134 / 255.0, green: 109 / 255.0, blue: 21 / 255.0) + } + return Color(red: 255 / 255.0, green: 210 / 255.0, blue: 52 / 255.0) + } + } + public var keyColor: Color { switch self { case .light: @@ -79,4 +93,8 @@ public enum ThemeManager { public static var currentBgColor: Color { currentTheme.bgColor } + + public static var currentHighlightColor: Color { + currentTheme.highlightColor + } }