Compare commits

..

No commits in common. "47fb0ea868c366658bb7480e738c2b0dd0fb65ac" and "b51c1c03cb3cca49092430c37687a4cda12a27cd" have entirely different histories.

21 changed files with 28 additions and 25 deletions

View File

@ -1703,7 +1703,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftUpdateCheck = 1200; LastSwiftUpdateCheck = 1200;
LastUpgradeCheck = 1250; LastUpgradeCheck = 1020;
ORGANIZATIONNAME = Shadowfacts; ORGANIZATIONNAME = Shadowfacts;
TargetAttributes = { TargetAttributes = {
D61099AA2144B0CC00432DC2 = { D61099AA2144B0CC00432DC2 = {
@ -2346,7 +2346,6 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -2409,7 +2408,6 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -2651,7 +2649,7 @@
repositoryURL = "https://github.com/microsoft/plcrashreporter"; repositoryURL = "https://github.com/microsoft/plcrashreporter";
requirement = { requirement = {
kind = upToNextMinorVersion; kind = upToNextMinorVersion;
minimumVersion = 1.8.0; minimumVersion = 1.7.0;
}; };
}; };
D6B0539D23BD2BA300A066FA /* XCRemoteSwiftPackageReference "SheetController" */ = { D6B0539D23BD2BA300A066FA /* XCRemoteSwiftPackageReference "SheetController" */ = {

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1250" LastUpgradeVersion = "1020"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -29,6 +29,8 @@
shouldUseLaunchSchemeArgsEnv = "YES"> shouldUseLaunchSchemeArgsEnv = "YES">
<Testables> <Testables>
</Testables> </Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Debug"
@ -49,6 +51,8 @@
ReferencedContainer = "container:Tusker.xcodeproj"> ReferencedContainer = "container:Tusker.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1250" LastUpgradeVersion = "1020"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/microsoft/plcrashreporter", "repositoryURL": "https://github.com/microsoft/plcrashreporter",
"state": { "state": {
"branch": null, "branch": null,
"revision": "de6b8f9db4b2a0aa859a5507550a70548e4da936", "revision": "6b7ca9a2faad6ea990ff60b0a3ee4fdf3db59150",
"version": "1.8.1" "version": "1.7.2"
} }
}, },
{ {

View File

@ -12,7 +12,7 @@ import Photos
private let reuseIdentifier = "assetCell" private let reuseIdentifier = "assetCell"
private let cameraReuseIdentifier = "showCameraCell" private let cameraReuseIdentifier = "showCameraCell"
protocol AssetCollectionViewControllerDelegate: AnyObject { protocol AssetCollectionViewControllerDelegate: class {
func shouldSelectAsset(_ asset: PHAsset) -> Bool func shouldSelectAsset(_ asset: PHAsset) -> Bool
func didSelectAssets(_ assets: [PHAsset]) func didSelectAssets(_ assets: [PHAsset])
func captureFromCamera() func captureFromCamera()

View File

@ -9,7 +9,7 @@
import UIKit import UIKit
import Photos import Photos
protocol AssetPickerViewControllerDelegate: AnyObject { protocol AssetPickerViewControllerDelegate: class {
func assetPicker(_ assetPicker: AssetPickerViewController, shouldAllowAssetOfType type: CompositionAttachmentData.AttachmentType) -> Bool func assetPicker(_ assetPicker: AssetPickerViewController, shouldAllowAssetOfType type: CompositionAttachmentData.AttachmentType) -> Bool
func assetPicker(_ assetPicker: AssetPickerViewController, didSelectAttachments attachments: [CompositionAttachmentData]) func assetPicker(_ assetPicker: AssetPickerViewController, didSelectAttachments attachments: [CompositionAttachmentData])
} }

View File

@ -9,7 +9,7 @@
import UIKit import UIKit
import PencilKit import PencilKit
protocol ComposeDrawingViewControllerDelegate: AnyObject { protocol ComposeDrawingViewControllerDelegate: class {
func composeDrawingViewControllerClose(_ drawingController: ComposeDrawingViewController) func composeDrawingViewControllerClose(_ drawingController: ComposeDrawingViewController)
func composeDrawingViewController(_ drawingController: ComposeDrawingViewController, saveDrawing drawing: PKDrawing) func composeDrawingViewController(_ drawingController: ComposeDrawingViewController, saveDrawing drawing: PKDrawing)
} }

View File

@ -11,7 +11,7 @@ import Combine
import Pachyderm import Pachyderm
import PencilKit import PencilKit
protocol ComposeHostingControllerDelegate: AnyObject { protocol ComposeHostingControllerDelegate: class {
func dismissCompose(mode: ComposeUIState.DismissMode) -> Bool func dismissCompose(mode: ComposeUIState.DismissMode) -> Bool
} }

View File

@ -8,7 +8,7 @@
import UIKit import UIKit
protocol ComposeTextViewCaretScrolling: AnyObject { protocol ComposeTextViewCaretScrolling: class {
var caretScrollPositionAnimator: UIViewPropertyAnimator? { get set } var caretScrollPositionAnimator: UIViewPropertyAnimator? { get set }
} }

View File

@ -8,7 +8,7 @@
import SwiftUI import SwiftUI
protocol ComposeUIStateDelegate: AnyObject { protocol ComposeUIStateDelegate: class {
var assetPickerDelegate: AssetPickerViewControllerDelegate? { get } var assetPickerDelegate: AssetPickerViewControllerDelegate? { get }
func dismissCompose(mode: ComposeUIState.DismissMode) func dismissCompose(mode: ComposeUIState.DismissMode)
@ -60,6 +60,6 @@ extension ComposeUIState {
} }
} }
protocol ComposeAutocompleteHandler: AnyObject { protocol ComposeAutocompleteHandler: class {
func autocomplete(with string: String) func autocomplete(with string: String)
} }

View File

@ -11,7 +11,7 @@ import Pachyderm
private let reuseIdentifier = "EmojiCell" private let reuseIdentifier = "EmojiCell"
protocol EmojiPickerCollectionViewControllerDelegate: AnyObject { protocol EmojiPickerCollectionViewControllerDelegate: class {
func selectedEmoji(_ emoji: Emoji) func selectedEmoji(_ emoji: Emoji)
} }

View File

@ -8,7 +8,7 @@
import UIKit import UIKit
protocol DraftsTableViewControllerDelegate: AnyObject { protocol DraftsTableViewControllerDelegate: class {
func draftSelectionCanceled() func draftSelectionCanceled()
func shouldSelectDraft(_ draft: Draft, completion: @escaping (Bool) -> Void) func shouldSelectDraft(_ draft: Draft, completion: @escaping (Bool) -> Void)
func draftSelected(_ draft: Draft) func draftSelected(_ draft: Draft)

View File

@ -8,7 +8,7 @@
import UIKit import UIKit
protocol FastAccountSwitcherViewControllerDelegate: AnyObject { protocol FastAccountSwitcherViewControllerDelegate: class {
func fastAccountSwitcher(_ fastAccountSwitcher: FastAccountSwitcherViewController, triggerZoneContains point: CGPoint) -> Bool func fastAccountSwitcher(_ fastAccountSwitcher: FastAccountSwitcherViewController, triggerZoneContains point: CGPoint) -> Bool
} }

View File

@ -9,7 +9,7 @@
import UIKit import UIKit
import Pachyderm import Pachyderm
protocol MainSidebarViewControllerDelegate: AnyObject { protocol MainSidebarViewControllerDelegate: class {
func sidebarRequestPresentCompose(_ sidebarViewController: MainSidebarViewController) func sidebarRequestPresentCompose(_ sidebarViewController: MainSidebarViewController)
func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item) func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item)
} }

View File

@ -7,6 +7,7 @@
// //
import UIKit import UIKit
import SwiftUI
class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate { class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {

View File

@ -10,7 +10,7 @@ import UIKit
import Combine import Combine
import Pachyderm import Pachyderm
protocol InstanceSelectorTableViewControllerDelegate: AnyObject { protocol InstanceSelectorTableViewControllerDelegate: class {
func didSelectInstance(url: URL) func didSelectInstance(url: URL)
} }

View File

@ -14,7 +14,7 @@ fileprivate let accountCell = "accountCell"
fileprivate let statusCell = "statusCell" fileprivate let statusCell = "statusCell"
fileprivate let hashtagCell = "hashtagCell" fileprivate let hashtagCell = "hashtagCell"
protocol SearchResultsViewControllerDelegate: AnyObject { protocol SearchResultsViewControllerDelegate: class {
func selectedSearchResult(account accountID: String) func selectedSearchResult(account accountID: String)
func selectedSearchResult(hashtag: Hashtag) func selectedSearchResult(hashtag: Hashtag)
func selectedSearchResult(status statusID: String) func selectedSearchResult(status statusID: String)

View File

@ -8,7 +8,7 @@
import UIKit import UIKit
protocol InstanceTimelineViewControllerDelegate: AnyObject { protocol InstanceTimelineViewControllerDelegate: class {
func didSaveInstance(url: URL) func didSaveInstance(url: URL)
func didUnsaveInstance(url: URL) func didUnsaveInstance(url: URL)
} }

View File

@ -10,7 +10,7 @@ import UIKit
import SafariServices import SafariServices
import Pachyderm import Pachyderm
protocol MenuPreviewProvider: AnyObject { protocol MenuPreviewProvider: class {
typealias PreviewProviders = (content: UIContextMenuContentPreviewProvider, actions: () -> [UIMenuElement]) typealias PreviewProviders = (content: UIContextMenuContentPreviewProvider, actions: () -> [UIMenuElement])

View File

@ -11,7 +11,7 @@ import Pachyderm
import Gifu import Gifu
import AVFoundation import AVFoundation
protocol AttachmentViewDelegate: AnyObject { protocol AttachmentViewDelegate: class {
func attachmentViewGallery(startingAt index: Int) -> GalleryViewController? func attachmentViewGallery(startingAt index: Int) -> GalleryViewController?
func attachmentViewPresent(_ vc: UIViewController, animated: Bool) func attachmentViewPresent(_ vc: UIViewController, animated: Bool)
} }

View File

@ -11,7 +11,7 @@ import Pachyderm
private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: []) private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: [])
protocol BaseEmojiLabel: AnyObject { protocol BaseEmojiLabel: class {
var emojiIdentifier: String? { get set } var emojiIdentifier: String? { get set }
var emojiRequests: [ImageCache.Request] { get set } var emojiRequests: [ImageCache.Request] { get set }
var emojiFont: UIFont { get } var emojiFont: UIFont { get }