summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2021-11-19 17:37:43 +0300
committerGravatar Vitaly Takmazov2021-11-19 17:37:43 +0300
commit65771b0d70a26aab2c71602390280c41b6bb6862 (patch)
tree82a3fcd6ffdad039fc4adf914591aa5e4ba1eb51
parent7b55cfa71cbbad62026b9a8781e910dfc869be57 (diff)
Initial split view integration
-rw-r--r--Juick/AppDelegate.m3
-rw-r--r--Juick/Main.storyboard60
2 files changed, 61 insertions, 2 deletions
diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index cf2099a..da72111 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -160,7 +160,8 @@
}
- (UINavigationController *) navigator {
- return [[(UINavigationController *)self.window.rootViewController viewControllers] firstObject];
+ UINavigationController *secondaryNavigationController = [(UISplitViewController *)self.window.rootViewController viewControllers][1];
+ return [[secondaryNavigationController viewControllers] firstObject];
}
- (void)presentThread:(UIViewController *)vc {
diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index dc9d8ae..6a7f2d2 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Rbr-km-xhI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Kma-c8-Z0a">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
@@ -113,6 +113,64 @@
</objects>
<point key="canvasLocation" x="1144.8" y="-117.39130434782609"/>
</scene>
+ <!--Root View Controller-->
+ <scene sceneID="xy3-Re-O1f">
+ <objects>
+ <tableViewController clearsSelectionOnViewWillAppear="NO" id="EdR-oD-q3M" sceneMemberID="viewController">
+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="knj-Bc-KM0">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ <prototypes>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="AEY-as-2qP">
+ <rect key="frame" x="0.0" y="44.5" width="375" height="43.5"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="AEY-as-2qP" id="Cq3-u0-nDX">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableViewCellContentView>
+ </tableViewCell>
+ </prototypes>
+ <connections>
+ <outlet property="dataSource" destination="EdR-oD-q3M" id="Eng-FK-usf"/>
+ <outlet property="delegate" destination="EdR-oD-q3M" id="cn9-am-VAa"/>
+ </connections>
+ </tableView>
+ <navigationItem key="navigationItem" title="Root View Controller" id="vma-Qx-Ams"/>
+ </tableViewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="ONL-Lj-g2R" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-4906" y="-1680"/>
+ </scene>
+ <!--Navigation Controller-->
+ <scene sceneID="dyM-XX-73A">
+ <objects>
+ <navigationController id="KUg-Vs-LRh" sceneMemberID="viewController">
+ <navigationBar key="navigationBar" contentMode="scaleToFill" id="DxX-72-zH9">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </navigationBar>
+ <connections>
+ <segue destination="EdR-oD-q3M" kind="relationship" relationship="rootViewController" id="VKu-Jh-Bk6"/>
+ </connections>
+ </navigationController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="vQV-xb-SGy" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-4906" y="-983"/>
+ </scene>
+ <!--Split View Controller-->
+ <scene sceneID="VxS-E6-MUX">
+ <objects>
+ <splitViewController allowDoubleColumnStyle="YES" id="Kma-c8-Z0a" sceneMemberID="viewController">
+ <connections>
+ <segue destination="KUg-Vs-LRh" kind="relationship" relationship="masterViewController" id="ZMP-BQ-sSe"/>
+ <segue destination="Rbr-km-xhI" kind="relationship" relationship="detailViewController" id="SwD-bY-wBi"/>
+ </connections>
+ </splitViewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="QCA-Hd-ygV" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-4905" y="-197"/>
+ </scene>
<!--Navigation Controller-->
<scene sceneID="fTm-5S-xsb">
<objects>