shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Remove in-app Safari settings on macOS 

Closes #469
This commit is contained in:
Shadowfacts 2024-04-15 09:34:44 -04:00
parent 66f0ba6891
commit 6784ed7fdf
5 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/BehaviorKeys.swift
View File

@ -24,3 +24,17 @@ struct ConfirmReblogKey: PreferenceKey {
struct TimelineSyncModeKey: PreferenceKey { struct TimelineSyncModeKey: PreferenceKey {
static var defaultValue: TimelineSyncMode { .icloud } static var defaultValue: TimelineSyncMode { .icloud }
} }
struct InAppSafariKey: PreferenceKey {
static var defaultValue: Bool {
#if targetEnvironment(macCatalyst) || os(visionOS)
false
#else
if ProcessInfo.processInfo.isiOSAppOnMac {
false
} else {
true
}
#endif
}
}

10
Packages/TuskerPreferences/Sources/TuskerPreferences/Legacy/PreferenceStore+Migrate.swift
View File

@ -10,7 +10,7 @@ import UIKit
extension PreferenceStore { extension PreferenceStore {
func migrate(from legacy: LegacyPreferences) { func migrate(from legacy: LegacyPreferences) {
let migrations: [any MigrationProtocol] = [ var migrations: [any MigrationProtocol] = [
Migration(from: \.theme.theme, to: \.$theme), Migration(from: \.theme.theme, to: \.$theme),
Migration(from: \.pureBlackDarkMode, to: \.$pureBlackDarkMode), Migration(from: \.pureBlackDarkMode, to: \.$pureBlackDarkMode),
Migration(from: \.accentColor, to: \.$accentColor), Migration(from: \.accentColor, to: \.$accentColor),
@ -41,8 +41,6 @@ extension PreferenceStore {
Migration(from: \.attachmentAltBadgeInverted, to: \.$attachmentAltBadgeInverted), Migration(from: \.attachmentAltBadgeInverted, to: \.$attachmentAltBadgeInverted),
Migration(from: \.openLinksInApps, to: \.$openLinksInApps), Migration(from: \.openLinksInApps, to: \.$openLinksInApps),
Migration(from: \.useInAppSafari, to: \.$useInAppSafari),
Migration(from: \.inAppSafariAutomaticReaderMode, to: \.$inAppSafariAutomaticReaderMode),
Migration(from: \.expandAllContentWarnings, to: \.$expandAllContentWarnings), Migration(from: \.expandAllContentWarnings, to: \.$expandAllContentWarnings),
Migration(from: \.collapseLongPosts, to: \.$collapseLongPosts), Migration(from: \.collapseLongPosts, to: \.$collapseLongPosts),
Migration(from: \.oppositeCollapseKeywords, to: \.$oppositeCollapseKeywords), Migration(from: \.oppositeCollapseKeywords, to: \.$oppositeCollapseKeywords),
@ -65,6 +63,12 @@ extension PreferenceStore {
Migration(from: \.hasShownLocalTimelineDescription, to: \.$hasShownLocalTimelineDescription), Migration(from: \.hasShownLocalTimelineDescription, to: \.$hasShownLocalTimelineDescription),
Migration(from: \.hasShownFederatedTimelineDescription, to: \.$hasShownFederatedTimelineDescription), Migration(from: \.hasShownFederatedTimelineDescription, to: \.$hasShownFederatedTimelineDescription),
] ]
#if !targetEnvironment(macCatalyst) && !os(visionOS)
migrations.append(contentsOf: [
Migration(from: \.useInAppSafari, to: \.$useInAppSafari),
Migration(from: \.inAppSafariAutomaticReaderMode, to: \.$inAppSafariAutomaticReaderMode),
] as [any MigrationProtocol])
#endif
for migration in migrations { for migration in migrations {
migration.migrate(from: legacy, to: self) migration.migrate(from: legacy, to: self)

2
Packages/TuskerPreferences/Sources/TuskerPreferences/PreferenceStore.swift
View File

@ -44,7 +44,7 @@ public final class PreferenceStore: ObservableObject, Codable {
// MARK: Behavior // MARK: Behavior
@Preference<TrueKey> public var openLinksInApps @Preference<TrueKey> public var openLinksInApps
@Preference<TrueKey> public var useInAppSafari @Preference<InAppSafariKey> public var useInAppSafari
@Preference<FalseKey> public var inAppSafariAutomaticReaderMode @Preference<FalseKey> public var inAppSafariAutomaticReaderMode
@Preference<FalseKey> public var expandAllContentWarnings @Preference<FalseKey> public var expandAllContentWarnings
@Preference<TrueKey> public var collapseLongPosts @Preference<TrueKey> public var collapseLongPosts

14
Tusker/Screens/Preferences/BehaviorPrefsView.swift
View File

@ -58,13 +58,15 @@ struct BehaviorPrefsView: View {
Toggle(isOn: $preferences.openLinksInApps) { Toggle(isOn: $preferences.openLinksInApps) {
Text("Open Links in Apps") Text("Open Links in Apps")
} }
#if !os(visionOS) #if !targetEnvironment(macCatalyst) && !os(visionOS)
Toggle(isOn: $preferences.useInAppSafari) { if !ProcessInfo.processInfo.isiOSAppOnMac {
Text("Use In-App Safari") Toggle(isOn: $preferences.useInAppSafari) {
Text("Use In-App Safari")
}
Toggle(isOn: $preferences.inAppSafariAutomaticReaderMode) {
Text("Always Use Reader Mode in In-App Safari")
}.disabled(!preferences.useInAppSafari)
} }
Toggle(isOn: $preferences.inAppSafariAutomaticReaderMode) {
Text("Always Use Reader Mode in In-App Safari")
}.disabled(!preferences.useInAppSafari)
#endif #endif
} }
.appGroupedListRowBackground() .appGroupedListRowBackground()

5
Tusker/TuskerNavigationDelegate.swift
View File

@ -47,10 +47,11 @@ extension TuskerNavigationDelegate {
func selected(url: URL, allowResolveStatuses: Bool = true, allowUniversalLinks: Bool = true) { func selected(url: URL, allowResolveStatuses: Bool = true, allowUniversalLinks: Bool = true) {
func openSafari() { func openSafari() {
#if os(visionOS) #if targetEnvironment(macCatalyst) || os(visionOS)
UIApplication.shared.open(url) UIApplication.shared.open(url)
#else #else
if Preferences.shared.useInAppSafari, if !ProcessInfo.processInfo.isiOSAppOnMac,
Preferences.shared.useInAppSafari,
url.scheme == "https" || url.scheme == "http" { url.scheme == "https" || url.scheme == "http" {
let config = SFSafariViewController.Configuration() let config = SFSafariViewController.Configuration()
config.entersReaderIfAvailable = Preferences.shared.inAppSafariAutomaticReaderMode config.entersReaderIfAvailable = Preferences.shared.inAppSafariAutomaticReaderMode