diff --git a/Natives/LauncherMenuViewController.m b/Natives/LauncherMenuViewController.m index abab188d..3f7b406f 100644 --- a/Natives/LauncherMenuViewController.m +++ b/Natives/LauncherMenuViewController.m @@ -193,12 +193,11 @@ if ([selected isKindOfClass:UIViewController.class]) { [contentNavigationController setViewControllers:@[selected] animated:NO]; //YES? - /*if (@available(iOS 14.0, tvOS 14.0, *)) { + if (@available(iOS 14.0, tvOS 14.0, *)) { selected.navigationItem.leftBarButtonItem = self.accountBtnItem; // It is unnecessary to put the toggle button as it is automated on iOS 14+ return; - }*/ - + } selected.navigationItem.leftBarButtonItems = @[self.splitViewController.displayModeButtonItem, self.accountBtnItem]; selected.navigationItem.leftItemsSupplementBackButton = true; } else { diff --git a/Natives/LauncherSplitViewController.m b/Natives/LauncherSplitViewController.m index 0a0ef945..22e61a2e 100644 --- a/Natives/LauncherSplitViewController.m +++ b/Natives/LauncherSplitViewController.m @@ -53,9 +53,11 @@ extern NSMutableDictionary *prefDict; self.preferredDisplayMode = UISplitViewControllerDisplayModeSecondaryOnly; } } - /*if (@available(iOS 14.0, tvOS 14.0, *)) { - self.preferredSplitBehavior = UISplitViewControllerSplitBehaviorOverlay; - }*/ + if (@available(iOS 14.0, tvOS 14.0, *)) { + self.preferredSplitBehavior = isPortrait ? + UISplitViewControllerSplitBehaviorOverlay : + UISplitViewControllerSplitBehaviorTile; + } } - (void)dismissViewController { diff --git a/Natives/ios_uikit_bridge.m b/Natives/ios_uikit_bridge.m index 942371a0..e0e31b60 100644 --- a/Natives/ios_uikit_bridge.m +++ b/Natives/ios_uikit_bridge.m @@ -128,10 +128,10 @@ void launchInitialViewController(UIWindow *window) { if ([getPreference(@"internal_launch_on_boot") boolValue]) { window.rootViewController = [[SurfaceViewController alloc] init]; } else { - //if (@available(iOS 14.0, tvOS 14.0, *)) { - // window.rootViewController = [[LauncherSplitViewController alloc] initWithStyle:UISplitViewControllerStyleDoubleColumn]; - //} else { + if (@available(iOS 14.0, tvOS 14.0, *)) { + window.rootViewController = [[LauncherSplitViewController alloc] initWithStyle:UISplitViewControllerStyleDoubleColumn]; + } else { window.rootViewController = [[LauncherSplitViewController alloc] init]; - //} + } } } diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car index 49a965ee..154ac9d6 100644 Binary files a/Natives/resources/Assets.car and b/Natives/resources/Assets.car differ