Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit ff27e21

Browse files
authored
Revert "Tabbar hide fix" (#2508)
* Revert "New Bookmarks feature that syncs to iCloud (#2483)" This reverts commit 49c2bec. * Revert "Tabbar hide fix (#2505)" This reverts commit 460403f.
1 parent 49c2bec commit ff27e21

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

Classes/View Controllers/SplitViewControllerDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class SplitViewControllerDelegate: UISplitViewControllerDelegate {
3232
let secondaryNav = secondaryViewController as? UINavigationController {
3333

3434
let collapsedControllers = secondaryNav.viewControllers.filter {
35-
35+
$0.hidesBottomBarWhenPushed = true
3636
// remove any placeholder VCs from the stack
3737
return ($0 is SplitPlaceholderViewController) == false
3838
}

FreetimeTests/SplitViewTests.swift

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -108,26 +108,8 @@ class SplitViewTests: XCTestCase {
108108
masterTab.selectedIndex = 1
109109

110110
let detailNav = UINavigationController()
111-
112-
113-
let detail1 = RepositoryViewController(
114-
client: GithubClient(userSession: nil),
115-
repo: RepositoryDetails(
116-
owner: "Foo",
117-
name: "Bar",
118-
defaultBranch: "Baz",
119-
hasIssuesEnabled: false
120-
))
121-
122-
let detail2 = IssuesViewController(
123-
client: GithubClient(userSession: nil),
124-
model: IssueDetailsModel(
125-
owner: "Foo",
126-
repo: "Bar",
127-
number: 0
128-
))
129-
130-
111+
let detail1 = UIViewController()
112+
let detail2 = UIViewController()
131113
detailNav.pushViewController(detail1, animated: false)
132114
detailNav.pushViewController(detail2, animated: false)
133115

@@ -149,13 +131,8 @@ class SplitViewTests: XCTestCase {
149131

150132
XCTAssertFalse(rightNav.viewControllers[0].hidesBottomBarWhenPushed)
151133
XCTAssertFalse(rightNav.viewControllers[1].hidesBottomBarWhenPushed)
152-
153-
// RepositoryViewController should not hide bottom bar
154-
XCTAssertTrue(!rightNav.viewControllers[2].hidesBottomBarWhenPushed)
155-
156-
// IssueViewController should not hide bottom bar
134+
XCTAssertTrue(rightNav.viewControllers[2].hidesBottomBarWhenPushed)
157135
XCTAssertTrue(rightNav.viewControllers[3].hidesBottomBarWhenPushed)
158-
159136
}
160137

161138
func test_whenCollapsing_withPlaceholderStackedOnDetail_thatVCsStackedWithoutPlaceholder() {

0 commit comments

Comments
 (0)