CHANGELOG.md

@@ -1,20 +1,5 @@
 # Changelog
 
-## 2024.2 (121)
-This build introduces a new multi-column navigation mode on iPad. You can revert to the old mode under Preferences -> Appearance.
-
-Features/Improvements:
-- iPadOS: Enable multi-column navigation
-- Add post preview to Appearance preferences
-- Consolidate Media preferences section with Appearance
-- Add icons to Preferences sections
-
-Bugfixes:
-- Fix push notifications not working on Pleroma/Akkoma and older Mastodon versions
-- Fix push notifications not working with certain accounts
-- Fix links on About screen not being aligned
-- macOS: Remove non-functional in-app Safari preferences
-
 ## 2024.2 (120)
 This build adds push notifications, which can be enabled in Preferences -> Notifications.
 

Packages/PushNotifications/Sources/PushNotifications/PushManagerImpl.swift

@@ -71,7 +71,7 @@ class PushManagerImpl: _PushManager {
     
     private func endpointURL(deviceToken: Data, accountID: String) -> URL {
         var endpoint = URLComponents(url: endpoint, resolvingAgainstBaseURL: false)!
-        let accountID = accountID.addingPercentEncoding(withAllowedCharacters: .alphanumerics)!
+        let accountID = accountID.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
         endpoint.path = "/push/v1/\(apnsEnvironment)/\(deviceToken.hexEncodedString())/\(accountID)"
         return endpoint.url!
     }

Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/AppearanceKeys.swift

@@ -8,12 +8,12 @@
 import Foundation
 import UIKit
 
-public struct ThemeKey: MigratablePreferenceKey {
+struct ThemeKey: MigratablePreferenceKey {
-    public static var defaultValue: Theme { .unspecified }
+    static var defaultValue: Theme { .unspecified }
 }
 
-public struct AccentColorKey: MigratablePreferenceKey {
+struct AccentColorKey: MigratablePreferenceKey {
-    public static var defaultValue: AccentColor { .default }
+    static var defaultValue: AccentColor { .default }
 }
 
 struct AvatarStyleKey: MigratablePreferenceKey {
@@ -28,10 +28,10 @@ struct TrailingSwipeActionsKey: MigratablePreferenceKey {
     static var defaultValue: [StatusSwipeAction] { [.reply, .share] }
 }
 
-public struct WidescreenNavigationModeKey: MigratablePreferenceKey {
+struct WidescreenNavigationModeKey: MigratablePreferenceKey {
-    public static var defaultValue: WidescreenNavigationMode { .multiColumn }
+    static var defaultValue: WidescreenNavigationMode { .multiColumn }
     
-    public static func shouldMigrate(oldValue: WidescreenNavigationMode) -> Bool {
+    static func shouldMigrate(oldValue: WidescreenNavigationMode) -> Bool {
         oldValue != .splitScreen
     }
 }

Packages/TuskerPreferences/Sources/TuskerPreferences/Keys/CommonKeys.swift

@@ -7,10 +7,10 @@
 
 import Foundation
 
-public struct TrueKey: MigratablePreferenceKey {
+struct TrueKey: MigratablePreferenceKey {
-    public static var defaultValue: Bool { true }
+    static var defaultValue: Bool { true }
 }
 
-public struct FalseKey: MigratablePreferenceKey {
+struct FalseKey: MigratablePreferenceKey {
-    public static var defaultValue: Bool { false }
+    static var defaultValue: Bool { false }
 }

Packages/TuskerPreferences/Sources/TuskerPreferences/Preference.swift

@@ -89,13 +89,13 @@ final class Preference<Key: PreferenceKey>: Codable {
     }
 }
 
-public struct PreferencePublisher<Key: PreferenceKey>: Publisher {
+struct PreferencePublisher<Key: PreferenceKey>: Publisher {
-    public typealias Output = Key.Value
+    typealias Output = Key.Value
-    public typealias Failure = Never
+    typealias Failure = Never
     
     let preference: Preference<Key>
     
-    public func receive<S>(subscriber: S) where S : Subscriber, Never == S.Failure, Key.Value == S.Input {
+    func receive<S>(subscriber: S) where S : Subscriber, Never == S.Failure, Key.Value == S.Input {
         preference.$storedValue.map { $0 ?? Key.defaultValue }.receive(subscriber: subscriber)
     }
 }

Packages/TuskerPreferences/Sources/TuskerPreferences/PreferenceKey.swift

@@ -16,7 +16,7 @@ public protocol PreferenceKey {
 }
 
 extension PreferenceKey {
-    public static func didSet(in store: PreferenceStore, newValue: Value) {}
+    static func didSet(in store: PreferenceStore, newValue: Value) {}
 }
 
 protocol MigratablePreferenceKey: PreferenceKey where Value: Equatable {

Tusker.xcodeproj/project.pbxproj

@@ -291,7 +291,6 @@
 		D6C3F5192991F5D60009FCFF /* TimelineJumpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F5182991F5D60009FCFF /* TimelineJumpButton.swift */; };
 		D6C4532D2BCB86AC00E26A0E /* AppearancePrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C4532C2BCB86AC00E26A0E /* AppearancePrefsView.swift */; };
 		D6C4532F2BCB873400E26A0E /* MockStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C4532E2BCB873400E26A0E /* MockStatusView.swift */; };
-		D6C453372BCE1CEF00E26A0E /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D6C4532A2BCAD7F900E26A0E /* PrivacyInfo.xcprivacy */; };
 		D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */; };
 		D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */; };
 		D6C693FE2162FEEA007D6A6D /* UIViewController+Children.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */; };
@@ -1955,7 +1954,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D6C453372BCE1CEF00E26A0E /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Tusker/Views/Status/StatusCollapseButton.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class StatusCollapseButton: UIButton {
 
-    private var interactionBounds: CGRect?
+    private var interactionBounds: CGRect!
     
     override func layoutSubviews() {
         super.layoutSubviews()
@@ -19,7 +19,7 @@ class StatusCollapseButton: UIButton {
     }
     
     override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-        return interactionBounds?.contains(point) ?? false
+        return interactionBounds.contains(point)
     }
 
 }

Version.xcconfig

@@ -10,7 +10,7 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 MARKETING_VERSION = 2024.2
-CURRENT_PROJECT_VERSION = 121
+CURRENT_PROJECT_VERSION = 120
 CURRENT_PROJECT_VERSION = $(inherited)$(CURRENT_PROJECT_VERSION_BUILD_SUFFIX_$(CONFIGURATION))
 
 CURRENT_PROJECT_VERSION_BUILD_SUFFIX_Debug=-dev