Skip to content
This repository was archived by the owner on Oct 30, 2024. It is now read-only.

Commit 43cbc14

Browse files
committed
Fixed iOS 14 triple pane layout bugs
1 parent 4ecfc66 commit 43cbc14

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,33 +65,46 @@
6565
debugServiceExtension = "internal"
6666
allowLocationSimulation = "YES"
6767
notificationPayloadFile = "Slide for Apple Watch Extension/PushNotificationPayload.apns">
68-
<BuildableProductRunnable
69-
runnableDebuggingMode = "0">
68+
<RemoteRunnable
69+
runnableDebuggingMode = "2"
70+
BundleIdentifier = "com.apple.Carousel"
71+
RemotePath = "/Slide for Reddit">
7072
<BuildableReference
7173
BuildableIdentifier = "primary"
7274
BlueprintIdentifier = "BE20851021588F3900D8F33C"
7375
BuildableName = "Slide for Apple Watch.app"
7476
BlueprintName = "Slide for Apple Watch"
7577
ReferencedContainer = "container:Slide for Reddit.xcodeproj">
7678
</BuildableReference>
77-
</BuildableProductRunnable>
79+
</RemoteRunnable>
7880
</LaunchAction>
7981
<ProfileAction
8082
buildConfiguration = "Release"
8183
shouldUseLaunchSchemeArgsEnv = "YES"
8284
savedToolIdentifier = ""
8385
useCustomWorkingDirectory = "NO"
8486
debugDocumentVersioning = "YES">
85-
<BuildableProductRunnable
86-
runnableDebuggingMode = "0">
87+
<RemoteRunnable
88+
runnableDebuggingMode = "2"
89+
BundleIdentifier = "com.apple.Carousel"
90+
RemotePath = "/Slide for Reddit">
8791
<BuildableReference
8892
BuildableIdentifier = "primary"
8993
BlueprintIdentifier = "BE20851021588F3900D8F33C"
9094
BuildableName = "Slide for Apple Watch.app"
9195
BlueprintName = "Slide for Apple Watch"
9296
ReferencedContainer = "container:Slide for Reddit.xcodeproj">
9397
</BuildableReference>
94-
</BuildableProductRunnable>
98+
</RemoteRunnable>
99+
<MacroExpansion>
100+
<BuildableReference
101+
BuildableIdentifier = "primary"
102+
BlueprintIdentifier = "BE20851021588F3900D8F33C"
103+
BuildableName = "Slide for Apple Watch.app"
104+
BlueprintName = "Slide for Apple Watch"
105+
ReferencedContainer = "container:Slide for Reddit.xcodeproj">
106+
</BuildableReference>
107+
</MacroExpansion>
95108
</ProfileAction>
96109
<AnalyzeAction
97110
buildConfiguration = "Debug">

Slide for Reddit/PagingCommentViewController.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ class PagingCommentViewController: ColorMuxPagingViewController, UIPageViewContr
7676

7777
submissionDataSource.delegate = self
7878

79-
self.splitViewController?.presentsWithGesture = false
79+
if #available(iOS 14, *) { } else {
80+
self.splitViewController?.presentsWithGesture = false
81+
}
8082
}
8183

8284
var first = true

Slide for Reddit/SingleSubredditViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class SingleSubredditViewController: MediaViewController, AutoplayScrollViewDele
189189
CachedTitle.titles.removeAll()
190190

191191
if UIDevice.current.userInterfaceIdiom == .pad && SettingValues.appMode == .SPLIT && !UIApplication.shared.isSplitOrSlideOver && !(splitViewController?.viewControllers[(splitViewController?.viewControllers.count ?? 1) - 1] is PlaceholderViewController) {
192-
splitViewController?.showDetailViewController(PlaceholderViewController(), sender: self)
192+
splitViewController?.showDetailViewController(SwipeForwardNavigationController(rootViewController: PlaceholderViewController()), sender: self)
193193
}
194194

195195
flowLayout.delegate = self

0 commit comments

Comments
 (0)