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

Compile for visionOS

This commit is contained in:
Shadowfacts 2023-10-19 22:50:20 -04:00
parent c4bf5d406d
commit e4c22a0205
72 changed files with 480 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenInTusker/ActionViewController.swift
View File

@ -8,6 +8,7 @@
import UIKit import UIKit
import MobileCoreServices import MobileCoreServices
import UniformTypeIdentifiers
class ActionViewController: UIViewController { class ActionViewController: UIViewController {
@ -32,10 +33,10 @@ class ActionViewController: UIViewController {
private func findURLFromWebPage(completion: @escaping (URLComponents?) -> Void) { private func findURLFromWebPage(completion: @escaping (URLComponents?) -> Void) {
for item in extensionContext!.inputItems as! [NSExtensionItem] { for item in extensionContext!.inputItems as! [NSExtensionItem] {
for provider in item.attachments! { for provider in item.attachments! {
guard provider.hasItemConformingToTypeIdentifier(kUTTypePropertyList as String) else { guard provider.hasItemConformingToTypeIdentifier(UTType.propertyList.identifier) else {
continue continue
} }
provider.loadItem(forTypeIdentifier: kUTTypePropertyList as String, options: nil) { (result, error) in provider.loadItem(forTypeIdentifier: UTType.propertyList.identifier, options: nil) { (result, error) in
guard let result = result as? [String: Any], guard let result = result as? [String: Any],
let jsResult = result[NSExtensionJavaScriptPreprocessingResultsKey] as? [String: Any], let jsResult = result[NSExtensionJavaScriptPreprocessingResultsKey] as? [String: Any],
let urlString = jsResult["activityPubURL"] as? String ?? jsResult["url"] as? String, let urlString = jsResult["activityPubURL"] as? String ?? jsResult["url"] as? String,
@ -56,10 +57,10 @@ class ActionViewController: UIViewController {
private func findURLItem(completion: @escaping (URLComponents?) -> Void) { private func findURLItem(completion: @escaping (URLComponents?) -> Void) {
for item in extensionContext!.inputItems as! [NSExtensionItem] { for item in extensionContext!.inputItems as! [NSExtensionItem] {
for provider in item.attachments! { for provider in item.attachments! {
guard provider.hasItemConformingToTypeIdentifier(kUTTypeURL as String) else { guard provider.hasItemConformingToTypeIdentifier(UTType.url.identifier) else {
continue continue
} }
provider.loadItem(forTypeIdentifier: kUTTypeURL as String, options: nil) { (result, error) in provider.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil) { (result, error) in
guard let result = result as? URL, guard let result = result as? URL,
let components = URLComponents(url: result, resolvingAgainstBaseURL: false) else { let components = URLComponents(url: result, resolvingAgainstBaseURL: false) else {
completion(nil) completion(nil)

9
Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentRowController.swift
View File

@ -177,11 +177,19 @@ class AttachmentRowController: ViewController {
Text(error.localizedDescription) Text(error.localizedDescription)
} }
.onAppear(perform: controller.updateAttachmentDescriptionState) .onAppear(perform: controller.updateAttachmentDescriptionState)
#if os(visionOS)
.onChange(of: textEditorFocused) {
if !textEditorFocused && controller.focusAttachmentOnTextEditorUnfocus {
controller.focusAttachment()
}
}
#else
.onChange(of: textEditorFocused) { newValue in .onChange(of: textEditorFocused) { newValue in
if !newValue && controller.focusAttachmentOnTextEditorUnfocus { if !newValue && controller.focusAttachmentOnTextEditorUnfocus {
controller.focusAttachment() controller.focusAttachment()
} }
} }
#endif
} }
@ViewBuilder @ViewBuilder
@ -208,6 +216,7 @@ extension AttachmentRowController {
private extension View { private extension View {
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
@available(visionOS 1.0, *)
@ViewBuilder @ViewBuilder
func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder previewIfAvailable preview: () -> P) -> some View { func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder previewIfAvailable preview: () -> P) -> some View {
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {

8
Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentThumbnailController.swift
View File

@ -40,9 +40,13 @@ class AttachmentThumbnailController: ViewController {
case .video, .gifv: case .video, .gifv:
let asset = AVURLAsset(url: url) let asset = AVURLAsset(url: url)
let imageGenerator = AVAssetImageGenerator(asset: asset) let imageGenerator = AVAssetImageGenerator(asset: asset)
#if os(visionOS)
#warning("Use async AVAssetImageGenerator.image(at:)")
#else
if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) { if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) {
self.image = UIImage(cgImage: cgImage) self.image = UIImage(cgImage: cgImage)
} }
#endif
case .audio, .unknown: case .audio, .unknown:
break break
@ -87,9 +91,13 @@ class AttachmentThumbnailController: ViewController {
if type.conforms(to: .movie) { if type.conforms(to: .movie) {
let asset = AVURLAsset(url: url) let asset = AVURLAsset(url: url)
let imageGenerator = AVAssetImageGenerator(asset: asset) let imageGenerator = AVAssetImageGenerator(asset: asset)
#if os(visionOS)
#warning("Use async AVAssetImageGenerator.image(at:)")
#else
if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) { if let cgImage = try? imageGenerator.copyCGImage(at: .zero, actualTime: nil) {
self.image = UIImage(cgImage: cgImage) self.image = UIImage(cgImage: cgImage)
} }
#endif
} else if let data = try? Data(contentsOf: url) { } else if let data = try? Data(contentsOf: url) {
if type == .gif { if type == .gif {
self.gifController = GIFController(gifData: data) self.gifController = GIFController(gifData: data)

8
Packages/ComposeUI/Sources/ComposeUI/Controllers/ComposeController.swift
View File

@ -270,7 +270,9 @@ public final class ComposeController: ViewController {
@OptionalObservedObject var poster: PostService? @OptionalObservedObject var poster: PostService?
@EnvironmentObject var controller: ComposeController @EnvironmentObject var controller: ComposeController
@EnvironmentObject var draft: Draft @EnvironmentObject var draft: Draft
#if !os(visionOS)
@StateObject private var keyboardReader = KeyboardReader() @StateObject private var keyboardReader = KeyboardReader()
#endif
@State private var globalFrameOutsideList = CGRect.zero @State private var globalFrameOutsideList = CGRect.zero
init(poster: PostService?) { init(poster: PostService?) {
@ -315,8 +317,10 @@ public final class ComposeController: ViewController {
ControllerView(controller: { controller.toolbarController }) ControllerView(controller: { controller.toolbarController })
} }
#if !os(visionOS)
// on iPadOS15, the toolbar ends up below the keyboard's toolbar without this // on iPadOS15, the toolbar ends up below the keyboard's toolbar without this
.padding(.bottom, keyboardInset) .padding(.bottom, keyboardInset)
#endif
.transition(.move(edge: .bottom)) .transition(.move(edge: .bottom))
} }
} }
@ -414,7 +418,9 @@ public final class ComposeController: ViewController {
.listRowBackground(config.backgroundColor) .listRowBackground(config.backgroundColor)
} }
.listStyle(.plain) .listStyle(.plain)
#if !os(visionOS)
.scrollDismissesKeyboardInteractivelyIfAvailable() .scrollDismissesKeyboardInteractivelyIfAvailable()
#endif
.disabled(controller.isPosting) .disabled(controller.isPosting)
} }
@ -457,6 +463,7 @@ public final class ComposeController: ViewController {
} }
} }
#if !os(visionOS)
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
private var keyboardInset: CGFloat { private var keyboardInset: CGFloat {
if #unavailable(iOS 16.0), if #unavailable(iOS 16.0),
@ -467,6 +474,7 @@ public final class ComposeController: ViewController {
return 0 return 0
} }
} }
#endif
} }
} }

6
Packages/ComposeUI/Sources/ComposeUI/Controllers/PollController.swift
View File

@ -123,9 +123,15 @@ class PollController: ViewController {
RoundedRectangle(cornerRadius: 10, style: .continuous) RoundedRectangle(cornerRadius: 10, style: .continuous)
.foregroundColor(backgroundColor) .foregroundColor(backgroundColor)
) )
#if os(visionOS)
.onChange(of: controller.duration) {
poll.duration = controller.duration.timeInterval
}
#else
.onChange(of: controller.duration) { newValue in .onChange(of: controller.duration) { newValue in
poll.duration = newValue.timeInterval poll.duration = newValue.timeInterval
} }
#endif
} }
private var backgroundColor: Color { private var backgroundColor: Color {

4
Packages/ComposeUI/Sources/ComposeUI/KeyboardReader.swift
View File

@ -5,6 +5,8 @@
// Created by Shadowfacts on 3/7/23. // Created by Shadowfacts on 3/7/23.
// //
#if !os(visionOS)
import UIKit import UIKit
import Combine import Combine
@ -37,3 +39,5 @@ class KeyboardReader: ObservableObject {
} }
} }
} }
#endif

2
Packages/ComposeUI/Sources/ComposeUI/PKDrawing+Render.swift
View File

@ -11,7 +11,7 @@ import PencilKit
extension PKDrawing { extension PKDrawing {
func imageInLightMode(from rect: CGRect, scale: CGFloat = UIScreen.main.scale) -> UIImage { func imageInLightMode(from rect: CGRect, scale: CGFloat = 1) -> UIImage {
let lightTraitCollection = UITraitCollection(userInterfaceStyle: .light) let lightTraitCollection = UITraitCollection(userInterfaceStyle: .light)
var drawingImage: UIImage! var drawingImage: UIImage!
lightTraitCollection.performAsCurrent { lightTraitCollection.performAsCurrent {

6
Packages/ComposeUI/Sources/ComposeUI/View+ForwardsCompat.swift
View File

@ -8,6 +8,11 @@
import SwiftUI import SwiftUI
extension View { extension View {
#if os(visionOS)
func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
self.scrollDisabled(disabled)
}
#else
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
@ViewBuilder @ViewBuilder
func scrollDisabledIfAvailable(_ disabled: Bool) -> some View { func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
@ -17,4 +22,5 @@ extension View {
self self
} }
} }
#endif
} }

24
Packages/ComposeUI/Sources/ComposeUI/Views/LanguagePicker.swift
View File

@ -124,7 +124,9 @@ private struct LanguagePickerList: View {
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(groupedBackgroundColor.edgesIgnoringSafeArea(.all)) .background(groupedBackgroundColor.edgesIgnoringSafeArea(.all))
.searchable(text: $query) .searchable(text: $query)
#if !os(visionOS)
.scrollDismissesKeyboard(.interactively) .scrollDismissesKeyboard(.interactively)
#endif
.navigationTitle("Post Language") .navigationTitle("Post Language")
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.toolbar { .toolbar {
@ -145,13 +147,23 @@ private struct LanguagePickerList: View {
.map { Lang(code: $0) } .map { Lang(code: $0) }
.sorted { $0.name < $1.name } .sorted { $0.name < $1.name }
} }
#if os(visionOS)
.onChange(of: query, initial: true) {
filteredLangsChanged(query: query)
}
#else
.onChange(of: query) { newValue in .onChange(of: query) { newValue in
if newValue.isEmpty { filteredLangsChanged(query: newValue)
filteredLangs = nil }
} else { #endif
filteredLangs = langs.filter { }
$0.name.localizedCaseInsensitiveContains(newValue) || $0.code.identifier.localizedCaseInsensitiveContains(newValue)
} private func filteredLangsChanged(query: String) {
if query.isEmpty {
filteredLangs = nil
} else {
filteredLangs = langs.filter {
$0.name.localizedCaseInsensitiveContains(query) || $0.code.identifier.localizedCaseInsensitiveContains(query)
} }
} }
} }

2
Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift
View File

@ -62,7 +62,9 @@ public class DuckableContainerViewController: UIViewController {
guard case .idle = state else { guard case .idle = state else {
if animated, if animated,
case .ducked(_, placeholder: let placeholder) = state { case .ducked(_, placeholder: let placeholder) = state {
#if !os(visionOS)
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
#endif
let origConstant = placeholder.topConstraint.constant let origConstant = placeholder.topConstraint.constant
UIView.animateKeyframes(withDuration: 0.4, delay: 0) { UIView.animateKeyframes(withDuration: 0.4, delay: 0) {
UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.5) { UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.5) {

4
ShareExtension/ShareHostingController.swift
View File

@ -19,7 +19,11 @@ class ShareHostingController: UIHostingController<ShareHostingController.View> {
let image = UIImage(data: data) else { let image = UIImage(data: data) else {
return nil return nil
} }
#if os(visionOS)
let size: CGFloat = 50 * 2
#else
let size = 50 * UIScreen.main.scale let size = 50 * UIScreen.main.scale
#endif
return await image.byPreparingThumbnail(ofSize: CGSize(width: size, height: size)) ?? image return await image.byPreparingThumbnail(ofSize: CGSize(width: size, height: size)) ?? image
} }

44
Tusker.xcodeproj/project.pbxproj
View File

@ -85,7 +85,6 @@
D625E4822588262A0074BB2B /* DraggableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */; }; D625E4822588262A0074BB2B /* DraggableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */; };
D6262C9A28D01C4B00390C1F /* LoadingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */; }; D6262C9A28D01C4B00390C1F /* LoadingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */; };
D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943123A5466600D38C68 /* SelectableTableViewCell.swift */; }; D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943123A5466600D38C68 /* SelectableTableViewCell.swift */; };
D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */; };
D627944D23A9A03D00D38C68 /* ListTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */; }; D627944D23A9A03D00D38C68 /* ListTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */; };
D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */; }; D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */; };
D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */; }; D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */; };
@ -102,7 +101,7 @@
D635237129B78A7D009ED5E7 /* TuskerComponents in Frameworks */ = {isa = PBXBuildFile; productRef = D635237029B78A7D009ED5E7 /* TuskerComponents */; }; D635237129B78A7D009ED5E7 /* TuskerComponents in Frameworks */ = {isa = PBXBuildFile; productRef = D635237029B78A7D009ED5E7 /* TuskerComponents */; };
D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63661BF2381C144004B9E16 /* PreferencesNavigationController.swift */; }; D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63661BF2381C144004B9E16 /* PreferencesNavigationController.swift */; };
D6370B9C24421FF30092A7FF /* Tusker.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D6370B9A24421FF30092A7FF /* Tusker.xcdatamodeld */; }; D6370B9C24421FF30092A7FF /* Tusker.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D6370B9A24421FF30092A7FF /* Tusker.xcdatamodeld */; };
D63CC702290EC0B8000E19DE /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = D63CC701290EC0B8000E19DE /* Sentry */; }; D63CC702290EC0B8000E19DE /* Sentry in Frameworks */ = {isa = PBXBuildFile; platformFilters = (ios, maccatalyst, ); productRef = D63CC701290EC0B8000E19DE /* Sentry */; };
D63CC70C2910AADB000E19DE /* TuskerSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC70B2910AADB000E19DE /* TuskerSceneDelegate.swift */; }; D63CC70C2910AADB000E19DE /* TuskerSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC70B2910AADB000E19DE /* TuskerSceneDelegate.swift */; };
D63CC7102911F1E4000E19DE /* UIScrollView+Top.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC70F2911F1E4000E19DE /* UIScrollView+Top.swift */; }; D63CC7102911F1E4000E19DE /* UIScrollView+Top.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC70F2911F1E4000E19DE /* UIScrollView+Top.swift */; };
D63CC7122911F57C000E19DE /* StatusBarTappableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC7112911F57C000E19DE /* StatusBarTappableViewController.swift */; }; D63CC7122911F57C000E19DE /* StatusBarTappableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63CC7112911F57C000E19DE /* StatusBarTappableViewController.swift */; };
@ -134,7 +133,7 @@
D6531DEE246B81C9000F9538 /* GifvAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DED246B81C9000F9538 /* GifvAttachmentView.swift */; }; D6531DEE246B81C9000F9538 /* GifvAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DED246B81C9000F9538 /* GifvAttachmentView.swift */; };
D6531DF0246B867E000F9538 /* GifvAttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DEF246B867E000F9538 /* GifvAttachmentViewController.swift */; }; D6531DF0246B867E000F9538 /* GifvAttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DEF246B867E000F9538 /* GifvAttachmentViewController.swift */; };
D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */; }; D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */; };
D6552367289870790048A653 /* ScreenCorners in Frameworks */ = {isa = PBXBuildFile; productRef = D6552366289870790048A653 /* ScreenCorners */; }; D6552367289870790048A653 /* ScreenCorners in Frameworks */ = {isa = PBXBuildFile; platformFilters = (ios, maccatalyst, ); productRef = D6552366289870790048A653 /* ScreenCorners */; };
D659F35E2953A212002D944A /* TTTKit in Frameworks */ = {isa = PBXBuildFile; productRef = D659F35D2953A212002D944A /* TTTKit */; }; D659F35E2953A212002D944A /* TTTKit in Frameworks */ = {isa = PBXBuildFile; productRef = D659F35D2953A212002D944A /* TTTKit */; };
D659F36229541065002D944A /* TTTView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D659F36129541065002D944A /* TTTView.swift */; }; D659F36229541065002D944A /* TTTView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D659F36129541065002D944A /* TTTView.swift */; };
D65B4B542971F71D00DABDFB /* EditedReport.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B532971F71D00DABDFB /* EditedReport.swift */; }; D65B4B542971F71D00DABDFB /* EditedReport.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65B4B532971F71D00DABDFB /* EditedReport.swift */; };
@ -159,7 +158,6 @@
D66A77BB233838DC0058F1EC /* UIFont+Traits.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */; }; D66A77BB233838DC0058F1EC /* UIFont+Traits.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */; };
D66C900B28DAB7FD00217BF2 /* TimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */; }; D66C900B28DAB7FD00217BF2 /* TimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */; };
D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */ = {isa = PBXBuildFile; productRef = D674A50827F9128D00BA03AC /* Pachyderm */; }; D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */ = {isa = PBXBuildFile; productRef = D674A50827F9128D00BA03AC /* Pachyderm */; };
D67895BC24671E6D00D4CD9E /* PKDrawing+Render.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67895BB24671E6D00D4CD9E /* PKDrawing+Render.swift */; };
D67895C0246870DE00D4CD9E /* LocalAccountAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67895BF246870DE00D4CD9E /* LocalAccountAvatarView.swift */; }; D67895C0246870DE00D4CD9E /* LocalAccountAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67895BF246870DE00D4CD9E /* LocalAccountAvatarView.swift */; };
D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67B506C250B291200FAECFB /* BlurHashDecode.swift */; }; D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67B506C250B291200FAECFB /* BlurHashDecode.swift */; };
D67C1795266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */; }; D67C1795266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */; };
@ -265,7 +263,7 @@
D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */; }; D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */; };
D6BD395929B64426005FFD2B /* ComposeUI in Frameworks */ = {isa = PBXBuildFile; productRef = D6BD395829B64426005FFD2B /* ComposeUI */; }; D6BD395929B64426005FFD2B /* ComposeUI in Frameworks */ = {isa = PBXBuildFile; productRef = D6BD395829B64426005FFD2B /* ComposeUI */; };
D6BD395B29B64441005FFD2B /* ComposeHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BD395A29B64441005FFD2B /* ComposeHostingController.swift */; }; D6BD395B29B64441005FFD2B /* ComposeHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BD395A29B64441005FFD2B /* ComposeHostingController.swift */; };
D6BEA245291A0EDE002F4D01 /* Duckable in Frameworks */ = {isa = PBXBuildFile; productRef = D6BEA244291A0EDE002F4D01 /* Duckable */; }; D6BEA245291A0EDE002F4D01 /* Duckable in Frameworks */ = {isa = PBXBuildFile; platformFilters = (ios, maccatalyst, ); productRef = D6BEA244291A0EDE002F4D01 /* Duckable */; };
D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BEA246291A0F2D002F4D01 /* Duckable+Root.swift */; }; D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BEA246291A0F2D002F4D01 /* Duckable+Root.swift */; };
D6C1B2082545D1EC00DAAA66 /* StatusCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C1B2072545D1EC00DAAA66 /* StatusCardView.swift */; }; D6C1B2082545D1EC00DAAA66 /* StatusCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C1B2072545D1EC00DAAA66 /* StatusCardView.swift */; };
D6C3F4F5298ED0890009FCFF /* LocalPredicateStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F4298ED0890009FCFF /* LocalPredicateStatusesViewController.swift */; }; D6C3F4F5298ED0890009FCFF /* LocalPredicateStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F4298ED0890009FCFF /* LocalPredicateStatusesViewController.swift */; };
@ -324,7 +322,7 @@
D6E343AB265AAD6B00C4AA01 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AA265AAD6B00C4AA01 /* Media.xcassets */; }; D6E343AB265AAD6B00C4AA01 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AA265AAD6B00C4AA01 /* Media.xcassets */; };
D6E343AD265AAD6B00C4AA01 /* ActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E343AC265AAD6B00C4AA01 /* ActionViewController.swift */; }; D6E343AD265AAD6B00C4AA01 /* ActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E343AC265AAD6B00C4AA01 /* ActionViewController.swift */; };
D6E343B0265AAD6B00C4AA01 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AE265AAD6B00C4AA01 /* MainInterface.storyboard */; }; D6E343B0265AAD6B00C4AA01 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6E343AE265AAD6B00C4AA01 /* MainInterface.storyboard */; };
D6E343B4265AAD6B00C4AA01 /* OpenInTusker.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D6E343A8265AAD6B00C4AA01 /* OpenInTusker.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; D6E343B4265AAD6B00C4AA01 /* OpenInTusker.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D6E343A8265AAD6B00C4AA01 /* OpenInTusker.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
D6E343BA265AAD8C00C4AA01 /* Action.js in Resources */ = {isa = PBXBuildFile; fileRef = D6E343B9265AAD8C00C4AA01 /* Action.js */; }; D6E343BA265AAD8C00C4AA01 /* Action.js in Resources */ = {isa = PBXBuildFile; fileRef = D6E343B9265AAD8C00C4AA01 /* Action.js */; };
D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */; }; D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */; };
D6E426AD25334DA500C02E1C /* FuzzyMatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */; }; D6E426AD25334DA500C02E1C /* FuzzyMatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */; };
@ -487,7 +485,6 @@
D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraggableTableViewCell.swift; sourceTree = "<group>"; }; D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraggableTableViewCell.swift; sourceTree = "<group>"; };
D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingTableViewCell.swift; sourceTree = "<group>"; }; D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingTableViewCell.swift; sourceTree = "<group>"; };
D627943123A5466600D38C68 /* SelectableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableTableViewCell.swift; sourceTree = "<group>"; }; D627943123A5466600D38C68 /* SelectableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableTableViewCell.swift; sourceTree = "<group>"; };
D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BasicTableViewCell.xib; sourceTree = "<group>"; };
D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTimelineViewController.swift; sourceTree = "<group>"; }; D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTimelineViewController.swift; sourceTree = "<group>"; };
D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditListAccountsViewController.swift; sourceTree = "<group>"; }; D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditListAccountsViewController.swift; sourceTree = "<group>"; };
D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LargeImageViewController.xib; sourceTree = "<group>"; }; D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LargeImageViewController.xib; sourceTree = "<group>"; };
@ -562,7 +559,6 @@
D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewController.swift; sourceTree = "<group>"; }; D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewController.swift; sourceTree = "<group>"; };
D671A6BE299DA96100A81FEA /* Tusker-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tusker-Bridging-Header.h"; sourceTree = "<group>"; }; D671A6BE299DA96100A81FEA /* Tusker-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tusker-Bridging-Header.h"; sourceTree = "<group>"; };
D674A50727F910F300BA03AC /* Pachyderm */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Pachyderm; path = Packages/Pachyderm; sourceTree = "<group>"; }; D674A50727F910F300BA03AC /* Pachyderm */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Pachyderm; path = Packages/Pachyderm; sourceTree = "<group>"; };
D67895BB24671E6D00D4CD9E /* PKDrawing+Render.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PKDrawing+Render.swift"; sourceTree = "<group>"; };
D67895BF246870DE00D4CD9E /* LocalAccountAvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAccountAvatarView.swift; sourceTree = "<group>"; }; D67895BF246870DE00D4CD9E /* LocalAccountAvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAccountAvatarView.swift; sourceTree = "<group>"; };
D67B506C250B291200FAECFB /* BlurHashDecode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = "<group>"; }; D67B506C250B291200FAECFB /* BlurHashDecode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = "<group>"; };
D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FastAccountSwitcherIndicatorView.swift; sourceTree = "<group>"; }; D67C1794266D57D10070F250 /* FastAccountSwitcherIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FastAccountSwitcherIndicatorView.swift; sourceTree = "<group>"; };
@ -1242,7 +1238,6 @@
D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */, D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */,
D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */, D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */,
D6969E9D240C81B9002843CE /* NSTextAttachment+Emoji.swift */, D6969E9D240C81B9002843CE /* NSTextAttachment+Emoji.swift */,
D67895BB24671E6D00D4CD9E /* PKDrawing+Render.swift */,
D690797224A4EF9700023A34 /* UIBezierPath+Helpers.swift */, D690797224A4EF9700023A34 /* UIBezierPath+Helpers.swift */,
D6D3F4C324FDB6B700EC4A6A /* View+ConditionalModifier.swift */, D6D3F4C324FDB6B700EC4A6A /* View+ConditionalModifier.swift */,
D6620ACD2511A0ED00312CA0 /* StatusStateResolver.swift */, D6620ACD2511A0ED00312CA0 /* StatusStateResolver.swift */,
@ -1402,7 +1397,6 @@
D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */, D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */,
D6D79F522A0FFE3200AB2315 /* ToggleableButton.swift */, D6D79F522A0FFE3200AB2315 /* ToggleableButton.swift */,
D686BBE224FBF8110068E6AA /* WrappedProgressView.swift */, D686BBE224FBF8110068E6AA /* WrappedProgressView.swift */,
D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */,
D6A3BC872321F78000FD64D5 /* Account Cell */, D6A3BC872321F78000FD64D5 /* Account Cell */,
D67C57A721E2649B00C3118B /* Account Detail */, D67C57A721E2649B00C3118B /* Account Detail */,
D6C7D27B22B6EBE200071952 /* Attachments */, D6C7D27B22B6EBE200071952 /* Attachments */,
@ -1868,7 +1862,6 @@
D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */, D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */,
D640D76922BAF5E6004FBE69 /* DomainBlocks.plist in Resources */, D640D76922BAF5E6004FBE69 /* DomainBlocks.plist in Resources */,
D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */, D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */,
D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */,
D601FA84297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib in Resources */, D601FA84297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib in Resources */,
D6F2E966249E8BFD005846BB /* IssueReporterViewController.xib in Resources */, D6F2E966249E8BFD005846BB /* IssueReporterViewController.xib in Resources */,
D6A4DCCD2553667800D9DE31 /* FastAccountSwitcherViewController.xib in Resources */, D6A4DCCD2553667800D9DE31 /* FastAccountSwitcherViewController.xib in Resources */,
@ -2210,7 +2203,6 @@
D68A76DA29511CA6001DA1B3 /* AccountPreferences.swift in Sources */, D68A76DA29511CA6001DA1B3 /* AccountPreferences.swift in Sources */,
D68015402401A6BA00D6103B /* ComposingPrefsView.swift in Sources */, D68015402401A6BA00D6103B /* ComposingPrefsView.swift in Sources */,
D6895DC428D65342006341DA /* ConfirmReblogStatusPreviewView.swift in Sources */, D6895DC428D65342006341DA /* ConfirmReblogStatusPreviewView.swift in Sources */,
D67895BC24671E6D00D4CD9E /* PKDrawing+Render.swift in Sources */,
D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */, D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */,
D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */, D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */,
04D14BB022B34A2800642648 /* GalleryViewController.swift in Sources */, 04D14BB022B34A2800642648 /* GalleryViewController.swift in Sources */,
@ -2307,7 +2299,6 @@
}; };
D6E343B3265AAD6B00C4AA01 /* PBXTargetDependency */ = { D6E343B3265AAD6B00C4AA01 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
platformFilter = ios;
target = D6E343A7265AAD6B00C4AA01 /* OpenInTusker */; target = D6E343A7265AAD6B00C4AA01 /* OpenInTusker */;
targetProxy = D6E343B2265AAD6B00C4AA01 /* PBXContainerItemProxy */; targetProxy = D6E343B2265AAD6B00C4AA01 /* PBXContainerItemProxy */;
}; };
@ -2429,10 +2420,11 @@
OTHER_CODE_SIGN_FLAGS = ""; OTHER_CODE_SIGN_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Tusker/Tusker-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Tusker/Tusker-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6"; TARGETED_DEVICE_FAMILY = "1,2,6,7";
}; };
name = Dist; name = Dist;
}; };
@ -2495,9 +2487,10 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6"; TARGETED_DEVICE_FAMILY = "1,2,6,7";
}; };
name = Dist; name = Dist;
}; };
@ -2522,10 +2515,11 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2,7";
}; };
name = Debug; name = Debug;
}; };
@ -2550,10 +2544,11 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2,7";
}; };
name = Release; name = Release;
}; };
@ -2578,10 +2573,11 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2,7";
}; };
name = Dist; name = Dist;
}; };
@ -2731,12 +2727,13 @@
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "Tusker/Tusker-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Tusker/Tusker-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6"; TARGETED_DEVICE_FAMILY = "1,2,6,7";
}; };
name = Debug; name = Debug;
}; };
@ -2761,10 +2758,11 @@
OTHER_CODE_SIGN_FLAGS = ""; OTHER_CODE_SIGN_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Tusker/Tusker-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Tusker/Tusker-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6"; TARGETED_DEVICE_FAMILY = "1,2,6,7";
}; };
name = Release; name = Release;
}; };
@ -2867,9 +2865,10 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6"; TARGETED_DEVICE_FAMILY = "1,2,6,7";
}; };
name = Debug; name = Debug;
}; };
@ -2892,9 +2891,10 @@
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6"; TARGETED_DEVICE_FAMILY = "1,2,6,7";
}; };
name = Release; name = Release;
}; };

4
Tusker/API/FavoriteService.swift
View File

@ -29,9 +29,11 @@ class FavoriteService {
status.favourited.toggle() status.favourited.toggle()
mastodonController.persistentContainer.statusSubject.send(status.id) mastodonController.persistentContainer.statusSubject.send(status.id)
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
} }
#endif
let request = (status.favourited ? Status.favourite : Status.unfavourite)(status.id) let request = (status.favourited ? Status.favourite : Status.unfavourite)(status.id)
do { do {
@ -49,9 +51,11 @@ class FavoriteService {
} }
presenter.showToast(configuration: config, animated: true) presenter.showToast(configuration: config, animated: true)
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
UINotificationFeedbackGenerator().notificationOccurred(.error) UINotificationFeedbackGenerator().notificationOccurred(.error)
} }
#endif
} }
} }

6
Tusker/API/MastodonController.swift
View File

@ -11,7 +11,9 @@ import Pachyderm
import Combine import Combine
import UserAccounts import UserAccounts
import InstanceFeatures import InstanceFeatures
#if canImport(Sentry)
import Sentry import Sentry
#endif
import ComposeUI import ComposeUI
private let oauthScopes = [Scope.read, .write, .follow] private let oauthScopes = [Scope.read, .write, .follow]
@ -96,6 +98,7 @@ class MastodonController: ObservableObject {
} }
.store(in: &cancellables) .store(in: &cancellables)
#if canImport(Sentry)
$instanceInfo $instanceInfo
.compactMap { $0 } .compactMap { $0 }
.removeDuplicates(by: { $0.version == $1.version }) .removeDuplicates(by: { $0.version == $1.version })
@ -104,6 +107,7 @@ class MastodonController: ObservableObject {
setInstanceBreadcrumb(instance: instance, nodeInfo: nodeInfo) setInstanceBreadcrumb(instance: instance, nodeInfo: nodeInfo)
} }
.store(in: &cancellables) .store(in: &cancellables)
#endif
$instance $instance
.compactMap { $0 } .compactMap { $0 }
@ -579,6 +583,7 @@ class MastodonController: ObservableObject {
} }
#if canImport(Sentry)
private func setInstanceBreadcrumb(instance: InstanceInfo, nodeInfo: NodeInfo?) { private func setInstanceBreadcrumb(instance: InstanceInfo, nodeInfo: NodeInfo?) {
let crumb = Breadcrumb(level: .info, category: "MastodonController") let crumb = Breadcrumb(level: .info, category: "MastodonController")
crumb.data = [ crumb.data = [
@ -594,3 +599,4 @@ private func setInstanceBreadcrumb(instance: InstanceInfo, nodeInfo: NodeInfo?)
} }
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
} }
#endif

4
Tusker/API/ReblogService.swift
View File

@ -80,9 +80,11 @@ class ReblogService {
status.reblogged.toggle() status.reblogged.toggle()
mastodonController.persistentContainer.statusSubject.send(status.id) mastodonController.persistentContainer.statusSubject.send(status.id)
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
} }
#endif
let request: Request<Status> let request: Request<Status>
if status.reblogged { if status.reblogged {
@ -104,9 +106,11 @@ class ReblogService {
} }
presenter.showToast(configuration: config, animated: true) presenter.showToast(configuration: config, animated: true)
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
UINotificationFeedbackGenerator().notificationOccurred(.error) UINotificationFeedbackGenerator().notificationOccurred(.error)
} }
#endif
} }
} }

15
Tusker/AppDelegate.swift
View File

@ -9,7 +9,9 @@
import UIKit import UIKit
import CoreData import CoreData
import OSLog import OSLog
#if canImport(Sentry)
import Sentry import Sentry
#endif
import UserAccounts import UserAccounts
import ComposeUI import ComposeUI
import TuskerPreferences import TuskerPreferences
@ -23,9 +25,13 @@ private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category:
class AppDelegate: UIResponder, UIApplicationDelegate { class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
#if canImport(Sentry)
configureSentry() configureSentry()
#endif
#if !os(visionOS)
swizzleStatusBar() swizzleStatusBar()
swizzlePresentationController() swizzlePresentationController()
#endif
AppShortcutItem.createItems(for: application) AppShortcutItem.createItems(for: application)
@ -56,7 +62,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
let oldPreferencesFile = documentsDirectory.appendingPathComponent("preferences").appendingPathExtension("plist") let oldPreferencesFile = documentsDirectory.appendingPathComponent("preferences").appendingPathExtension("plist")
if FileManager.default.fileExists(atPath: oldPreferencesFile.path) { if FileManager.default.fileExists(atPath: oldPreferencesFile.path) {
if case .failure(let error) = Preferences.migrate(from: oldPreferencesFile) { if case .failure(let error) = Preferences.migrate(from: oldPreferencesFile) {
#if canImport(Sentry)
SentrySDK.capture(error: error) SentrySDK.capture(error: error)
#endif
} }
} }
@ -70,7 +78,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
for url in [oldDraftsFile, appGroupDraftsFile] where FileManager.default.fileExists(atPath: url.path) { for url in [oldDraftsFile, appGroupDraftsFile] where FileManager.default.fileExists(atPath: url.path) {
DraftsPersistentContainer.shared.migrate(from: url) { DraftsPersistentContainer.shared.migrate(from: url) {
if case .failure(let error) = $0 { if case .failure(let error) = $0 {
#if canImport(Sentry)
SentrySDK.capture(error: error) SentrySDK.capture(error: error)
#endif
} }
} }
} }
@ -81,6 +91,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true return true
} }
#if canImport(Sentry)
private func configureSentry() { private func configureSentry() {
guard let dsn = Bundle.main.object(forInfoDictionaryKey: "SentryDSN") as? String, guard let dsn = Bundle.main.object(forInfoDictionaryKey: "SentryDSN") as? String,
!dsn.isEmpty else { !dsn.isEmpty else {
@ -120,9 +131,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
logger.info("Initialized Sentry with installation/user ID: \(id, privacy: .public)") logger.info("Initialized Sentry with installation/user ID: \(id, privacy: .public)")
} }
} }
#endif
override func buildMenu(with builder: UIMenuBuilder) { override func buildMenu(with builder: UIMenuBuilder) {
if builder.system == .main { if builder.system == .main {
MenuController.buildMainMenu(builder: builder) MenuController.buildMainMenu(builder: builder)
} }
@ -169,6 +180,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
UIApplication.shared.requestSceneSessionDestruction(scene.session, options: nil) UIApplication.shared.requestSceneSessionDestruction(scene.session, options: nil)
} }
#if !os(visionOS)
private func swizzleStatusBar() { private func swizzleStatusBar() {
let selector = Selector(("handleTapAction:")) let selector = Selector(("handleTapAction:"))
var originalIMP: IMP? var originalIMP: IMP?
@ -220,5 +232,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
Logging.general.error("Unable to swizzle presentation controller") Logging.general.error("Unable to swizzle presentation controller")
} }
} }
#endif
} }

8
Tusker/Caching/ImageCache.swift
View File

@ -8,6 +8,12 @@
import UIKit import UIKit
#if os(visionOS)
private let imageScale: CGFloat = 2
#else
private let imageScale = UIScreen.main.scale
#endif
class ImageCache { class ImageCache {
static let avatars = ImageCache(name: "Avatars", memoryExpiry: .seconds(60 * 60), diskExpiry: .seconds(60 * 60 * 24 * 7), desiredSize: CGSize(width: 50, height: 50)) static let avatars = ImageCache(name: "Avatars", memoryExpiry: .seconds(60 * 60), diskExpiry: .seconds(60 * 60 * 24 * 7), desiredSize: CGSize(width: 50, height: 50))
@ -26,7 +32,7 @@ class ImageCache {
init(name: String, memoryExpiry: CacheExpiry, diskExpiry: CacheExpiry? = nil, desiredSize: CGSize? = nil) { init(name: String, memoryExpiry: CacheExpiry, diskExpiry: CacheExpiry? = nil, desiredSize: CGSize? = nil) {
// todo: might not always want to use UIScreen.main for this, e.g. Catalyst? // todo: might not always want to use UIScreen.main for this, e.g. Catalyst?
let pixelSize = desiredSize?.applying(.init(scaleX: UIScreen.main.scale, y: UIScreen.main.scale)) let pixelSize = desiredSize?.applying(.init(scaleX: imageScale, y: imageScale))
self.desiredPixelSize = pixelSize self.desiredPixelSize = pixelSize
self.cache = ImageDataCache(name: name, memoryExpiry: memoryExpiry, diskExpiry: diskExpiry, storeOriginalDataInMemory: diskExpiry == nil, desiredPixelSize: pixelSize) self.cache = ImageDataCache(name: name, memoryExpiry: memoryExpiry, diskExpiry: diskExpiry, storeOriginalDataInMemory: diskExpiry == nil, desiredPixelSize: pixelSize)
} }

4
Tusker/CoreData/MastodonCachePersistentStore.swift
View File

@ -11,7 +11,9 @@ import CoreData
import Pachyderm import Pachyderm
import Combine import Combine
import OSLog import OSLog
#if canImport(Sentry)
import Sentry import Sentry
#endif
import CloudKit import CloudKit
import UserAccounts import UserAccounts
@ -199,6 +201,7 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
try context.save() try context.save()
} catch let error as NSError { } catch let error as NSError {
logger.error("Unable to save managed object context: \(String(describing: error), privacy: .public)") logger.error("Unable to save managed object context: \(String(describing: error), privacy: .public)")
#if canImport(Sentry)
let crumb = Breadcrumb(level: .fatal, category: "PersistentStore") let crumb = Breadcrumb(level: .fatal, category: "PersistentStore")
// note: NSDetailedErrorsKey == "NSDetailedErrorsKey" != "NSDetailedErrors" // note: NSDetailedErrorsKey == "NSDetailedErrorsKey" != "NSDetailedErrors"
if let detailed = error.userInfo["NSDetailedErrors"] as? [NSError] { if let detailed = error.userInfo["NSDetailedErrors"] as? [NSError] {
@ -217,6 +220,7 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
] ]
} }
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
fatalError("Unable to save managed object context: \(String(describing: error))") fatalError("Unable to save managed object context: \(String(describing: error))")
} }
} }

1
Tusker/CoreData/TimelinePosition.swift
View File

@ -86,6 +86,7 @@ func fromTimelineKind(_ kind: String) -> Timeline {
// replace with Collection.trimmingPrefix // replace with Collection.trimmingPrefix
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
@available(visionOS 1.0, *)
private func trimmingPrefix(_ prefix: String, of str: String) -> Substring { private func trimmingPrefix(_ prefix: String, of str: String) -> Substring {
return str[str.index(str.startIndex, offsetBy: prefix.count)...] return str[str.index(str.startIndex, offsetBy: prefix.count)...]
} }

33
Tusker/Extensions/PKDrawing+Render.swift
View File

@ -1,33 +0,0 @@
//
// PKDrawing+Render.swift
// Tusker
//
// Created by Shadowfacts on 5/9/20.
// Copyright © 2020 Shadowfacts. All rights reserved.
//
import UIKit
import PencilKit
extension PKDrawing {
func imageInLightMode(from rect: CGRect, scale: CGFloat = UIScreen.main.scale) -> UIImage {
let lightTraitCollection = UITraitCollection(userInterfaceStyle: .light)
var drawingImage: UIImage!
lightTraitCollection.performAsCurrent {
drawingImage = self.image(from: rect, scale: scale)
}
let imageRect = CGRect(origin: .zero, size: rect.size)
let format = UIGraphicsImageRendererFormat()
format.opaque = false
format.scale = scale
let renderer = UIGraphicsImageRenderer(size: rect.size, format: format)
return renderer.image { (context) in
UIColor.white.setFill()
context.fill(imageRect)
drawingImage.draw(in: imageRect)
}
}
}

15
Tusker/MultiThreadDictionary.swift
View File

@ -12,15 +12,22 @@ import os
// once we target iOS 16, replace uses of this with OSAllocatedUnfairLock<[Key: Value]> // once we target iOS 16, replace uses of this with OSAllocatedUnfairLock<[Key: Value]>
// to make the lock semantics more clear // to make the lock semantics more clear
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
@available(visionOS 1.0, *)
class MultiThreadDictionary<Key: Hashable & Sendable, Value: Sendable> { class MultiThreadDictionary<Key: Hashable & Sendable, Value: Sendable> {
#if os(visionOS)
private let lock = OSAllocatedUnfairLock(initialState: [Key: Value]())
#else
private let lock: any Lock<[Key: Value]> private let lock: any Lock<[Key: Value]>
#endif
init() { init() {
#if !os(visionOS)
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {
self.lock = OSAllocatedUnfairLock(initialState: [:]) self.lock = OSAllocatedUnfairLock(initialState: [:])
} else { } else {
self.lock = UnfairLock(initialState: [:]) self.lock = UnfairLock(initialState: [:])
} }
#endif
} }
subscript(key: Key) -> Value? { subscript(key: Key) -> Value? {
@ -30,9 +37,15 @@ class MultiThreadDictionary<Key: Hashable & Sendable, Value: Sendable> {
} }
} }
set(value) { set(value) {
#if os(visionOS)
lock.withLock { dict in
dict[key] = value
}
#else
_ = lock.withLock { dict in _ = lock.withLock { dict in
dict[key] = value dict[key] = value
} }
#endif
} }
} }
@ -57,6 +70,7 @@ class MultiThreadDictionary<Key: Hashable & Sendable, Value: Sendable> {
} }
} }
#if !os(visionOS)
// TODO: replace this only with OSAllocatedUnfairLock // TODO: replace this only with OSAllocatedUnfairLock
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
fileprivate protocol Lock<State> { fileprivate protocol Lock<State> {
@ -87,3 +101,4 @@ fileprivate class UnfairLock<State>: Lock {
return try body(&state) return try body(&state)
} }
} }
#endif

14
Tusker/Preferences/Colors.swift
View File

@ -81,10 +81,12 @@ extension Color {
static let appFill = Color(uiColor: .appFill) static let appFill = Color(uiColor: .appFill)
} }
#if !os(visionOS)
@available(iOS, obsoleted: 17.0) @available(iOS, obsoleted: 17.0)
private let traitsKey: String = ["Traits", "Defined", "client", "_"].reversed().joined() private let traitsKey: String = ["Traits", "Defined", "client", "_"].reversed().joined()
@available(iOS, obsoleted: 17.0) @available(iOS, obsoleted: 17.0)
private let key = "tusker_usePureBlackDarkMode" private let key = "tusker_usePureBlackDarkMode"
#endif
@available(iOS 17.0, *) @available(iOS 17.0, *)
private struct PureBlackDarkModeTrait: UITraitDefinition { private struct PureBlackDarkModeTrait: UITraitDefinition {
@ -97,10 +99,15 @@ extension UITraitCollection {
if #available(iOS 17.0, *) { if #available(iOS 17.0, *) {
return self[PureBlackDarkModeTrait.self] return self[PureBlackDarkModeTrait.self]
} else { } else {
#if os(visionOS)
return true // unreachable
#else
return obsoletePureBlackDarkMode return obsoletePureBlackDarkMode
#endif
} }
} }
#if !os(visionOS)
@available(iOS, obsoleted: 17.0) @available(iOS, obsoleted: 17.0)
var obsoletePureBlackDarkMode: Bool { var obsoletePureBlackDarkMode: Bool {
get { get {
@ -113,13 +120,18 @@ extension UITraitCollection {
setValue(dict, forKey: traitsKey) setValue(dict, forKey: traitsKey)
} }
} }
#endif
convenience init(pureBlackDarkMode: Bool) { convenience init(pureBlackDarkMode: Bool) {
if #available(iOS 17.0, *) { if #available(iOS 17.0, visionOS 1.0, *) {
self.init(PureBlackDarkModeTrait.self, value: pureBlackDarkMode) self.init(PureBlackDarkModeTrait.self, value: pureBlackDarkMode)
} else { } else {
self.init() self.init()
#if os(visionOS)
// unreachable
#else
self.obsoletePureBlackDarkMode = pureBlackDarkMode self.obsoletePureBlackDarkMode = pureBlackDarkMode
#endif
} }
} }
} }

6
Tusker/Scenes/MainSceneDelegate.swift
View File

@ -10,7 +10,9 @@ import UIKit
import Pachyderm import Pachyderm
import MessageUI import MessageUI
import CoreData import CoreData
#if canImport(Duckable)
import Duckable import Duckable
#endif
import UserAccounts import UserAccounts
import ComposeUI import ComposeUI
@ -245,6 +247,9 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
mastodonController.initialize() mastodonController.initialize()
let split = MainSplitViewController(mastodonController: mastodonController) let split = MainSplitViewController(mastodonController: mastodonController)
#if !canImport(Duckable)
return split
#else
if UIDevice.current.userInterfaceIdiom == .phone, if UIDevice.current.userInterfaceIdiom == .phone,
#available(iOS 16.0, *) { #available(iOS 16.0, *) {
// TODO: maybe the duckable container should be outside the account switching container // TODO: maybe the duckable container should be outside the account switching container
@ -252,6 +257,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
} else { } else {
return split return split
} }
#endif
} }
func createOnboardingUI() -> UIViewController { func createOnboardingUI() -> UIViewController {

6
Tusker/Scenes/TuskerSceneDelegate.swift
View File

@ -7,7 +7,9 @@
// //
import UIKit import UIKit
#if !os(visionOS)
import Sentry import Sentry
#endif
protocol TuskerSceneDelegate: UISceneDelegate { protocol TuskerSceneDelegate: UISceneDelegate {
var window: UIWindow? { get } var window: UIWindow? { get }
@ -32,6 +34,9 @@ extension TuskerSceneDelegate {
guard let window else { return } guard let window else { return }
window.overrideUserInterfaceStyle = Preferences.shared.theme window.overrideUserInterfaceStyle = Preferences.shared.theme
window.tintColor = Preferences.shared.accentColor.color window.tintColor = Preferences.shared.accentColor.color
#if os(visionOS)
window.traitOverrides.pureBlackDarkMode = Preferences.shared.pureBlackDarkMode
#else
if #available(iOS 17.0, *) { if #available(iOS 17.0, *) {
window.traitOverrides.pureBlackDarkMode = Preferences.shared.pureBlackDarkMode window.traitOverrides.pureBlackDarkMode = Preferences.shared.pureBlackDarkMode
} else { } else {
@ -45,5 +50,6 @@ extension TuskerSceneDelegate {
SentrySDK.capture(exception: exception) SentrySDK.capture(exception: exception)
} }
} }
#endif
} }
} }

2
Tusker/Screens/Attachment Gallery/GalleryViewController.swift
View File

@ -45,7 +45,9 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
var isInteractivelyAnimatingDismissal: Bool = false { var isInteractivelyAnimatingDismissal: Bool = false {
didSet { didSet {
#if !os(visionOS)
setNeedsStatusBarAppearanceUpdate() setNeedsStatusBarAppearanceUpdate()
#endif
} }
} }

38
Tusker/Screens/Compose/ComposeHostingController.swift
View File

@ -14,13 +14,15 @@ import PhotosUI
import PencilKit import PencilKit
import Pachyderm import Pachyderm
import CoreData import CoreData
#if canImport(Duckable)
import Duckable import Duckable
#endif
protocol ComposeHostingControllerDelegate: AnyObject { protocol ComposeHostingControllerDelegate: AnyObject {
func dismissCompose(mode: DismissMode) -> Bool func dismissCompose(mode: DismissMode) -> Bool
} }
class ComposeHostingController: UIHostingController<ComposeHostingController.View>, DuckableViewController { class ComposeHostingController: UIHostingController<ComposeHostingController.View> {
weak var delegate: ComposeHostingControllerDelegate? weak var delegate: ComposeHostingControllerDelegate?
@ -141,8 +143,23 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
present(ComposeDrawingNavigationController(editing: drawing, delegate: self), animated: true) present(ComposeDrawingNavigationController(editing: drawing, delegate: self), animated: true)
} }
// MARK: Duckable struct View: SwiftUI.View {
let mastodonController: MastodonController
let controller: ComposeController
var body: some SwiftUI.View {
ControllerView(controller: { controller })
.task {
if let account = try? await mastodonController.getOwnAccount() {
controller.currentAccount = account
}
}
}
}
}
#if canImport(Duckable)
extension ComposeHostingController: DuckableViewController {
func duckableViewControllerShouldDuck() -> DuckAttemptAction { func duckableViewControllerShouldDuck() -> DuckAttemptAction {
if controller.isPosting { if controller.isPosting {
return .block return .block
@ -164,21 +181,8 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
func duckableViewControllerDidFinishAnimatingDuck() { func duckableViewControllerDidFinishAnimatingDuck() {
controller.showToolbar = true controller.showToolbar = true
} }
struct View: SwiftUI.View {
let mastodonController: MastodonController
let controller: ComposeController
var body: some SwiftUI.View {
ControllerView(controller: { controller })
.task {
if let account = try? await mastodonController.getOwnAccount() {
controller.currentAccount = account
}
}
}
}
} }
#endif
extension MastodonController: ComposeMastodonContext { extension MastodonController: ComposeMastodonContext {
@MainActor @MainActor

2
Tusker/Screens/Customize Timelines/AddHashtagPinnedTimelineView.swift
View File

@ -49,7 +49,9 @@ struct AddHashtagPinnedTimelineView: View {
var body: some View { var body: some View {
NavigationView { NavigationView {
list list
#if !os(visionOS)
.appGroupedListBackground(container: AddHashtagPinnedTimelineRepresentable.UIViewControllerType.self) .appGroupedListBackground(container: AddHashtagPinnedTimelineRepresentable.UIViewControllerType.self)
#endif
.listStyle(.grouped) .listStyle(.grouped)
.navigationTitle("Add Hashtag") .navigationTitle("Add Hashtag")
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)

11
Tusker/Screens/Customize Timelines/EditFilterView.swift
View File

@ -148,7 +148,9 @@ struct EditFilterView: View {
.appGroupedListRowBackground() .appGroupedListRowBackground()
} }
.appGroupedListBackground(container: UIHostingController<CustomizeTimelinesList>.self) .appGroupedListBackground(container: UIHostingController<CustomizeTimelinesList>.self)
#if !os(visionOS)
.scrollDismissesKeyboardInteractivelyIfAvailable() .scrollDismissesKeyboardInteractivelyIfAvailable()
#endif
.navigationTitle(create ? "Add Filter" : "Edit Filter") .navigationTitle(create ? "Add Filter" : "Edit Filter")
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.toolbar { .toolbar {
@ -169,12 +171,21 @@ struct EditFilterView: View {
}, message: { error in }, message: { error in
Text(error.localizedDescription) Text(error.localizedDescription)
}) })
#if os(visionOS)
.onChange(of: expiresIn) {
edited = true
if expires.wrappedValue {
filter.expiresIn = expiresIn
}
}
#else
.onChange(of: expiresIn, perform: { newValue in .onChange(of: expiresIn, perform: { newValue in
edited = true edited = true
if expires.wrappedValue { if expires.wrappedValue {
filter.expiresIn = newValue filter.expiresIn = newValue
} }
}) })
#endif
.onReceive(filter.objectWillChange, perform: { _ in .onReceive(filter.objectWillChange, perform: { _ in
edited = true edited = true
}) })

13
Tusker/Screens/Customize Timelines/PinnedTimelinesView.swift
View File

@ -111,6 +111,10 @@ struct PinnedTimelinesView: View {
Text("Pinned Timelines") Text("Pinned Timelines")
} }
.sheet(isPresented: $isShowingAddHashtagSheet, content: { .sheet(isPresented: $isShowingAddHashtagSheet, content: {
#if os(visionOS)
AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
.edgesIgnoringSafeArea(.bottom)
#else
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {
AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines) AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
.edgesIgnoringSafeArea(.bottom) .edgesIgnoringSafeArea(.bottom)
@ -118,6 +122,7 @@ struct PinnedTimelinesView: View {
AddHashtagPinnedTimelineRepresentable(pinnedTimelines: $pinnedTimelines) AddHashtagPinnedTimelineRepresentable(pinnedTimelines: $pinnedTimelines)
.edgesIgnoringSafeArea(.bottom) .edgesIgnoringSafeArea(.bottom)
} }
#endif
}) })
.sheet(isPresented: $isShowingAddInstanceSheet, content: { .sheet(isPresented: $isShowingAddInstanceSheet, content: {
AddInstancePinnedTimelineView(pinnedTimelines: $pinnedTimelines) AddInstancePinnedTimelineView(pinnedTimelines: $pinnedTimelines)
@ -128,11 +133,19 @@ struct PinnedTimelinesView: View {
pinnedTimelines = accountPreferences.pinnedTimelines pinnedTimelines = accountPreferences.pinnedTimelines
} }
} }
#if os(visionOS)
.onChange(of: pinnedTimelines) {
if accountPreferences.pinnedTimelines != pinnedTimelines {
accountPreferences.pinnedTimelines = pinnedTimelines
}
}
#else
.onChange(of: pinnedTimelines) { newValue in .onChange(of: pinnedTimelines) { newValue in
if accountPreferences.pinnedTimelines != newValue { if accountPreferences.pinnedTimelines != newValue {
accountPreferences.pinnedTimelines = newValue accountPreferences.pinnedTimelines = newValue
} }
} }
#endif
} }
} }

3
Tusker/Screens/Explore/FeaturedProfileCollectionViewCell.swift
View File

@ -108,10 +108,13 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
} }
} }
// Unneeded on visionOS because there is no light/dark mode
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
updateLayerColors() updateLayerColors()
} }
#endif
override func layoutSubviews() { override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()

5
Tusker/Screens/Explore/SuggestedProfileCardCollectionViewCell.swift
View File

@ -100,10 +100,13 @@ class SuggestedProfileCardCollectionViewCell: UICollectionViewCell {
displayNameLabel.updateForAccountDisplayName(account: account) displayNameLabel.updateForAccountDisplayName(account: account)
} }
// Unneeded on visionOS since there is no light/dark mode
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
updateLayerColors() updateLayerColors()
} }
#endif
private func updateLayerColors() { private func updateLayerColors() {
if traitCollection.userInterfaceStyle == .dark { if traitCollection.userInterfaceStyle == .dark {
@ -126,10 +129,12 @@ class SuggestedProfileCardCollectionViewCell: UICollectionViewCell {
if traitCollection.horizontalSizeClass == .compact || traitCollection.verticalSizeClass == .compact { if traitCollection.horizontalSizeClass == .compact || traitCollection.verticalSizeClass == .compact {
toPresent = UINavigationController(rootViewController: host) toPresent = UINavigationController(rootViewController: host)
toPresent.modalPresentationStyle = .pageSheet toPresent.modalPresentationStyle = .pageSheet
#if !os(visionOS)
let sheetPresentationController = toPresent.sheetPresentationController! let sheetPresentationController = toPresent.sheetPresentationController!
sheetPresentationController.detents = [ sheetPresentationController.detents = [
.medium() .medium()
] ]
#endif
} else { } else {
host.modalPresentationStyle = .popover host.modalPresentationStyle = .popover
let popoverPresentationController = host.popoverPresentationController! let popoverPresentationController = host.popoverPresentationController!

3
Tusker/Screens/Explore/TrendingLinkCardCollectionViewCell.swift
View File

@ -129,10 +129,13 @@ class TrendingLinkCardCollectionViewCell: UICollectionViewCell {
} }
} }
// Unneeded on visionOS because there is no light/dark mode
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
updateLayerColors() updateLayerColors()
} }
#endif
private func updateLayerColors() { private func updateLayerColors() {
if traitCollection.userInterfaceStyle == .dark { if traitCollection.userInterfaceStyle == .dark {

2
Tusker/Screens/Explore/TrendingLinksViewController.swift
View File

@ -279,7 +279,9 @@ extension TrendingLinksViewController: UICollectionViewDelegate {
} }
return UIContextMenuConfiguration { return UIContextMenuConfiguration {
let vc = SFSafariViewController(url: url) let vc = SFSafariViewController(url: url)
#if !os(visionOS)
vc.preferredControlTintColor = Preferences.shared.accentColor.color vc.preferredControlTintColor = Preferences.shared.accentColor.color
#endif
return vc return vc
} actionProvider: { _ in } actionProvider: { _ in
UIMenu(children: self.actionsForTrendingLink(card: card, source: .view(cell))) UIMenu(children: self.actionsForTrendingLink(card: card, source: .view(cell)))

5
Tusker/Screens/Explore/TrendsViewController.swift
View File

@ -495,6 +495,7 @@ extension TrendsViewController: UICollectionViewDelegate {
} }
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
@available(visionOS 1.0, *)
func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? { func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
guard let item = dataSource.itemIdentifier(for: indexPath) else { guard let item = dataSource.itemIdentifier(for: indexPath) else {
return nil return nil
@ -518,7 +519,9 @@ extension TrendsViewController: UICollectionViewDelegate {
let cell = collectionView.cellForItem(at: indexPath)! let cell = collectionView.cellForItem(at: indexPath)!
return UIContextMenuConfiguration { return UIContextMenuConfiguration {
let vc = SFSafariViewController(url: url) let vc = SFSafariViewController(url: url)
#if !os(visionOS)
vc.preferredControlTintColor = Preferences.shared.accentColor.color vc.preferredControlTintColor = Preferences.shared.accentColor.color
#endif
return vc return vc
} actionProvider: { _ in } actionProvider: { _ in
UIMenu(children: self.actionsForTrendingLink(card: card, source: .view(cell))) UIMenu(children: self.actionsForTrendingLink(card: card, source: .view(cell)))
@ -551,7 +554,7 @@ extension TrendsViewController: UICollectionViewDelegate {
} }
// implementing the highlightPreviewForItemAt method seems to prevent the old, single IndexPath variant of this method from being called on iOS 16 // implementing the highlightPreviewForItemAt method seems to prevent the old, single IndexPath variant of this method from being called on iOS 16
@available(iOS 16.0, *) @available(iOS 16.0, visionOS 1.0, *)
func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint) -> UIContextMenuConfiguration? { func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint) -> UIContextMenuConfiguration? {
guard indexPaths.count == 1 else { guard indexPaths.count == 1 else {
return nil return nil

14
Tusker/Screens/Fast Account Switcher/FastAccountSwitcherViewController.swift
View File

@ -25,7 +25,9 @@ class FastAccountSwitcherViewController: UIViewController {
private(set) var accountViews: [FastSwitchingAccountView] = [] private(set) var accountViews: [FastSwitchingAccountView] = []
private var lastSelectedAccountViewIndex: Int? private var lastSelectedAccountViewIndex: Int?
#if !os(visionOS)
private var selectionChangedFeedbackGenerator: UISelectionFeedbackGenerator? private var selectionChangedFeedbackGenerator: UISelectionFeedbackGenerator?
#endif
private var touchBeganFeedbackWorkItem: DispatchWorkItem? private var touchBeganFeedbackWorkItem: DispatchWorkItem?
var itemOrientation: ItemOrientation = .iconsTrailing var itemOrientation: ItemOrientation = .iconsTrailing
@ -115,7 +117,9 @@ class FastAccountSwitcherViewController: UIViewController {
return return
} }
lastSelectedAccountViewIndex = nil lastSelectedAccountViewIndex = nil
#if !os(visionOS)
selectionChangedFeedbackGenerator = nil selectionChangedFeedbackGenerator = nil
#endif
UIView.animate(withDuration: 0.15, delay: 0, options: .curveEaseInOut) { UIView.animate(withDuration: 0.15, delay: 0, options: .curveEaseInOut) {
self.view.alpha = 0 self.view.alpha = 0
@ -160,10 +164,12 @@ class FastAccountSwitcherViewController: UIViewController {
private func switchAccount(newIndex: Int, hapticFeedback: Bool = true) { private func switchAccount(newIndex: Int, hapticFeedback: Bool = true) {
if newIndex == 0 { // add account placeholder if newIndex == 0 { // add account placeholder
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
selectionChangedFeedbackGenerator?.selectionChanged() selectionChangedFeedbackGenerator?.selectionChanged()
} }
selectionChangedFeedbackGenerator = nil selectionChangedFeedbackGenerator = nil
#endif
hide() { hide() {
(self.view.window!.windowScene!.delegate as! MainSceneDelegate).showAddAccount() (self.view.window!.windowScene!.delegate as! MainSceneDelegate).showAddAccount()
@ -172,10 +178,12 @@ class FastAccountSwitcherViewController: UIViewController {
let account = UserAccountsManager.shared.accounts[newIndex - 1] let account = UserAccountsManager.shared.accounts[newIndex - 1]
if account.id != UserAccountsManager.shared.mostRecentAccountID { if account.id != UserAccountsManager.shared.mostRecentAccountID {
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
selectionChangedFeedbackGenerator?.selectionChanged() selectionChangedFeedbackGenerator?.selectionChanged()
} }
selectionChangedFeedbackGenerator = nil selectionChangedFeedbackGenerator = nil
#endif
hide() { hide() {
(self.view.window!.windowScene!.delegate as! MainSceneDelegate).activateAccount(account, animated: true) (self.view.window!.windowScene!.delegate as! MainSceneDelegate).activateAccount(account, animated: true)
@ -191,9 +199,11 @@ class FastAccountSwitcherViewController: UIViewController {
@objc private func handleLongPress(_ recognizer: UIGestureRecognizer) { @objc private func handleLongPress(_ recognizer: UIGestureRecognizer) {
switch recognizer.state { switch recognizer.state {
case .began: case .began:
#if !os(visionOS)
UIImpactFeedbackGenerator(style: .heavy).impactOccurred() UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator() selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator()
selectionChangedFeedbackGenerator?.prepare() selectionChangedFeedbackGenerator?.prepare()
#endif
show() show()
@ -243,10 +253,12 @@ class FastAccountSwitcherViewController: UIViewController {
} }
lastSelectedAccountViewIndex = selectedAccountViewIndex lastSelectedAccountViewIndex = selectedAccountViewIndex
#if !os(visionOS)
if hapticFeedback { if hapticFeedback {
selectionChangedFeedbackGenerator?.selectionChanged() selectionChangedFeedbackGenerator?.selectionChanged()
selectionChangedFeedbackGenerator?.prepare() selectionChangedFeedbackGenerator?.prepare()
} }
#endif
} }
} }
@ -269,6 +281,7 @@ class FastAccountSwitcherViewController: UIViewController {
accountsStack.bounds.contains(touch.location(in: accountsStack)) { accountsStack.bounds.contains(touch.location(in: accountsStack)) {
handleGestureMoved(to: touch.location(in: view), hapticFeedback: false) handleGestureMoved(to: touch.location(in: view), hapticFeedback: false)
#if !os(visionOS)
// don't trigger the haptic feedback immedaitely // don't trigger the haptic feedback immedaitely
// if the user is merely tapping, not initiating a pan, we don't want to trigger a double-impact // if the user is merely tapping, not initiating a pan, we don't want to trigger a double-impact
// if the tap ends very quickly, this will be cancelled // if the tap ends very quickly, this will be cancelled
@ -280,6 +293,7 @@ class FastAccountSwitcherViewController: UIViewController {
// 100ms determined experimentally to be fast enough that there's not a hugely-perceivable delay when beginning a pan gesture // 100ms determined experimentally to be fast enough that there's not a hugely-perceivable delay when beginning a pan gesture
// and slow enough that it's longer than most reasonable-speed taps // and slow enough that it's longer than most reasonable-speed taps
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100), execute: touchBeganFeedbackWorkItem!) DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100), execute: touchBeganFeedbackWorkItem!)
#endif
} }
super.touchesBegan(touches, with: event) super.touchesBegan(touches, with: event)

5
Tusker/Screens/Large Image/LargeImageContentView.swift
View File

@ -244,6 +244,10 @@ fileprivate class GifvActivityItemSource: NSObject, UIActivityItemSource {
} }
func activityViewController(_ activityViewController: UIActivityViewController, thumbnailImageForActivityType activityType: UIActivity.ActivityType?, suggestedSize size: CGSize) -> UIImage? { func activityViewController(_ activityViewController: UIActivityViewController, thumbnailImageForActivityType activityType: UIActivity.ActivityType?, suggestedSize size: CGSize) -> UIImage? {
#if os(visionOS)
#warning("Use async AVAssetImageGenerator.image(at:)")
return nil
#else
let generator = AVAssetImageGenerator(asset: self.asset) let generator = AVAssetImageGenerator(asset: self.asset)
generator.appliesPreferredTrackTransform = true generator.appliesPreferredTrackTransform = true
if let image = try? generator.copyCGImage(at: .zero, actualTime: nil) { if let image = try? generator.copyCGImage(at: .zero, actualTime: nil) {
@ -251,6 +255,7 @@ fileprivate class GifvActivityItemSource: NSObject, UIActivityItemSource {
} else { } else {
return nil return nil
} }
#endif
} }
func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? { func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? {

2
Tusker/Screens/Large Image/LargeImageViewController.swift
View File

@ -54,7 +54,9 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
var isInteractivelyAnimatingDismissal: Bool = false { var isInteractivelyAnimatingDismissal: Bool = false {
didSet { didSet {
#if !os(visionOS)
setNeedsStatusBarAppearanceUpdate() setNeedsStatusBarAppearanceUpdate()
#endif
} }
} }

2
Tusker/Screens/Large Image/LoadingLargeImageViewController.swift
View File

@ -45,7 +45,9 @@ class LoadingLargeImageViewController: UIViewController, LargeImageAnimatableVie
var isInteractivelyAnimatingDismissal: Bool = false { var isInteractivelyAnimatingDismissal: Bool = false {
didSet { didSet {
#if !os(visionOS)
setNeedsStatusBarAppearanceUpdate() setNeedsStatusBarAppearanceUpdate()
#endif
} }
} }

6
Tusker/Screens/Main/AccountSwitchingContainerViewController.swift
View File

@ -7,7 +7,9 @@
// //
import UIKit import UIKit
#if canImport(ScreenCorners)
import ScreenCorners import ScreenCorners
#endif
import UserAccounts import UserAccounts
import ComposeUI import ComposeUI
@ -78,11 +80,15 @@ class AccountSwitchingContainerViewController: UIViewController {
newRoot.view.transform = CGAffineTransform(translationX: 0, y: newInitialOffset).scaledBy(x: 0.9, y: 0.9) newRoot.view.transform = CGAffineTransform(translationX: 0, y: newInitialOffset).scaledBy(x: 0.9, y: 0.9)
newRoot.view.layer.masksToBounds = true newRoot.view.layer.masksToBounds = true
newRoot.view.layer.cornerCurve = .continuous newRoot.view.layer.cornerCurve = .continuous
#if canImport(ScreenCorners)
newRoot.view.layer.cornerRadius = view.window?.screen.displayCornerRadius ?? 0 newRoot.view.layer.cornerRadius = view.window?.screen.displayCornerRadius ?? 0
#endif
oldRoot.view.layer.masksToBounds = true oldRoot.view.layer.masksToBounds = true
oldRoot.view.layer.cornerCurve = .continuous oldRoot.view.layer.cornerCurve = .continuous
#if canImport(ScreenCorners)
oldRoot.view.layer.cornerRadius = view.window?.screen.displayCornerRadius ?? 0 oldRoot.view.layer.cornerRadius = view.window?.screen.displayCornerRadius ?? 0
#endif
// only one edge is affected in each direction, i have no idea why // only one edge is affected in each direction, i have no idea why
if direction == .upwards { if direction == .upwards {

4
Tusker/Screens/Main/Duckable+Root.swift
View File

@ -6,6 +6,8 @@
// Copyright © 2022 Shadowfacts. All rights reserved. // Copyright © 2022 Shadowfacts. All rights reserved.
// //
#if canImport(Duckable)
import UIKit import UIKit
import Duckable import Duckable
import ComposeUI import ComposeUI
@ -57,3 +59,5 @@ extension DuckableContainerViewController: AccountSwitchableViewController {
(child as? AccountSwitchableViewController)?.isFastAccountSwitcherActive ?? false (child as? AccountSwitchableViewController)?.isFastAccountSwitcherActive ?? false
} }
} }
#endif

25
Tusker/Screens/Main/MainTabBarViewController.swift
View File

@ -19,9 +19,6 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
private var fastSwitcherIndicator: FastAccountSwitcherIndicatorView! private var fastSwitcherIndicator: FastAccountSwitcherIndicatorView!
private var fastSwitcherConstraints: [NSLayoutConstraint] = [] private var fastSwitcherConstraints: [NSLayoutConstraint] = []
@available(iOS, obsoleted: 16.0)
private var draftToPresentOnAppear: Draft?
var selectedTab: Tab { var selectedTab: Tab {
return Tab(rawValue: selectedIndex)! return Tab(rawValue: selectedIndex)!
} }
@ -79,21 +76,12 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
} }
tabBar.isSpringLoaded = true tabBar.isSpringLoaded = true
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
stateRestorationLogger.info("MainTabBarViewController: viewWillAppear, selectedIndex=\(self.selectedIndex, privacy: .public)")
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
stateRestorationLogger.info("MainTabBarViewController: viewDidAppear, selectedIndex=\(self.selectedIndex, privacy: .public)")
if let draftToPresentOnAppear { #if os(visionOS)
self.draftToPresentOnAppear = nil registerForTraitChanges([UITraitHorizontalSizeClass.self]) { (self: Self, previousTraitCollection) in
compose(editing: draftToPresentOnAppear, animated: true) self.repositionFastSwitcherIndicator()
} }
#endif
} }
override func viewDidLayoutSubviews() { override func viewDidLayoutSubviews() {
@ -105,11 +93,13 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
repositionFastSwitcherIndicator() repositionFastSwitcherIndicator()
} }
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
repositionFastSwitcherIndicator() repositionFastSwitcherIndicator()
} }
#endif
func select(tab: Tab, dismissPresented: Bool) { func select(tab: Tab, dismissPresented: Bool) {
if tab == .compose { if tab == .compose {
@ -189,7 +179,8 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
compose(editing: nil) compose(editing: nil)
return false return false
} }
if viewController == viewControllers![selectedIndex], if selectedIndex != NSNotFound,
viewController == viewControllers![selectedIndex],
let nav = viewController as? UINavigationController, let nav = viewController as? UINavigationController,
nav.viewControllers.count == 1, nav.viewControllers.count == 1,
let scrollableVC = nav.viewControllers.first as? TabBarScrollableViewController { let scrollableVC = nav.viewControllers.first as? TabBarScrollableViewController {

4
Tusker/Screens/Notifications/FollowRequestNotificationCollectionViewCell.swift
View File

@ -234,7 +234,9 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
do { do {
_ = try await mastodonController.run(request) _ = try await mastodonController.run(request)
#if !os(visionOS)
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
#endif
self.actionButtonsStack.isHidden = true self.actionButtonsStack.isHidden = true
self.addLabel(NSLocalizedString("Rejected", comment: "rejected follow request label")) self.addLabel(NSLocalizedString("Rejected", comment: "rejected follow request label"))
} catch let error as Client.Error { } catch let error as Client.Error {
@ -260,7 +262,9 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
do { do {
_ = try await mastodonController.run(request) _ = try await mastodonController.run(request)
#if !os(visionOS)
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
#endif
self.actionButtonsStack.isHidden = true self.actionButtonsStack.isHidden = true
self.addLabel(NSLocalizedString("Accepted", comment: "accepted follow request label")) self.addLabel(NSLocalizedString("Accepted", comment: "accepted follow request label"))
} catch let error as Client.Error { } catch let error as Client.Error {

4
Tusker/Screens/Notifications/NotificationsCollectionViewController.swift
View File

@ -9,7 +9,9 @@
import UIKit import UIKit
import Pachyderm import Pachyderm
import Combine import Combine
#if canImport(Sentry)
import Sentry import Sentry
#endif
class NotificationsCollectionViewController: UIViewController, TimelineLikeCollectionViewController, CollectionViewController { class NotificationsCollectionViewController: UIViewController, TimelineLikeCollectionViewController, CollectionViewController {
@ -411,6 +413,7 @@ extension NotificationsCollectionViewController {
private func validateNotifications(_ notifications: [Pachyderm.Notification]) -> [Pachyderm.Notification] { private func validateNotifications(_ notifications: [Pachyderm.Notification]) -> [Pachyderm.Notification] {
return notifications.compactMap { notif in return notifications.compactMap { notif in
if notif.status == nil && (notif.kind == .mention || notif.kind == .reblog || notif.kind == .favourite || notif.kind == .status) { if notif.status == nil && (notif.kind == .mention || notif.kind == .reblog || notif.kind == .favourite || notif.kind == .status) {
#if canImport(Sentry)
let crumb = Breadcrumb(level: .fatal, category: "notifications") let crumb = Breadcrumb(level: .fatal, category: "notifications")
crumb.data = [ crumb.data = [
"id": notif.id, "id": notif.id,
@ -419,6 +422,7 @@ extension NotificationsCollectionViewController {
"account": notif.account.id, "account": notif.account.id,
] ]
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
return nil return nil
} else { } else {
return notif return notif

2
Tusker/Screens/Onboarding/InstanceSelectorTableViewController.swift
View File

@ -64,7 +64,9 @@ class InstanceSelectorTableViewController: UITableViewController {
navigationItem.scrollEdgeAppearance = appearance navigationItem.scrollEdgeAppearance = appearance
tableView.backgroundColor = .appGroupedBackground tableView.backgroundColor = .appGroupedBackground
#if !os(visionOS)
tableView.keyboardDismissMode = .interactive tableView.keyboardDismissMode = .interactive
#endif
tableView.register(UINib(nibName: "InstanceTableViewCell", bundle: .main), forCellReuseIdentifier: instanceCell) tableView.register(UINib(nibName: "InstanceTableViewCell", bundle: .main), forCellReuseIdentifier: instanceCell)
tableView.rowHeight = UITableView.automaticDimension tableView.rowHeight = UITableView.automaticDimension
tableView.estimatedRowHeight = 120 tableView.estimatedRowHeight = 120

3
Tusker/Screens/Preferences/AppearancePrefsView.swift
View File

@ -90,7 +90,8 @@ struct AppearancePrefsView : View {
@ViewBuilder @ViewBuilder
private var interfaceSection: some View { private var interfaceSection: some View {
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { let visionIdiom = UIUserInterfaceIdiom(rawValue: 6)
if [visionIdiom, .pad, .mac].contains(UIDevice.current.userInterfaceIdiom) {
Section(header: Text("Interface")) { Section(header: Text("Interface")) {
WidescreenNavigationPrefsView() WidescreenNavigationPrefsView()
} }

3
Tusker/Screens/Preferences/OppositeCollapseKeywordsView.swift
View File

@ -43,10 +43,13 @@ struct OppositeCollapseKeywordsView: View {
.listStyle(.grouped) .listStyle(.grouped)
.appGroupedListBackground(container: PreferencesNavigationController.self) .appGroupedListBackground(container: PreferencesNavigationController.self)
} }
#if !os(visionOS)
.onAppear(perform: updateAppearance) .onAppear(perform: updateAppearance)
#endif
.navigationBarTitle(preferences.expandAllContentWarnings ? "Collapse Post CW Keywords" : "Expand Post CW Keywords") .navigationBarTitle(preferences.expandAllContentWarnings ? "Collapse Post CW Keywords" : "Expand Post CW Keywords")
} }
@available(iOS, obsoleted: 16.0)
private func updateAppearance() { private func updateAppearance() {
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {
// no longer necessary // no longer necessary

8
Tusker/Screens/Preferences/Tip Jar/TipJarView.swift
View File

@ -139,6 +139,10 @@ private struct TipRow: View {
@Binding var showConfetti: Bool @Binding var showConfetti: Bool
@State private var error: TipJarView.Error? @State private var error: TipJarView.Error?
#if os(visionOS)
@Environment(\.purchase) private var purchase
#endif
var body: some View { var body: some View {
HStack { HStack {
Text(product.displayName) Text(product.displayName)
@ -175,7 +179,11 @@ private struct TipRow: View {
isPurchasing = true isPurchasing = true
let result: Product.PurchaseResult let result: Product.PurchaseResult
do { do {
#if os(visionOS)
result = try await purchase(product)
#else
result = try await product.purchase() result = try await product.purchase()
#endif
} catch { } catch {
self.error = .purchasing(error) self.error = .purchasing(error)
isPurchasing = false isPurchasing = false

6
Tusker/Screens/Report/ReportAddStatusView.swift
View File

@ -77,6 +77,11 @@ private struct ScrollBackgroundModifier: ViewModifier {
// even though it is for ReportSelectRulesView?? // even though it is for ReportSelectRulesView??
let traits: UITraitCollection = { let traits: UITraitCollection = {
var t = UITraitCollection(userInterfaceStyle: colorScheme == .dark ? .dark : .light) var t = UITraitCollection(userInterfaceStyle: colorScheme == .dark ? .dark : .light)
#if os(visionOS)
t = t.modifyingTraits({ mutableTraits in
mutableTraits.pureBlackDarkMode = true
})
#else
if #available(iOS 17.0, *) { if #available(iOS 17.0, *) {
t = t.modifyingTraits({ mutableTraits in t = t.modifyingTraits({ mutableTraits in
mutableTraits.pureBlackDarkMode = true mutableTraits.pureBlackDarkMode = true
@ -84,6 +89,7 @@ private struct ScrollBackgroundModifier: ViewModifier {
} else { } else {
t.obsoletePureBlackDarkMode = true t.obsoletePureBlackDarkMode = true
} }
#endif
return t return t
}() }()
Color(uiColor: .appGroupedBackground.resolvedColor(with: traits)) Color(uiColor: .appGroupedBackground.resolvedColor(with: traits))

1
Tusker/Screens/Report/ReportSelectRulesView.swift
View File

@ -56,6 +56,7 @@ struct ReportSelectRulesView: View {
private extension View { private extension View {
@available(iOS, obsoleted: 16.0) @available(iOS, obsoleted: 16.0)
@available(visionOS 1.0, *)
@ViewBuilder @ViewBuilder
func withAppBackgroundIfAvailable() -> some View { func withAppBackgroundIfAvailable() -> some View {
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {

2
Tusker/Screens/Report/ReportView.swift
View File

@ -30,7 +30,9 @@ struct ReportView: View {
if #available(iOS 16.0, *) { if #available(iOS 16.0, *) {
NavigationStack { NavigationStack {
navigationViewContent navigationViewContent
#if !os(visionOS)
.scrollDismissesKeyboard(.interactively) .scrollDismissesKeyboard(.interactively)
#endif
} }
} else { } else {
NavigationView { NavigationView {

2
Tusker/Screens/Search/SearchResultsViewController.swift
View File

@ -105,7 +105,9 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
collectionView.dragDelegate = self collectionView.dragDelegate = self
collectionView.allowsFocus = true collectionView.allowsFocus = true
collectionView.backgroundColor = .appGroupedBackground collectionView.backgroundColor = .appGroupedBackground
#if !os(visionOS)
collectionView.keyboardDismissMode = .interactive collectionView.keyboardDismissMode = .interactive
#endif
dataSource = createDataSource() dataSource = createDataSource()
} }

16
Tusker/Screens/Timeline/TimelineViewController.swift
View File

@ -9,7 +9,9 @@
import UIKit import UIKit
import Pachyderm import Pachyderm
import Combine import Combine
#if canImport(Sentry)
import Sentry import Sentry
#endif
protocol TimelineViewControllerDelegate: AnyObject { protocol TimelineViewControllerDelegate: AnyObject {
func timelineViewController(_ timelineViewController: TimelineViewController, willShowJumpToPresentToastWith animator: UIViewPropertyAnimator?) func timelineViewController(_ timelineViewController: TimelineViewController, willShowJumpToPresentToastWith animator: UIViewPropertyAnimator?)
@ -374,9 +376,11 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
_ = try await mastodonController.run(req) _ = try await mastodonController.run(req)
} catch { } catch {
stateRestorationLogger.error("TimelineViewController: failed to update timeline marker: \(String(describing: error))") stateRestorationLogger.error("TimelineViewController: failed to update timeline marker: \(String(describing: error))")
#if canImport(Sentry)
let event = Event(error: error) let event = Event(error: error)
event.message = SentryMessage(formatted: "Failed to update timeline marker: \(String(describing: error))") event.message = SentryMessage(formatted: "Failed to update timeline marker: \(String(describing: error))")
SentrySDK.capture(event: event) SentrySDK.capture(event: event)
#endif
} }
} }
} }
@ -421,9 +425,11 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
} }
func restoreStateFromHandoff(statusIDs: [String], centerStatusID: String) async { func restoreStateFromHandoff(statusIDs: [String], centerStatusID: String) async {
#if canImport(Sentry)
let crumb = Breadcrumb(level: .debug, category: "TimelineViewController") let crumb = Breadcrumb(level: .debug, category: "TimelineViewController")
crumb.message = "Restoring state from handoff activity" crumb.message = "Restoring state from handoff activity"
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
await controller.restoreInitial { @MainActor in await controller.restoreInitial { @MainActor in
let position = TimelinePosition(context: mastodonController.persistentContainer.viewContext) let position = TimelinePosition(context: mastodonController.persistentContainer.viewContext)
position.statusIDs = statusIDs position.statusIDs = statusIDs
@ -465,6 +471,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
case .success(let status): case .success(let status):
statuses.append(status) statuses.append(status)
case .failure(let error): case .failure(let error):
#if canImport(Sentry)
let crumb = Breadcrumb(level: .error, category: "TimelineViewController") let crumb = Breadcrumb(level: .error, category: "TimelineViewController")
crumb.message = "Error loading status" crumb.message = "Error loading status"
crumb.data = [ crumb.data = [
@ -472,15 +479,18 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
"id": id "id": id
] ]
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
} }
} }
await mastodonController.persistentContainer.addAll(statuses: statuses, in: mastodonController.persistentContainer.viewContext) await mastodonController.persistentContainer.addAll(statuses: statuses, in: mastodonController.persistentContainer.viewContext)
// if an icloud sync completed in between starting to load the statuses and finishing, try to load again // if an icloud sync completed in between starting to load the statuses and finishing, try to load again
if position.statusIDs != originalPositionStatusIDs { if position.statusIDs != originalPositionStatusIDs {
#if canImport(Sentry)
let crumb = Breadcrumb(level: .info, category: "TimelineViewController") let crumb = Breadcrumb(level: .info, category: "TimelineViewController")
crumb.message = "TimelinePosition statusIDs changed, retrying load" crumb.message = "TimelinePosition statusIDs changed, retrying load"
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
return await loadStatusesToRestore(position: position) return await loadStatusesToRestore(position: position)
} }
@ -508,12 +518,14 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
let centerStatusID = position.centerStatusID let centerStatusID = position.centerStatusID
let items = position.statusIDs.map { Item.status(id: $0, collapseState: .unknown, filterState: .unknown) } let items = position.statusIDs.map { Item.status(id: $0, collapseState: .unknown, filterState: .unknown) }
snapshot.appendItems(items, toSection: .statuses) snapshot.appendItems(items, toSection: .statuses)
#if canImport(Sentry)
let crumb = Breadcrumb(level: .info, category: "TimelineViewController") let crumb = Breadcrumb(level: .info, category: "TimelineViewController")
crumb.message = "Restoring statuses" crumb.message = "Restoring statuses"
crumb.data = [ crumb.data = [
"statusIDs": position.statusIDs "statusIDs": position.statusIDs
] ]
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
dataSource.apply(snapshot, animatingDifferences: false) { dataSource.apply(snapshot, animatingDifferences: false) {
if let centerStatusID, if let centerStatusID,
let index = statusIDs.firstIndex(of: centerStatusID) { let index = statusIDs.firstIndex(of: centerStatusID) {
@ -550,9 +562,11 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
return true return true
} catch { } catch {
stateRestorationLogger.error("TimelineViewController: failed to load from timeline marker: \(String(describing: error))") stateRestorationLogger.error("TimelineViewController: failed to load from timeline marker: \(String(describing: error))")
#if canImport(Sentry)
let event = Event(error: error) let event = Event(error: error)
event.message = SentryMessage(formatted: "Failed to load from timeline marker: \(String(describing: error))") event.message = SentryMessage(formatted: "Failed to load from timeline marker: \(String(describing: error))")
SentrySDK.capture(event: event) SentrySDK.capture(event: event)
#endif
return false return false
} }
} }
@ -586,9 +600,11 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
private func filterResult(state: FilterState, statusID: String) -> (Filterer.Result, NSAttributedString?) { private func filterResult(state: FilterState, statusID: String) -> (Filterer.Result, NSAttributedString?) {
let status = { let status = {
guard let status = self.mastodonController.persistentContainer.status(for: statusID) else { guard let status = self.mastodonController.persistentContainer.status(for: statusID) else {
#if canImport(Sentry)
let crumb = Breadcrumb(level: .fatal, category: "TimelineViewController") let crumb = Breadcrumb(level: .fatal, category: "TimelineViewController")
crumb.message = "Looking up status \(statusID)" crumb.message = "Looking up status \(statusID)"
SentrySDK.addBreadcrumb(crumb) SentrySDK.addBreadcrumb(crumb)
#endif
preconditionFailure("Missing status for filtering") preconditionFailure("Missing status for filtering")
} }
// if the status is a reblog of another one, filter based on that one // if the status is a reblog of another one, filter based on that one

8
Tusker/Screens/Utilities/CustomAlertController.swift
View File

@ -149,7 +149,9 @@ class CustomAlertActionsView: UIControl {
private var separators: [UIView] = [] private var separators: [UIView] = []
private var separatorSizeConstraints: [NSLayoutConstraint] = [] private var separatorSizeConstraints: [NSLayoutConstraint] = []
#if !os(visionOS)
private let generator = UISelectionFeedbackGenerator() private let generator = UISelectionFeedbackGenerator()
#endif
private var currentSelectedActionIndex: Int? private var currentSelectedActionIndex: Int?
init(config: CustomAlertController.Configuration, dismiss: @escaping () -> Void) { init(config: CustomAlertController.Configuration, dismiss: @escaping () -> Void) {
@ -297,7 +299,9 @@ class CustomAlertActionsView: UIControl {
currentSelectedActionIndex = selectedButton?.offset currentSelectedActionIndex = selectedButton?.offset
selectedButton?.element.backgroundColor = .secondarySystemFill selectedButton?.element.backgroundColor = .secondarySystemFill
#if !os(visionOS)
generator.prepare() generator.prepare()
#endif
case .changed: case .changed:
if selectedButton == nil && hitTest(recognizer.location(in: self), with: nil)?.tag == ViewTags.customAlertSeparator { if selectedButton == nil && hitTest(recognizer.location(in: self), with: nil)?.tag == ViewTags.customAlertSeparator {
@ -308,13 +312,17 @@ class CustomAlertActionsView: UIControl {
if let currentSelectedActionIndex { if let currentSelectedActionIndex {
actionButtons[currentSelectedActionIndex].backgroundColor = nil actionButtons[currentSelectedActionIndex].backgroundColor = nil
} }
#if !os(visionOS)
generator.selectionChanged() generator.selectionChanged()
#endif
} }
currentSelectedActionIndex = selectedButton?.offset currentSelectedActionIndex = selectedButton?.offset
selectedButton?.element.backgroundColor = .secondarySystemFill selectedButton?.element.backgroundColor = .secondarySystemFill
#if !os(visionOS)
generator.prepare() generator.prepare()
#endif
case .ended: case .ended:
if let currentSelectedActionIndex { if let currentSelectedActionIndex {

6
Tusker/Screens/Utilities/EnhancedNavigationViewController.swift
View File

@ -15,7 +15,9 @@ class EnhancedNavigationViewController: UINavigationController {
var poppedViewControllers = [UIViewController]() var poppedViewControllers = [UIViewController]()
var skipResetPoppedOnNextPush = false var skipResetPoppedOnNextPush = false
#if !os(visionOS)
private var interactivePushTransition: InteractivePushTransition! private var interactivePushTransition: InteractivePushTransition!
#endif
override var viewControllers: [UIViewController] { override var viewControllers: [UIViewController] {
didSet { didSet {
@ -34,7 +36,9 @@ class EnhancedNavigationViewController: UINavigationController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
#if !os(visionOS)
self.interactivePushTransition = InteractivePushTransition(navigationController: self) self.interactivePushTransition = InteractivePushTransition(navigationController: self)
#endif
if #available(iOS 16.0, *), if #available(iOS 16.0, *),
useBrowserStyleNavigation, useBrowserStyleNavigation,
@ -137,6 +141,7 @@ class EnhancedNavigationViewController: UINavigationController {
}, animated: true) }, animated: true)
} }
#if !os(visionOS)
func onWillShow() { func onWillShow() {
self.transitionCoordinator?.notifyWhenInteractionChanges({ (context) in self.transitionCoordinator?.notifyWhenInteractionChanges({ (context) in
if context.isCancelled { if context.isCancelled {
@ -154,6 +159,7 @@ class EnhancedNavigationViewController: UINavigationController {
} }
}) })
} }
#endif
@available(iOS 16.0, *) @available(iOS 16.0, *)
private func configureNavItem(_ navItem: UINavigationItem) { private func configureNavItem(_ navItem: UINavigationItem) {

4
Tusker/Screens/Utilities/InteractivePushTransition.swift
View File

@ -8,6 +8,8 @@
import UIKit import UIKit
#if !os(visionOS)
/// Allows interactively moving forward through the navigation stack after popping /// Allows interactively moving forward through the navigation stack after popping
/// Based on https://github.com/NSExceptional/TBInteractivePushTransition /// Based on https://github.com/NSExceptional/TBInteractivePushTransition
class InteractivePushTransition: UIPercentDrivenInteractiveTransition { class InteractivePushTransition: UIPercentDrivenInteractiveTransition {
@ -141,3 +143,5 @@ extension InteractivePushTransition: UIViewControllerAnimatedTransitioning {
} }
} }
} }
#endif

4
Tusker/Shortcuts/UserActivityHandlingContext.swift
View File

@ -7,7 +7,9 @@
// //
import UIKit import UIKit
#if canImport(Duckable)
import Duckable import Duckable
#endif
import ComposeUI import ComposeUI
@MainActor @MainActor
@ -105,10 +107,12 @@ class StateRestorationUserActivityHandlingContext: UserActivityHandlingContext {
func finalize(activity: NSUserActivity) { func finalize(activity: NSUserActivity) {
precondition(state > .initial) precondition(state > .initial)
#if !os(visionOS)
if #available(iOS 16.0, *), if #available(iOS 16.0, *),
let duckedDraft = UserActivityManager.getDuckedDraft(from: activity) { let duckedDraft = UserActivityManager.getDuckedDraft(from: activity) {
self.root.compose(editing: duckedDraft, animated: false, isDucked: true) self.root.compose(editing: duckedDraft, animated: false, isDucked: true)
} }
#endif
} }
enum State: Comparable { enum State: Comparable {

13
Tusker/TuskerNavigationDelegate.swift
View File

@ -51,7 +51,9 @@ extension TuskerNavigationDelegate {
let config = SFSafariViewController.Configuration() let config = SFSafariViewController.Configuration()
config.entersReaderIfAvailable = Preferences.shared.inAppSafariAutomaticReaderMode config.entersReaderIfAvailable = Preferences.shared.inAppSafariAutomaticReaderMode
let vc = SFSafariViewController(url: url, configuration: config) let vc = SFSafariViewController(url: url, configuration: config)
#if !os(visionOS)
vc.preferredControlTintColor = Preferences.shared.accentColor.color vc.preferredControlTintColor = Preferences.shared.accentColor.color
#endif
present(vc, animated: true) present(vc, animated: true)
} else if UIApplication.shared.canOpenURL(url) { } else if UIApplication.shared.canOpenURL(url) {
UIApplication.shared.open(url, options: [:]) UIApplication.shared.open(url, options: [:])
@ -92,19 +94,28 @@ extension TuskerNavigationDelegate {
func compose(editing draft: Draft?, animated: Bool = true, isDucked: Bool = false) { func compose(editing draft: Draft?, animated: Bool = true, isDucked: Bool = false) {
let draft = draft ?? apiController.createDraft() let draft = draft ?? apiController.createDraft()
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { let visionIdiom = UIUserInterfaceIdiom(rawValue: 6) // .vision is not available pre-iOS 17 :S
if [visionIdiom, .pad, .mac].contains(UIDevice.current.userInterfaceIdiom) {
let compose = UserActivityManager.editDraftActivity(id: draft.id, accountID: apiController.accountInfo!.id) let compose = UserActivityManager.editDraftActivity(id: draft.id, accountID: apiController.accountInfo!.id)
let options = UIWindowScene.ActivationRequestOptions() let options = UIWindowScene.ActivationRequestOptions()
#if os(visionOS)
options.placement = .prominent()
#else
options.preferredPresentationStyle = .prominent options.preferredPresentationStyle = .prominent
#endif
UIApplication.shared.requestSceneSessionActivation(nil, userActivity: compose, options: options, errorHandler: nil) UIApplication.shared.requestSceneSessionActivation(nil, userActivity: compose, options: options, errorHandler: nil)
} else { } else {
let compose = ComposeHostingController(draft: draft, mastodonController: apiController) let compose = ComposeHostingController(draft: draft, mastodonController: apiController)
#if os(visionOS)
fatalError("unreachable")
#else
if #available(iOS 16.0, *), if #available(iOS 16.0, *),
presentDuckable(compose, animated: animated, isDucked: isDucked) { presentDuckable(compose, animated: animated, isDucked: isDucked) {
return return
} else { } else {
present(compose, animated: animated) present(compose, animated: animated)
} }
#endif
} }
} }

8
Tusker/Views/Attachments/AttachmentView.swift
View File

@ -226,6 +226,9 @@ class AttachmentView: GIFImageView {
let asset = AVURLAsset(url: attachmentURL) let asset = AVURLAsset(url: attachmentURL)
let generator = AVAssetImageGenerator(asset: asset) let generator = AVAssetImageGenerator(asset: asset)
generator.appliesPreferredTrackTransform = true generator.appliesPreferredTrackTransform = true
#if os(visionOS)
#warning("Use async AVAssetImageGenerator.image(at:)")
#else
guard let image = try? generator.copyCGImage(at: .zero, actualTime: nil) else { return } guard let image = try? generator.copyCGImage(at: .zero, actualTime: nil) else { return }
UIImage(cgImage: image).prepareForDisplay { [weak self] image in UIImage(cgImage: image).prepareForDisplay { [weak self] image in
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
@ -234,6 +237,7 @@ class AttachmentView: GIFImageView {
self.displayImage() self.displayImage()
} }
} }
#endif
} }
} }
@ -275,11 +279,15 @@ class AttachmentView: GIFImageView {
AttachmentView.queue.async { AttachmentView.queue.async {
let generator = AVAssetImageGenerator(asset: asset) let generator = AVAssetImageGenerator(asset: asset)
generator.appliesPreferredTrackTransform = true generator.appliesPreferredTrackTransform = true
#if os(visionOS)
#warning("Use async AVAssetImageGenerator.image(at:)")
#else
guard let image = try? generator.copyCGImage(at: .zero, actualTime: nil) else { return } guard let image = try? generator.copyCGImage(at: .zero, actualTime: nil) else { return }
DispatchQueue.main.async { DispatchQueue.main.async {
self.source = .cgImage(attachmentURL, image) self.source = .cgImage(attachmentURL, image)
self.displayImage() self.displayImage()
} }
#endif
} }
let gifvView = GifvAttachmentView(asset: asset, gravity: .resizeAspectFill) let gifvView = GifvAttachmentView(asset: asset, gravity: .resizeAspectFill)

4
Tusker/Views/Attachments/GifvAttachmentView.swift
View File

@ -47,6 +47,9 @@ class GifvAttachmentView: UIView {
private static func createItem(asset: AVAsset) -> AVPlayerItem { private static func createItem(asset: AVAsset) -> AVPlayerItem {
let item = AVPlayerItem(asset: asset) let item = AVPlayerItem(asset: asset)
if Preferences.shared.grayscaleImages { if Preferences.shared.grayscaleImages {
#if os(visionOS)
#warning("Use async AVVideoComposition CIFilter initializer")
#else
item.videoComposition = AVVideoComposition(asset: asset, applyingCIFiltersWithHandler: { (request) in item.videoComposition = AVVideoComposition(asset: asset, applyingCIFiltersWithHandler: { (request) in
let filter = CIFilter(name: "CIColorMonochrome")! let filter = CIFilter(name: "CIColorMonochrome")!
@ -56,6 +59,7 @@ class GifvAttachmentView: UIView {
request.finish(with: filter.outputImage!, context: nil) request.finish(with: filter.outputImage!, context: nil)
}) })
#endif
} }
return item return item
} }

11
Tusker/Views/BaseEmojiLabel.swift
View File

@ -11,6 +11,11 @@ import Pachyderm
import WebURLFoundationExtras import WebURLFoundationExtras
private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: []) private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: [])
#if os(visionOS)
private let imageScale: CGFloat = 2
#else
private let imageScale = UIScreen.main.scale
#endif
protocol BaseEmojiLabel: AnyObject { protocol BaseEmojiLabel: AnyObject {
var emojiIdentifier: AnyHashable? { get set } var emojiIdentifier: AnyHashable? { get set }
@ -45,7 +50,7 @@ extension BaseEmojiLabel {
func emojiImageSize(_ image: UIImage) -> CGSize { func emojiImageSize(_ image: UIImage) -> CGSize {
var imageSizeMatchingFontSize = CGSize(width: image.size.width * (adjustedCapHeight / image.size.height), height: adjustedCapHeight) var imageSizeMatchingFontSize = CGSize(width: image.size.width * (adjustedCapHeight / image.size.height), height: adjustedCapHeight)
var scale: CGFloat = 1.4 var scale: CGFloat = 1.4
scale *= UIScreen.main.scale scale *= imageScale
imageSizeMatchingFontSize = CGSize(width: imageSizeMatchingFontSize.width * scale, height: imageSizeMatchingFontSize.height * scale) imageSizeMatchingFontSize = CGSize(width: imageSizeMatchingFontSize.width * scale, height: imageSizeMatchingFontSize.height * scale)
return imageSizeMatchingFontSize return imageSizeMatchingFontSize
} }
@ -75,7 +80,7 @@ extension BaseEmojiLabel {
let cgImage = thumbnail.cgImage { let cgImage = thumbnail.cgImage {
// the thumbnail API takes a pixel size and returns an image with scale 1, but we want the actual screen scale, so convert // the thumbnail API takes a pixel size and returns an image with scale 1, but we want the actual screen scale, so convert
// see FB12187798 // see FB12187798
emojiImages[emoji.shortcode] = UIImage(cgImage: cgImage, scale: UIScreen.main.scale, orientation: .up) emojiImages[emoji.shortcode] = UIImage(cgImage: cgImage, scale: imageScale, orientation: .up)
} }
} else { } else {
// otherwise, perform the network request // otherwise, perform the network request
@ -88,7 +93,7 @@ extension BaseEmojiLabel {
} }
image.prepareThumbnail(of: emojiImageSize(image)) { thumbnail in image.prepareThumbnail(of: emojiImageSize(image)) { thumbnail in
guard let thumbnail = thumbnail?.cgImage, guard let thumbnail = thumbnail?.cgImage,
case let rescaled = UIImage(cgImage: thumbnail, scale: UIScreen.main.scale, orientation: .up), case let rescaled = UIImage(cgImage: thumbnail, scale: imageScale, orientation: .up),
let transformedImage = ImageGrayscalifier.convertIfNecessary(url: URL(emoji.url)!, image: rescaled) else { let transformedImage = ImageGrayscalifier.convertIfNecessary(url: URL(emoji.url)!, image: rescaled) else {
group.leave() group.leave()
return return

30
Tusker/Views/BasicTableViewCell.xib
View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15703"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="xP3-ps-Bp7" style="IBUITableViewCellStyleDefault" id="QwQ-aK-6Xu">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QwQ-aK-6Xu" id="whG-vX-EQq">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xP3-ps-Bp7">
<rect key="frame" x="20" y="0.0" width="374" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
<point key="canvasLocation" x="-113" y="20"/>
</tableViewCell>
</objects>
</document>

2
Tusker/Views/ContentTextView.swift
View File

@ -190,7 +190,9 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
return HashtagTimelineViewController(for: tag, mastodonController: mastodonController!) return HashtagTimelineViewController(for: tag, mastodonController: mastodonController!)
} else if url.scheme == "https" || url.scheme == "http" { } else if url.scheme == "https" || url.scheme == "http" {
let vc = SFSafariViewController(url: url) let vc = SFSafariViewController(url: url)
#if !os(visionOS)
vc.preferredControlTintColor = Preferences.shared.accentColor.color vc.preferredControlTintColor = Preferences.shared.accentColor.color
#endif
return vc return vc
} else { } else {
return nil return nil

6
Tusker/Views/Poll/PollOptionsView.swift
View File

@ -28,7 +28,9 @@ class PollOptionsView: UIControl {
private let animationDuration: TimeInterval = 0.1 private let animationDuration: TimeInterval = 0.1
private let scaledTransform = CGAffineTransform(scaleX: 0.95, y: 0.95) private let scaledTransform = CGAffineTransform(scaleX: 0.95, y: 0.95)
#if !os(visionOS)
private let generator = UISelectionFeedbackGenerator() private let generator = UISelectionFeedbackGenerator()
#endif
override var isEnabled: Bool { override var isEnabled: Bool {
didSet { didSet {
@ -135,8 +137,10 @@ class PollOptionsView: UIControl {
} }
animator.startAnimation() animator.startAnimation()
#if !os(visionOS)
generator.selectionChanged() generator.selectionChanged()
generator.prepare() generator.prepare()
#endif
return true return true
} }
@ -168,10 +172,12 @@ class PollOptionsView: UIControl {
} }
} }
#if !os(visionOS)
if newIndex != nil { if newIndex != nil {
generator.selectionChanged() generator.selectionChanged()
generator.prepare() generator.prepare()
} }
#endif
} }
return true return true

2
Tusker/Views/Poll/StatusPollView.swift
View File

@ -160,7 +160,9 @@ class StatusPollView: UIView, StatusContentPollView {
voteButton.isEnabled = false voteButton.isEnabled = false
voteButton.disabledTitle = "Voted" voteButton.disabledTitle = "Voted"
#if !os(visionOS)
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
#endif
let request = Poll.vote(poll.id, choices: optionsView.checkedOptionIndices) let request = Poll.vote(poll.id, choices: optionsView.checkedOptionIndices)
mastodonController.run(request) { (response) in mastodonController.run(request) { (response) in

4
Tusker/Views/Profile Header/ProfileFieldValueView.swift
View File

@ -148,10 +148,12 @@ class ProfileFieldValueView: UIView {
if traitCollection.horizontalSizeClass == .compact || traitCollection.verticalSizeClass == .compact { if traitCollection.horizontalSizeClass == .compact || traitCollection.verticalSizeClass == .compact {
toPresent = UINavigationController(rootViewController: host) toPresent = UINavigationController(rootViewController: host)
toPresent.modalPresentationStyle = .pageSheet toPresent.modalPresentationStyle = .pageSheet
#if !os(visionOS)
let sheetPresentationController = toPresent.sheetPresentationController! let sheetPresentationController = toPresent.sheetPresentationController!
sheetPresentationController.detents = [ sheetPresentationController.detents = [
.medium() .medium()
] ]
#endif
} else { } else {
host.modalPresentationStyle = .popover host.modalPresentationStyle = .popover
let popoverPresentationController = host.popoverPresentationController! let popoverPresentationController = host.popoverPresentationController!
@ -182,7 +184,9 @@ extension ProfileFieldValueView: UIContextMenuInteractionDelegate, MenuActionPro
} else { } else {
return UIContextMenuConfiguration { return UIContextMenuConfiguration {
let vc = SFSafariViewController(url: url) let vc = SFSafariViewController(url: url)
#if !os(visionOS)
vc.preferredControlTintColor = Preferences.shared.accentColor.color vc.preferredControlTintColor = Preferences.shared.accentColor.color
#endif
return vc return vc
} actionProvider: { _ in } actionProvider: { _ in
UIMenu(children: self.actionsForURL(url, source: .view(self))) UIMenu(children: self.actionsForURL(url, source: .view(self)))

10
Tusker/Views/Profile Header/ProfileFieldsView.swift
View File

@ -55,14 +55,24 @@ class ProfileFieldsView: UIView {
boundsObservation = observe(\.bounds, changeHandler: { [unowned self] _, _ in boundsObservation = observe(\.bounds, changeHandler: { [unowned self] _, _ in
self.setNeedsUpdateConstraints() self.setNeedsUpdateConstraints()
}) })
#if os(visionOS)
registerForTraitChanges([UITraitHorizontalSizeClass.self, UITraitPreferredContentSizeCategory.self]) { (self: Self, previousTraitCollection) in
if self.isUsingSingleColumn != self.needsSingleColumn {
self.configureFields()
}
}
#endif
} }
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
if isUsingSingleColumn != needsSingleColumn { if isUsingSingleColumn != needsSingleColumn {
configureFields() configureFields()
} }
} }
#endif
func updateUI(account: AccountMO) { func updateUI(account: AccountMO) {
isHidden = account.fields.isEmpty isHidden = account.fields.isEmpty

2
Tusker/Views/Profile Header/ProfileHeaderView.swift
View File

@ -383,7 +383,9 @@ class ProfileHeaderView: UIView {
} }
followButton.configuration!.showsActivityIndicator = true followButton.configuration!.showsActivityIndicator = true
followButton.isEnabled = false followButton.isEnabled = false
#if !os(visionOS)
UIImpactFeedbackGenerator(style: .light).impactOccurred() UIImpactFeedbackGenerator(style: .light).impactOccurred()
#endif
Task { Task {
do { do {
let (relationship, _) = try await mastodonController.run(req) let (relationship, _) = try await mastodonController.run(req)

16
Tusker/Views/ScrollingSegmentedControl.swift
View File

@ -23,7 +23,9 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
private var selectedIndicatorViewAlignmentConstraints: [NSLayoutConstraint] = [] private var selectedIndicatorViewAlignmentConstraints: [NSLayoutConstraint] = []
private var changeSelectionPanRecognizer: UIGestureRecognizer! private var changeSelectionPanRecognizer: UIGestureRecognizer!
private var selectedOptionAtStartOfPan: Value? private var selectedOptionAtStartOfPan: Value?
#if !os(visionOS)
private lazy var selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator() private lazy var selectionChangedFeedbackGenerator = UISelectionFeedbackGenerator()
#endif
override var intrinsicContentSize: CGSize { override var intrinsicContentSize: CGSize {
let buttonWidths = optionsStack.arrangedSubviews.map(\.intrinsicContentSize.width).reduce(0, +) let buttonWidths = optionsStack.arrangedSubviews.map(\.intrinsicContentSize.width).reduce(0, +)
@ -69,18 +71,24 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
selectedIndicatorView.heightAnchor.constraint(equalToConstant: 4), selectedIndicatorView.heightAnchor.constraint(equalToConstant: 4),
selectedIndicatorView.bottomAnchor.constraint(equalTo: contentLayoutGuide.bottomAnchor), selectedIndicatorView.bottomAnchor.constraint(equalTo: contentLayoutGuide.bottomAnchor),
]) ])
#if os(visionOS)
registerForTraitChanges([UITraitPreferredContentSizeCategory.self], action: #selector(invalidateIntrinsicContentSize))
#endif
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
if traitCollection.preferredContentSizeCategory != previousTraitCollection?.preferredContentSizeCategory { if traitCollection.preferredContentSizeCategory != previousTraitCollection?.preferredContentSizeCategory {
invalidateIntrinsicContentSize() invalidateIntrinsicContentSize()
} }
} }
#endif
private func createOptionViews() { private func createOptionViews() {
optionsStack.arrangedSubviews.forEach { $0.removeFromSuperview() } optionsStack.arrangedSubviews.forEach { $0.removeFromSuperview() }
@ -107,9 +115,11 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
return return
} }
#if !os(visionOS)
if selectedOption != nil { if selectedOption != nil {
selectionChangedFeedbackGenerator.selectionChanged() selectionChangedFeedbackGenerator.selectionChanged()
} }
#endif
selectedOption = value selectedOption = value
didSelectOption?(value) didSelectOption?(value)
@ -170,11 +180,15 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
switch recognizer.state { switch recognizer.state {
case .began: case .began:
selectedOptionAtStartOfPan = selectedOption selectedOptionAtStartOfPan = selectedOption
#if !os(visionOS)
selectionChangedFeedbackGenerator.prepare() selectionChangedFeedbackGenerator.prepare()
#endif
case .changed: case .changed:
if updateSelectionFor(location: horizontalLocationInStack) { if updateSelectionFor(location: horizontalLocationInStack) {
#if !os(visionOS)
selectionChangedFeedbackGenerator.prepare() selectionChangedFeedbackGenerator.prepare()
#endif
} }
case .ended: case .ended:
@ -208,7 +222,9 @@ class ScrollingSegmentedControl<Value: Hashable>: UIScrollView, UIGestureRecogni
self.layoutIfNeeded() self.layoutIfNeeded()
} }
animator.startAnimation() animator.startAnimation()
#if !os(visionOS)
selectionChangedFeedbackGenerator.selectionChanged() selectionChangedFeedbackGenerator.selectionChanged()
#endif
return true return true
} else { } else {
return false return false

5
Tusker/Views/Status/StatusCardView.swift
View File

@ -137,10 +137,13 @@ class StatusCardView: UIView {
]) ])
} }
// Unneeded on visionOS because there is no light/dark mode
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
updateBorderColor() updateBorderColor()
} }
#endif
override func layoutSubviews() { override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
@ -240,7 +243,9 @@ extension StatusCardView: UIContextMenuInteractionDelegate {
return UIContextMenuConfiguration(identifier: nil) { return UIContextMenuConfiguration(identifier: nil) {
let vc = SFSafariViewController(url: URL(card.url)!) let vc = SFSafariViewController(url: URL(card.url)!)
#if !os(visionOS)
vc.preferredControlTintColor = Preferences.shared.accentColor.color vc.preferredControlTintColor = Preferences.shared.accentColor.color
#endif
return vc return vc
} actionProvider: { (_) in } actionProvider: { (_) in
let actions = self.actionProvider?.actionsForURL(URL(card.url)!, source: .view(self)) ?? [] let actions = self.actionProvider?.actionsForURL(URL(card.url)!, source: .view(self)) ?? []

13
Tusker/Views/Status/StatusMetaIndicatorsView.swift
View File

@ -37,8 +37,20 @@ class StatusMetaIndicatorsView: UIView {
private func commonInit() { private func commonInit() {
NotificationCenter.default.addObserver(self, selector: #selector(configureImageViews), name: UIAccessibility.boldTextStatusDidChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(configureImageViews), name: UIAccessibility.boldTextStatusDidChangeNotification, object: nil)
#if os(visionOS)
registerForTraitChanges([UITraitPreferredContentSizeCategory.self]) { (self: Self, previousTraitCollection) in
if self.isUsingSingleAxis != self.needsSingleAxis {
for image in self.images {
self.configureImageView(image)
}
self.placeImageViews(self.images)
}
}
#endif
} }
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
if isUsingSingleAxis != needsSingleAxis { if isUsingSingleAxis != needsSingleAxis {
@ -48,6 +60,7 @@ class StatusMetaIndicatorsView: UIView {
placeImageViews(images) placeImageViews(images)
} }
} }
#endif
@objc private func configureImageViews() { @objc private func configureImageViews() {
for image in images { for image in images {

59
Tusker/Views/Toast/ToastConfiguration.swift
View File

@ -8,7 +8,9 @@
import UIKit import UIKit
import Pachyderm import Pachyderm
#if canImport(Sentry)
import Sentry import Sentry
#endif
import OSLog import OSLog
@_spi(InstanceType) import InstanceFeatures @_spi(InstanceType) import InstanceFeatures
@ -96,70 +98,75 @@ fileprivate extension Pachyderm.Client.Error {
private let toastErrorLogger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ToastError") private let toastErrorLogger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ToastError")
private func captureError(_ error: Client.Error, in mastodonController: MastodonController, title: String) { private func captureError(_ error: Client.Error, in mastodonController: MastodonController, title: String) {
let event = Event(error: error) var tags = [
event.message = SentryMessage(formatted: "\(title): \(error)")
event.tags = [
"request_method": error.requestMethod.name, "request_method": error.requestMethod.name,
"request_endpoint": error.requestEndpoint.description, "request_endpoint": error.requestEndpoint.description,
] ]
var extra: [String: String]?
switch error.type { switch error.type {
case .invalidRequest: case .invalidRequest:
event.tags!["error_type"] = "invalid_request" tags["error_type"] = "invalid_request"
case .invalidResponse: case .invalidResponse:
event.tags!["error_type"] = "invalid_response" tags["error_type"] = "invalid_response"
case .invalidModel(let error): case .invalidModel(let error):
event.tags!["error_type"] = "invalid_model" tags["error_type"] = "invalid_model"
event.extra = [ extra = [
"underlying_error": String(describing: error) "underlying_error": String(describing: error)
] ]
case .mastodonError(let code, let error): case .mastodonError(let code, let error):
event.tags!["error_type"] = "mastodon_error" tags["error_type"] = "mastodon_error"
event.tags!["response_code"] = "\(code)" tags["response_code"] = "\(code)"
event.extra = [ extra = [
"underlying_error": String(describing: error) "underlying_error": String(describing: error)
] ]
case .unexpectedStatus(let code): case .unexpectedStatus(let code):
event.tags!["error_type"] = "unexpected_status" tags["error_type"] = "unexpected_status"
event.tags!["response_code"] = "\(code)" tags["response_code"] = "\(code)"
default: default:
return return
} }
if let code = event.tags!["response_code"], if let code = tags["response_code"],
code == "401" || code == "403" || code == "404" || code == "422" || code == "500" || code == "502" || code == "503" { code == "401" || code == "403" || code == "404" || code == "422" || code == "500" || code == "502" || code == "503" {
return return
} }
switch mastodonController.instanceFeatures.instanceType { switch mastodonController.instanceFeatures.instanceType {
case .mastodon(let mastodonType, let mastodonVersion): case .mastodon(let mastodonType, let mastodonVersion):
event.tags!["instance_type"] = "mastodon" tags["instance_type"] = "mastodon"
event.tags!["mastodon_version"] = mastodonVersion?.description ?? "unknown" tags["mastodon_version"] = mastodonVersion?.description ?? "unknown"
switch mastodonType { switch mastodonType {
case .vanilla: case .vanilla:
break break
case .hometown(_): case .hometown(_):
event.tags!["mastodon_type"] = "hometown" tags["mastodon_type"] = "hometown"
case .glitch: case .glitch:
event.tags!["mastodon_type"] = "glitch" tags["mastodon_type"] = "glitch"
} }
case .pleroma(let pleromaType): case .pleroma(let pleromaType):
event.tags!["instance_type"] = "pleroma" tags["instance_type"] = "pleroma"
switch pleromaType { switch pleromaType {
case .vanilla(let version): case .vanilla(let version):
event.tags!["pleroma_version"] = version?.description ?? "unknown" tags["pleroma_version"] = version?.description ?? "unknown"
case .akkoma(let version): case .akkoma(let version):
event.tags!["pleroma_type"] = "akkoma" tags["pleroma_type"] = "akkoma"
event.tags!["pleroma_version"] = version?.description ?? "unknown" tags["pleroma_version"] = version?.description ?? "unknown"
} }
case .pixelfed: case .pixelfed:
event.tags!["instance_type"] = "pixelfed" tags["instance_type"] = "pixelfed"
case .gotosocial: case .gotosocial:
event.tags!["instance_type"] = "gotosocial" tags["instance_type"] = "gotosocial"
case .firefish(let calckeyVersion): case .firefish(let calckeyVersion):
event.tags!["instance_type"] = "firefish" tags["instance_type"] = "firefish"
if let calckeyVersion { if let calckeyVersion {
event.tags!["calckey_version"] = calckeyVersion tags["calckey_version"] = calckeyVersion
} }
} }
#if canImport(Sentry)
let event = Event(error: error)
event.message = SentryMessage(formatted: "\(title): \(error)")
event.tags = tags
event.extra = extra
SentrySDK.capture(event: event) SentrySDK.capture(event: event)
#endif
toastErrorLogger.error("\(title, privacy: .public): \(error), \(event.tags!.debugDescription, privacy: .public)") toastErrorLogger.error("\(title, privacy: .public): \(error), \(tags.debugDescription, privacy: .public)")
} }

3
Tusker/Views/TrendHistoryView.swift
View File

@ -24,11 +24,14 @@ class TrendHistoryView: UIView {
createLayers() createLayers()
} }
// Unneeded on visionOS, since there is no dark/light mode
#if !os(visionOS)
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection) super.traitCollectionDidChange(previousTraitCollection)
createLayers() createLayers()
} }
#endif
func setHistory(_ history: [History]?) { func setHistory(_ history: [History]?) {
if let history = history { if let history = history {