Skip to content

Commit 0fa86cc

Browse files
rickytanrickytan
committed
feat: merge pr rickytan#93 to fix rickytan#92; update demo
1 parent fab7d15 commit 0fa86cc

File tree

7 files changed

+144
-22
lines changed

7 files changed

+144
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.6.3
2+
3+
- fix #92, now you can use `self.navigationController.viewControllers` to access siblings
4+
15
0.6.2
26

37
- fix #96

‎Example/RTRootNavigationController.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
9C323D281F0E571100A18836 /* CHANGELOG.md in Sources */ = {isa = PBXBuildFile; fileRef = 9C323D271F0E571100A18836 /* CHANGELOG.md */; };
3434
9C7832C11D09111F00693F14 /* RTHideNavigationBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C7832C01D09111F00693F14 /* RTHideNavigationBarViewController.m */; };
3535
9C7832C41D09152900693F14 /* RTCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C7832C31D09152900693F14 /* RTCollectionViewController.m */; };
36+
9C9863FD1F32BDE400CF307B /* RTStatusHiddenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C9863FC1F32BDE400CF307B /* RTStatusHiddenViewController.m */; };
3637
F97BFC33007327C1DBBBB743 /* Pods_RTRootNavigationController_Example_RTRootNavigationController_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1328FAB25D46F943BBE265D /* Pods_RTRootNavigationController_Example_RTRootNavigationController_Tests.framework */; };
3738
/* End PBXBuildFile section */
3839

@@ -90,6 +91,8 @@
9091
9C7832C01D09111F00693F14 /* RTHideNavigationBarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTHideNavigationBarViewController.m; sourceTree = "<group>"; };
9192
9C7832C21D09152900693F14 /* RTCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCollectionViewController.h; sourceTree = "<group>"; };
9293
9C7832C31D09152900693F14 /* RTCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTCollectionViewController.m; sourceTree = "<group>"; };
94+
9C9863FB1F32BDE400CF307B /* RTStatusHiddenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTStatusHiddenViewController.h; sourceTree = "<group>"; };
95+
9C9863FC1F32BDE400CF307B /* RTStatusHiddenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTStatusHiddenViewController.m; sourceTree = "<group>"; };
9396
A1328FAB25D46F943BBE265D /* Pods_RTRootNavigationController_Example_RTRootNavigationController_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RTRootNavigationController_Example_RTRootNavigationController_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9497
A5267346A018343C32093DA1 /* Pods-RTRootNavigationController_Example-RTRootNavigationController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RTRootNavigationController_Example-RTRootNavigationController_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RTRootNavigationController_Example-RTRootNavigationController_Tests/Pods-RTRootNavigationController_Example-RTRootNavigationController_Tests.release.xcconfig"; sourceTree = "<group>"; };
9598
B930DAFF5ACFE0FF66B80F25 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
@@ -236,6 +239,8 @@
236239
6003F5A6195388D20070C39A /* RTViewController.m */,
237240
9C2994ED1D0A4D6F007722C1 /* RTWebViewController.h */,
238241
9C2994EE1D0A4D6F007722C1 /* RTWebViewController.m */,
242+
9C9863FB1F32BDE400CF307B /* RTStatusHiddenViewController.h */,
243+
9C9863FC1F32BDE400CF307B /* RTStatusHiddenViewController.m */,
239244
);
240245
name = ViewControllers;
241246
sourceTree = "<group>";
@@ -464,6 +469,7 @@
464469
6003F59E195388D20070C39A /* RTAppDelegate.m in Sources */,
465470
6003F5A7195388D20070C39A /* RTViewController.m in Sources */,
466471
9C16AF251D0957D400873B86 /* RTTableViewController.m in Sources */,
472+
9C9863FD1F32BDE400CF307B /* RTStatusHiddenViewController.m in Sources */,
467473
9C7832C11D09111F00693F14 /* RTHideNavigationBarViewController.m in Sources */,
468474
9C16AF281D095EC700873B86 /* RTStaticTableViewController.m in Sources */,
469475
9C16AF221D09551E00873B86 /* RTPushRemoveViewController.m in Sources */,

‎Example/RTRootNavigationController/Main.storyboard‎

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</viewController>
3232
<placeholder placeholderIdentifier="IBFirstResponder" id="Cbk-9O-dJk" userLabel="First Responder" sceneMemberID="firstResponder"/>
3333
</objects>
34-
<point key="canvasLocation" x="1287" y="-949"/>
34+
<point key="canvasLocation" x="1287" y="-1290"/>
3535
</scene>
3636
<!--Root-->
3737
<scene sceneID="vWN-Q8-ves">
@@ -61,7 +61,7 @@
6161
</subviews>
6262
</tableViewCellContentView>
6363
<connections>
64-
<segue destination="LAy-Sw-74v" kind="push" id="Ltx-RH-egV"/>
64+
<segue destination="LAy-Sw-74v" kind="show" id="Ltx-RH-egV"/>
6565
</connections>
6666
</tableViewCell>
6767
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Yq2-Yd-QQW" style="IBUITableViewCellStyleDefault" id="s3f-oo-OMj">
@@ -81,7 +81,7 @@
8181
</subviews>
8282
</tableViewCellContentView>
8383
<connections>
84-
<segue destination="Qpx-qL-0Vy" kind="push" id="5Bf-mB-c87"/>
84+
<segue destination="Qpx-qL-0Vy" kind="show" id="5Bf-mB-c87"/>
8585
</connections>
8686
</tableViewCell>
8787
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="REF-fg-WjO" style="IBUITableViewCellStyleDefault" id="cfJ-Py-m5d">
@@ -101,7 +101,7 @@
101101
</subviews>
102102
</tableViewCellContentView>
103103
<connections>
104-
<segue destination="mi0-N2-Guv" kind="push" id="y8i-Aj-KhW"/>
104+
<segue destination="mi0-N2-Guv" kind="show" id="y8i-Aj-KhW"/>
105105
</connections>
106106
</tableViewCell>
107107
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="ReS-eI-NDg" style="IBUITableViewCellStyleDefault" id="yZz-BX-r7P">
@@ -121,7 +121,7 @@
121121
</subviews>
122122
</tableViewCellContentView>
123123
<connections>
124-
<segue destination="cDS-IL-MDS" kind="push" id="dFa-qV-oFQ"/>
124+
<segue destination="cDS-IL-MDS" kind="show" id="dFa-qV-oFQ"/>
125125
</connections>
126126
</tableViewCell>
127127
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="S12-kb-85J" style="IBUITableViewCellStyleDefault" id="xGX-xQ-ZGU">
@@ -141,7 +141,7 @@
141141
</subviews>
142142
</tableViewCellContentView>
143143
<connections>
144-
<segue destination="gqE-4J-Jo2" kind="push" id="C8e-8u-cs3"/>
144+
<segue destination="gqE-4J-Jo2" kind="show" id="C8e-8u-cs3"/>
145145
</connections>
146146
</tableViewCell>
147147
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="bJ5-fE-IZc" style="IBUITableViewCellStyleDefault" id="oET-L6-JM2">
@@ -161,7 +161,7 @@
161161
</subviews>
162162
</tableViewCellContentView>
163163
<connections>
164-
<segue destination="iqv-hU-7Sn" kind="push" id="wH1-nz-BBD"/>
164+
<segue destination="iqv-hU-7Sn" kind="show" id="wH1-nz-BBD"/>
165165
</connections>
166166
</tableViewCell>
167167
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="7Vm-iB-zwC" style="IBUITableViewCellStyleDefault" id="OLD-9a-fIa">
@@ -181,7 +181,7 @@
181181
</subviews>
182182
</tableViewCellContentView>
183183
<connections>
184-
<segue destination="h6O-Eh-Am6" kind="push" id="wOV-EM-IGH"/>
184+
<segue destination="h6O-Eh-Am6" kind="show" id="wOV-EM-IGH"/>
185185
</connections>
186186
</tableViewCell>
187187
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Gyk-z1-gg3" style="IBUITableViewCellStyleDefault" id="5Ag-8k-FVj">
@@ -201,7 +201,27 @@
201201
</subviews>
202202
</tableViewCellContentView>
203203
<connections>
204-
<segue destination="UBA-dV-kX4" kind="push" id="d23-AT-fag"/>
204+
<segue destination="UBA-dV-kX4" kind="show" id="d23-AT-fag"/>
205+
</connections>
206+
</tableViewCell>
207+
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="o2O-Gj-gmX" style="IBUITableViewCellStyleDefault" id="7XC-Ed-d1T">
208+
<rect key="frame" x="0.0" y="352" width="375" height="44"/>
209+
<autoresizingMask key="autoresizingMask"/>
210+
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7XC-Ed-d1T" id="6ZL-Vh-8oo">
211+
<rect key="frame" x="0.0" y="0.0" width="342" height="44"/>
212+
<autoresizingMask key="autoresizingMask"/>
213+
<subviews>
214+
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Status hidden" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="o2O-Gj-gmX">
215+
<rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
216+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
217+
<fontDescription key="fontDescription" type="system" pointSize="16"/>
218+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
219+
<nil key="highlightedColor"/>
220+
</label>
221+
</subviews>
222+
</tableViewCellContentView>
223+
<connections>
224+
<segue destination="UYN-wJ-xlc" kind="show" id="j0M-SZ-3Rn"/>
205225
</connections>
206226
</tableViewCell>
207227
</cells>
@@ -250,7 +270,25 @@
250270
<placeholder placeholderIdentifier="IBFirstResponder" id="qFl-0S-cGH" userLabel="First Responder" sceneMemberID="firstResponder"/>
251271
<exit id="ogd-d2-OF2" userLabel="Exit" sceneMemberID="exit"/>
252272
</objects>
253-
<point key="canvasLocation" x="621" y="2611"/>
273+
<point key="canvasLocation" x="621" y="2770"/>
274+
</scene>
275+
<!--Status-->
276+
<scene sceneID="cEX-fb-JWf">
277+
<objects>
278+
<viewController storyboardIdentifier="Status" title="Status" id="UYN-wJ-xlc" customClass="RTStatusHiddenViewController" sceneMemberID="viewController">
279+
<layoutGuides>
280+
<viewControllerLayoutGuide type="top" id="urU-MP-6G3"/>
281+
<viewControllerLayoutGuide type="bottom" id="fvu-HP-dIm"/>
282+
</layoutGuides>
283+
<view key="view" contentMode="scaleToFill" id="7LQ-uD-gcL">
284+
<rect key="frame" x="0.0" y="64" width="375" height="603"/>
285+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
286+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
287+
</view>
288+
</viewController>
289+
<placeholder placeholderIdentifier="IBFirstResponder" id="VmD-n1-dcc" userLabel="First Responder" sceneMemberID="firstResponder"/>
290+
</objects>
291+
<point key="canvasLocation" x="-1521" y="1908"/>
254292
</scene>
255293
<!--Web View Controller-->
256294
<scene sceneID="G0H-v4-9JC">
@@ -314,7 +352,7 @@
314352
<constraint firstAttribute="trailing" secondItem="kGf-nV-AGC" secondAttribute="trailing" id="to3-PL-FM1"/>
315353
</constraints>
316354
<connections>
317-
<segue destination="pky-a7-Cig" kind="push" id="5eQ-hd-Sdr"/>
355+
<segue destination="pky-a7-Cig" kind="show" id="5eQ-hd-Sdr"/>
318356
</connections>
319357
</collectionViewCell>
320358
</cells>
@@ -372,7 +410,7 @@
372410
</viewController>
373411
<placeholder placeholderIdentifier="IBFirstResponder" id="iNJ-En-vdO" userLabel="First Responder" sceneMemberID="firstResponder"/>
374412
</objects>
375-
<point key="canvasLocation" x="-48" y="2611"/>
413+
<point key="canvasLocation" x="-49" y="2770"/>
376414
</scene>
377415
<!--Table-->
378416
<scene sceneID="ng5-xW-oPx">
@@ -400,7 +438,7 @@
400438
</subviews>
401439
</tableViewCellContentView>
402440
<connections>
403-
<segue destination="gaa-yb-sX8" kind="push" id="Ait-Xf-UbC"/>
441+
<segue destination="gaa-yb-sX8" kind="show" id="Ait-Xf-UbC"/>
404442
</connections>
405443
</tableViewCell>
406444
</prototypes>
@@ -499,7 +537,7 @@
499537
<constraint firstItem="IXk-cn-R54" firstAttribute="centerX" secondItem="Zuc-Qh-uV8" secondAttribute="centerX" id="kAf-OX-z6s"/>
500538
</constraints>
501539
<connections>
502-
<segue destination="gqE-4J-Jo2" kind="push" id="fgk-3y-5bQ"/>
540+
<segue destination="gqE-4J-Jo2" kind="show" id="fgk-3y-5bQ"/>
503541
</connections>
504542
</collectionViewCell>
505543
</cells>
@@ -512,7 +550,7 @@
512550
</collectionViewController>
513551
<placeholder placeholderIdentifier="IBFirstResponder" id="GM1-dt-1mn" userLabel="First Responder" sceneMemberID="firstResponder"/>
514552
</objects>
515-
<point key="canvasLocation" x="1287" y="1087"/>
553+
<point key="canvasLocation" x="1287" y="1070"/>
516554
</scene>
517555
<!--ABCD-->
518556
<scene sceneID="ibM-2x-5R6">
@@ -537,7 +575,7 @@
537575
<rect key="frame" x="170" y="324.5" width="35" height="30"/>
538576
<state key="normal" title="Push"/>
539577
<connections>
540-
<segue destination="cDS-IL-MDS" kind="push" id="IZr-he-VVi"/>
578+
<segue destination="cDS-IL-MDS" kind="show" id="IZr-he-VVi"/>
541579
</connections>
542580
</button>
543581
</subviews>
@@ -553,7 +591,7 @@
553591
</viewController>
554592
<placeholder placeholderIdentifier="IBFirstResponder" id="NaA-37-0od" userLabel="First Responder" sceneMemberID="firstResponder"/>
555593
</objects>
556-
<point key="canvasLocation" x="1287" y="373"/>
594+
<point key="canvasLocation" x="1287" y="223"/>
557595
</scene>
558596
<!--Hello World-->
559597
<scene sceneID="lIA-Iy-l6c">
@@ -586,7 +624,7 @@
586624
</viewController>
587625
<placeholder placeholderIdentifier="IBFirstResponder" id="SEE-Ej-IY9" userLabel="First Responder" sceneMemberID="firstResponder"/>
588626
</objects>
589-
<point key="canvasLocation" x="1287" y="-285"/>
627+
<point key="canvasLocation" x="1287" y="-537"/>
590628
</scene>
591629
<!--Root Navigation Controller-->
592630
<scene sceneID="eeM-SN-S2r">
@@ -619,7 +657,7 @@
619657
<image name="apple" width="151" height="151"/>
620658
</resources>
621659
<inferredMetricsTieBreakers>
622-
<segue reference="C8e-8u-cs3"/>
623660
<segue reference="IZr-he-VVi"/>
661+
<segue reference="fgk-3y-5bQ"/>
624662
</inferredMetricsTieBreakers>
625663
</document>

0 commit comments

Comments
 (0)