diff options
Diffstat (limited to 'Juick')
| -rw-r--r-- | Juick/Main.storyboard | 83 | ||||
| -rw-r--r-- | Juick/ViewControllers/ThreadViewController.m | 3 |
2 files changed, 51 insertions, 35 deletions
diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard index 2438017..1ab86fe 100644 --- a/Juick/Main.storyboard +++ b/Juick/Main.storyboard @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="XnR-Hh-t65"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="XnR-Hh-t65"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -20,14 +18,14 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="messageCell" id="6fG-tI-4kH"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6fG-tI-4kH" id="ifl-hK-faj"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="347.5" height="43.5"/> <autoresizingMask key="autoresizingMask"/> </tableViewCellContentView> <connections> - <segue destination="rr1-jx-MLx" kind="push" identifier="replySegue" id="gw8-QZ-Hrt"/> + <segue destination="mKa-Ib-r2p" kind="modal" identifier="replySegue" id="gw8-QZ-Hrt"/> </connections> </tableViewCell> </prototypes> @@ -48,7 +46,7 @@ <navigationController id="k3X-uv-0IF" sceneMemberID="viewController"> <tabBarItem key="tabBarItem" title="Today" image="ei-clock" id="Qml-qG-fK2"/> <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="3ze-yo-W7s"> - <rect key="frame" x="0.0" y="20" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <color key="barTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </navigationBar> @@ -71,10 +69,10 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="prototypeMessage" id="Orz-mD-PnE"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Orz-mD-PnE" id="WRd-ev-Osb"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="347.5" height="43.5"/> <autoresizingMask key="autoresizingMask"/> </tableViewCellContentView> </tableViewCell> @@ -89,7 +87,7 @@ <navigationItem key="navigationItem" id="M2f-nV-K0C"> <barButtonItem key="rightBarButtonItem" image="ei-pencil" id="ovc-xl-vHA"> <connections> - <segue destination="rr1-jx-MLx" kind="push" identifier="newPostSegue" id="vj1-M0-h6U"/> + <segue destination="mKa-Ib-r2p" kind="modal" identifier="newPostSegue" id="vj1-M0-h6U"/> </connections> </barButtonItem> </navigationItem> @@ -107,7 +105,7 @@ <navigationController id="J8f-Vc-5Bc" sceneMemberID="viewController"> <navigationItem key="navigationItem" id="6ON-aU-Q8N"/> <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="ePy-kG-WvK"> - <rect key="frame" x="0.0" y="20" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <connections> @@ -123,24 +121,23 @@ <objects> <viewController id="4g9-hM-bzq" customClass="LoginViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="ak5-5Q-P4e"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="647"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iqI-7F-B8z"> - <rect key="frame" x="6" y="251.5" width="363" height="228"/> + <rect key="frame" x="6" y="185.5" width="363" height="332"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="7kK-2B-ICG"> - <rect key="frame" x="0.0" y="0.0" width="363" height="228"/> + <rect key="frame" x="0.0" y="0.0" width="363" height="332"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" axis="vertical" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="6Df-q8-WGI"> - <rect key="frame" x="12" y="12" width="339" height="204"/> + <rect key="frame" x="12" y="12" width="339" height="308"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash.png" translatesAutoresizingMaskIntoConstraints="NO" id="8jW-MS-8v7"> - <rect key="frame" x="0.0" y="0.0" width="339" height="96"/> + <rect key="frame" x="0.0" y="0.0" width="339" height="192"/> </imageView> <textField opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" verticalCompressionResistancePriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="BMn-5D-Cqa"> - <rect key="frame" x="0.0" y="120" width="339" height="30"/> - <nil key="textColor"/> + <rect key="frame" x="0.0" y="216" width="339" height="34"/> <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/> <textInputTraits key="textInputTraits" returnKeyType="next" textContentType="username"/> <userDefinedRuntimeAttributes> @@ -151,8 +148,7 @@ </connections> </textField> <textField opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="xGs-fu-6K0"> - <rect key="frame" x="0.0" y="174" width="339" height="30"/> - <nil key="textColor"/> + <rect key="frame" x="0.0" y="274" width="339" height="34"/> <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/> <textInputTraits key="textInputTraits" returnKeyType="go" secureTextEntry="YES" textContentType="password"/> <userDefinedRuntimeAttributes> @@ -206,7 +202,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="profileCell" id="Tqu-K7-cUZ"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Tqu-K7-cUZ" id="7Z9-n4-t7M"> <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> @@ -231,7 +227,7 @@ <navigationController id="bqF-EV-jyA" sceneMemberID="viewController"> <tabBarItem key="tabBarItem" title="Chats" image="ei-envelope" id="uDU-Ru-VA7"/> <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="MLM-G7-sIv"> - <rect key="frame" x="0.0" y="20" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <connections> @@ -252,10 +248,10 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="notificationCell" id="KSR-Fu-ZcK" userLabel=" " customClass="ConversationCell"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="KSR-Fu-ZcK" id="BUc-6q-MYj"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="347.5" height="43.5"/> <autoresizingMask key="autoresizingMask"/> </tableViewCellContentView> <connections> @@ -282,11 +278,11 @@ <objects> <viewController title="New post" hidesBottomBarWhenPushed="YES" id="rr1-jx-MLx" customClass="NewPostViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="7ep-bO-aeZ"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="647"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="XYj-Y4-lfM"> - <rect key="frame" x="4" y="60" width="367" height="603"/> + <rect key="frame" x="4" y="52" width="367" height="591"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> @@ -325,7 +321,7 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="Pm0-3R-NV9" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="1148" y="-889"/> + <point key="canvasLocation" x="2087.1999999999998" y="-889.20539730134942"/> </scene> <!--Chat View Controller--> <scene sceneID="pvH-EU-EhQ"> @@ -337,7 +333,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="bubbleMessageCell" id="LzB-jF-bmj" customClass="BubbleMessageCell"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LzB-jF-bmj" id="GOC-84-YKd"> <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> @@ -366,7 +362,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="prototypeMessage" id="Nlo-27-7g6"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Nlo-27-7g6" id="1Ma-Fq-9gP"> <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> @@ -416,7 +412,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="prototypeMessage" id="DWy-O3-T1C"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="375" height="43.5"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DWy-O3-T1C" id="bMl-aO-eZb"> <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> @@ -442,7 +438,7 @@ <tabBarItem key="tabBarItem" title="Discover" image="ei-search" id="Hf1-fH-Ne9"/> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="HfH-EY-4C6"> - <rect key="frame" x="0.0" y="20" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <nil name="viewControllers"/> @@ -461,7 +457,7 @@ <tabBarItem key="tabBarItem" title="Discussions" image="ei-bell" id="r5a-uD-dsg"/> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="1ry-Mk-20P"> - <rect key="frame" x="0.0" y="20" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <nil name="viewControllers"/> @@ -473,6 +469,25 @@ </objects> <point key="canvasLocation" x="-3551.1999999999998" y="-857.72113943028489"/> </scene> + <!--Navigation Controller--> + <scene sceneID="tve-hL-kxy"> + <objects> + <navigationController automaticallyAdjustsScrollViewInsets="NO" id="mKa-Ib-r2p" sceneMemberID="viewController"> + <toolbarItems/> + <navigationItem key="navigationItem" id="fa1-Ul-tPD"/> + <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="REj-BU-sBp"> + <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> + <autoresizingMask key="autoresizingMask"/> + </navigationBar> + <nil name="viewControllers"/> + <connections> + <segue destination="rr1-jx-MLx" kind="relationship" relationship="rootViewController" id="8PE-Rz-Mn1"/> + </connections> + </navigationController> + <placeholder placeholderIdentifier="IBFirstResponder" id="ham-TV-jB8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="1148" y="-889.20539730134942"/> + </scene> </scenes> <resources> <image name="Splash.png" width="96" height="96"/> diff --git a/Juick/ViewControllers/ThreadViewController.m b/Juick/ViewControllers/ThreadViewController.m index 1bc820a..3ea64f7 100644 --- a/Juick/ViewControllers/ThreadViewController.m +++ b/Juick/ViewControllers/ThreadViewController.m @@ -29,7 +29,8 @@ -(void) prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { if ([segue.identifier isEqual: @"replySegue"]) { Message *msg = [self.messages objectAtIndex:[self.tableView indexPathForSelectedRow].row]; - NewPostViewController *postVC = (NewPostViewController *)segue.destinationViewController; + NewPostViewController *postVC = (NewPostViewController *)[((UINavigationController *)segue.destinationViewController) + .viewControllers firstObject]; [postVC setReplyTo:msg]; } } |