mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
75e4fb7e85
- Fixed list view stories incorrectly marked as read. - Fixed grid view wrong dates in story header. - Fixed grid view heading not matching story. - Fixed grid view showing the wrong story. - Fixed grid view duplicate stories. - Tapping grid view story heading now scrolls to show that story’s card. - Now always shows the Sites button in non-left layout, since the collapse fullscreen button doesn’t seem to work. - Fixed crash with malformed story. - Fixed loading feeds in different layouts. - And some other tweaks.
49 lines
2.2 KiB
Swift
49 lines
2.2 KiB
Swift
//
|
|
// SplitViewDelegate.swift
|
|
// NewsBlur
|
|
//
|
|
// Created by David Sinclair on 2020-08-27.
|
|
// Copyright © 2020 NewsBlur. All rights reserved.
|
|
//
|
|
|
|
import UIKit
|
|
|
|
/// Split view delegate.
|
|
class SplitViewDelegate: NSObject, UISplitViewControllerDelegate {
|
|
|
|
func splitViewController(_ svc: UISplitViewController, topColumnForCollapsingToProposedTopColumn proposedTopColumn: UISplitViewController.Column) -> UISplitViewController.Column {
|
|
if UIDevice.current.userInterfaceIdiom == .phone {
|
|
if let navController = svc.viewController(for: .secondary) as? UINavigationController, let detailController = navController.viewControllers[0] as? DetailViewController, let storyController = detailController.currentStoryController, storyController.hasStory {
|
|
return .secondary
|
|
} else {
|
|
return .primary
|
|
}
|
|
} else {
|
|
return .primary
|
|
}
|
|
}
|
|
|
|
func splitViewController(_ svc: UISplitViewController, displayModeForExpandingToProposedDisplayMode proposedDisplayMode: UISplitViewController.DisplayMode) -> UISplitViewController.DisplayMode {
|
|
if let supplementaryNav = svc.viewController(for: .supplementary) as? UINavigationController,
|
|
supplementaryNav.viewControllers.isEmpty,
|
|
let primaryNav = svc.viewController(for: .primary) as? UINavigationController,
|
|
let feedsList = primaryNav.viewControllers[0] as? FeedsViewController {
|
|
if primaryNav.viewControllers.count > 1,
|
|
let feedDetail = primaryNav.viewControllers[1] as? FeedDetailViewController {
|
|
supplementaryNav.viewControllers = [feedDetail]
|
|
} else if let feedDetail = feedsList.appDelegate.feedDetailViewController {
|
|
supplementaryNav.viewControllers = [feedDetail]
|
|
}
|
|
}
|
|
|
|
if UIDevice.current.userInterfaceIdiom == .phone, proposedDisplayMode == .twoOverSecondary {
|
|
return .oneOverSecondary
|
|
} else {
|
|
return proposedDisplayMode
|
|
}
|
|
}
|
|
|
|
func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) {
|
|
|
|
}
|
|
}
|