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

Commit 1f03d5e

Browse files
authored
Fix flickering when navigating back (#1728)
1 parent 178d770 commit 1f03d5e

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// AppSplitViewController.swift
3+
// Freetime
4+
//
5+
// Created by Ryan Nystrom on 4/14/18.
6+
// Copyright © 2018 Ryan Nystrom. All rights reserved.
7+
//
8+
9+
import UIKit
10+
11+
final class AppSplitViewController: UISplitViewController {
12+
13+
override func viewDidLoad() {
14+
super.viewDidLoad()
15+
view.backgroundColor = .white
16+
}
17+
18+
}

Freetime.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
294B11201F7B07DD00E04F2D /* TabBarControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B111F1F7B07DD00E04F2D /* TabBarControllerDelegate.swift */; };
160160
294B11221F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */; };
161161
294B11241F7B37D300E04F2D /* ImageCellHeightCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B11231F7B37D200E04F2D /* ImageCellHeightCache.swift */; };
162+
2950AB1B2082E47200C6F19A /* AppSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */; };
162163
2957777B200129EB00DDD785 /* Int+Abbreviated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2957777A200129EB00DDD785 /* Int+Abbreviated.swift */; };
163164
295840651EE89F28007723C6 /* IssueStatusEventModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295840641EE89F28007723C6 /* IssueStatusEventModel.swift */; };
164165
295840671EE89FE4007723C6 /* IssueStatusEventCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295840661EE89FE4007723C6 /* IssueStatusEventCell.swift */; };
@@ -589,6 +590,7 @@
589590
294B111F1F7B07DD00E04F2D /* TabBarControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarControllerDelegate.swift; sourceTree = "<group>"; };
590591
294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ScrollToTop.swift"; sourceTree = "<group>"; };
591592
294B11231F7B37D200E04F2D /* ImageCellHeightCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCellHeightCache.swift; sourceTree = "<group>"; };
593+
2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSplitViewController.swift; sourceTree = "<group>"; };
592594
2957777A200129EB00DDD785 /* Int+Abbreviated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Int+Abbreviated.swift"; sourceTree = "<group>"; };
593595
295840641EE89F28007723C6 /* IssueStatusEventModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueStatusEventModel.swift; sourceTree = "<group>"; };
594596
295840661EE89FE4007723C6 /* IssueStatusEventCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueStatusEventCell.swift; sourceTree = "<group>"; };
@@ -1466,6 +1468,7 @@
14661468
297AE8681EC0D5C200B44A1F /* View Controllers */ = {
14671469
isa = PBXGroup;
14681470
children = (
1471+
2950AB1A2082E47200C6F19A /* AppSplitViewController.swift */,
14691472
29CEA5CC1F84DB1B009827DB /* BaseListViewController.swift */,
14701473
297DD5E01F061BBE006E7E63 /* CreateProfileViewController.swift */,
14711474
29316DBE1ECC95DB007CAE3F /* RootViewControllers.swift */,
@@ -1485,8 +1488,8 @@
14851488
297AE86A1EC0D5C200B44A1F /* UIViewController+LoadingIndicator.swift */,
14861489
29792B181FFB10A3007A0C57 /* UIViewController+MessageAutocompleteControllerLayoutDelegate.swift */,
14871490
292CD3D11F0DBEC000D3D57B /* UIViewController+Safari.swift */,
1488-
299F63E3205E1CAB0015D901 /* UIViewController+StyledTextViewCellDelegate.swift */,
14891491
290D2A3C1F044CB20082E6CC /* UIViewController+SmartDeselection.swift */,
1492+
299F63E3205E1CAB0015D901 /* UIViewController+StyledTextViewCellDelegate.swift */,
14901493
4920F1A71F72E27200131E9D /* UIViewController+UserActivity.swift */,
14911494
);
14921495
path = "View Controllers";
@@ -2647,6 +2650,7 @@
26472650
2930F2731F8A27750082BA26 /* WidthCache.swift in Sources */,
26482651
2971722B1F069E6B005E43AC /* SpinnerSectionController.swift in Sources */,
26492652
2999972E203120E300995FFD /* IssueMergeButtonCell.swift in Sources */,
2653+
2950AB1B2082E47200C6F19A /* AppSplitViewController.swift in Sources */,
26502654
2993046B1FBA8C04007B9737 /* IssueManagingExpansionCell.swift in Sources */,
26512655
29C33FDB1F127DBB00EC8D40 /* SplitPlaceholderViewController.swift in Sources */,
26522656
15245489205DC016005810A6 /* IssueTargetBranchCell.swift in Sources */,

Resources/Base.lproj/Main.storyboard

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="EPN-4V-9Hj">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="EPN-4V-9Hj">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
7+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
1010
<scenes>
@@ -92,10 +92,10 @@
9292
</objects>
9393
<point key="canvasLocation" x="167" y="1321"/>
9494
</scene>
95-
<!--Split View Controller-->
95+
<!--App Split View Controller-->
9696
<scene sceneID="0c8-No-DSu">
9797
<objects>
98-
<splitViewController id="EPN-4V-9Hj" sceneMemberID="viewController">
98+
<splitViewController id="EPN-4V-9Hj" customClass="AppSplitViewController" customModule="Freetime" customModuleProvider="target" sceneMemberID="viewController">
9999
<connections>
100100
<segue destination="f5k-7G-hod" kind="relationship" relationship="masterViewController" id="aFN-Se-rpt"/>
101101
<segue destination="D4E-Yy-PTN" kind="relationship" relationship="detailViewController" id="gsk-8r-3gM"/>

0 commit comments

Comments
 (0)