Compare commits
No commits in common. "27e05cc72dcc92d03096aa1168d7c36ab9a0a939" and "130da9d4ccca5559cf196014ebab626d832a62f5" have entirely different histories.
27e05cc72d
...
130da9d4cc
|
@ -2573,10 +2573,6 @@
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
SUPPORTS_MACCATALYST = YES;
|
SUPPORTS_MACCATALYST = YES;
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
|
||||||
"SWIFT_ACTIVE_COMPILATION_CONDITIONS[sdk=iphoneos15.0]" = "SDK_IOS_15 $(inherited)";
|
|
||||||
"SWIFT_ACTIVE_COMPILATION_CONDITIONS[sdk=iphonesimulator15.0]" = "SDK_IOS_15 $(inherited)";
|
|
||||||
"SWIFT_ACTIVE_COMPILATION_CONDITIONS[sdk=macosx12.0]" = "SDK_IOS_15 $(inherited)";
|
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2,6";
|
TARGETED_DEVICE_FAMILY = "1,2,6";
|
||||||
};
|
};
|
||||||
|
|
|
@ -88,10 +88,6 @@
|
||||||
argument = "-com.apple.CoreData.ConcurrencyDebug 1"
|
argument = "-com.apple.CoreData.ConcurrencyDebug 1"
|
||||||
isEnabled = "YES">
|
isEnabled = "YES">
|
||||||
</CommandLineArgument>
|
</CommandLineArgument>
|
||||||
<CommandLineArgument
|
|
||||||
argument = "-UIFocusLoopDebuggerEnabled YES"
|
|
||||||
isEnabled = "YES">
|
|
||||||
</CommandLineArgument>
|
|
||||||
</CommandLineArguments>
|
</CommandLineArguments>
|
||||||
<EnvironmentVariables>
|
<EnvironmentVariables>
|
||||||
<EnvironmentVariable
|
<EnvironmentVariable
|
||||||
|
|
|
@ -448,20 +448,6 @@ extension MainSidebarViewController: UICollectionViewDelegate {
|
||||||
sidebarDelegate?.sidebar(self, didSelectItem: item)
|
sidebarDelegate?.sidebar(self, didSelectItem: item)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@available(iOS 15.0, *)
|
|
||||||
func collectionView(_ collectionView: UICollectionView, selectionFollowsFocusForItemAt indexPath: IndexPath) -> Bool {
|
|
||||||
guard let item = dataSource.itemIdentifier(for: indexPath) else {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
// don't immediately select items that present VCs when the they're focused, only when deliberately selected
|
|
||||||
switch item {
|
|
||||||
case .tab(.compose), .addList, .addSavedHashtag, .addSavedInstance:
|
|
||||||
return false
|
|
||||||
default:
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extension MainSidebarViewController: UICollectionViewDragDelegate {
|
extension MainSidebarViewController: UICollectionViewDragDelegate {
|
||||||
|
|
|
@ -33,10 +33,6 @@ class StatusPollView: UIView {
|
||||||
private var animator: UIViewPropertyAnimator!
|
private var animator: UIViewPropertyAnimator!
|
||||||
private var currentSelectedOptionIndex: Int!
|
private var currentSelectedOptionIndex: Int!
|
||||||
|
|
||||||
var isTracking: Bool {
|
|
||||||
optionsView.isTracking
|
|
||||||
}
|
|
||||||
|
|
||||||
override func awakeFromNib() {
|
override func awakeFromNib() {
|
||||||
super.awakeFromNib()
|
super.awakeFromNib()
|
||||||
|
|
||||||
|
|
|
@ -326,11 +326,8 @@ extension TimelineStatusTableViewCell: TableViewSwipeActionProvider {
|
||||||
|
|
||||||
extension TimelineStatusTableViewCell: DraggableTableViewCell {
|
extension TimelineStatusTableViewCell: DraggableTableViewCell {
|
||||||
func dragItemsForBeginning(session: UIDragSession) -> [UIDragItem] {
|
func dragItemsForBeginning(session: UIDragSession) -> [UIDragItem] {
|
||||||
// the poll options view is tracking while the user is dragging between options
|
|
||||||
// while that's happening, don't initiate a drag
|
|
||||||
guard let status = mastodonController.persistentContainer.status(for: statusID),
|
guard let status = mastodonController.persistentContainer.status(for: statusID),
|
||||||
let accountID = mastodonController.accountInfo?.id,
|
let accountID = mastodonController.accountInfo?.id else {
|
||||||
!pollView.isTracking else {
|
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
let provider = NSItemProvider(object: status.url! as NSURL)
|
let provider = NSItemProvider(object: status.url! as NSURL)
|
||||||
|
|
Loading…
Reference in New Issue