From 86f5fdf389b02a3831a7fd53bcd11c942d8f059c Mon Sep 17 00:00:00 2001
From: Monique Solanki <monique.aruna@gmail.com>
Date: Mon, 12 Nov 2018 19:12:47 -0800
Subject: [PATCH] Created view controller for Compose screen including text
 box, buttons, and content warning.

---
 Frameworks/MastodonKit               |  1 +
 Frameworks/OAuthSwift                |  1 +
 elpha-ios.xcodeproj/project.pbxproj  | 34 +++++-----
 elpha-ios/Base.lproj/Main.storyboard | 94 ++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 17 deletions(-)
 create mode 160000 Frameworks/MastodonKit
 create mode 160000 Frameworks/OAuthSwift

diff --git a/Frameworks/MastodonKit b/Frameworks/MastodonKit
new file mode 160000
index 0000000..27b48c0
--- /dev/null
+++ b/Frameworks/MastodonKit
@@ -0,0 +1 @@
+Subproject commit 27b48c037aace80440396c2d1ef79621fe694cd1
diff --git a/Frameworks/OAuthSwift b/Frameworks/OAuthSwift
new file mode 160000
index 0000000..f46548a
--- /dev/null
+++ b/Frameworks/OAuthSwift
@@ -0,0 +1 @@
+Subproject commit f46548a7d15e8d7e2c30c418373ac4bd29946efd
diff --git a/elpha-ios.xcodeproj/project.pbxproj b/elpha-ios.xcodeproj/project.pbxproj
index b56be9e..fc19a1e 100644
--- a/elpha-ios.xcodeproj/project.pbxproj
+++ b/elpha-ios.xcodeproj/project.pbxproj
@@ -15,8 +15,6 @@
 		15131EF6216DBA820092B252 /* AccountNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15131EF5216DBA820092B252 /* AccountNavigationController.swift */; };
 		151AD4D9216899AD00F07403 /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1517EA842159D72200DE80D6 /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		151AD4E621689A0F00F07403 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 157405C3215890BC00EEAAEB /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		1522EC7F2193EBCB0082C3FA /* AlamofireNetworkActivityIndicator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; };
-		1522EC802193EBCB0082C3FA /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		152734D22186DC74003DB3C8 /* TimelinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152734D12186DC74003DB3C8 /* TimelinesViewController.swift */; };
 		152FB0F8218ADC1A001D6574 /* AttachmentPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152FB0F7218ADC1A001D6574 /* AttachmentPageViewController.swift */; };
 		152FB0FA218ADDD0001D6574 /* AttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152FB0F9218ADDD0001D6574 /* AttachmentViewController.swift */; };
@@ -63,6 +61,8 @@
 		15CF7244219282AF00E6BF19 /* UITextViewFixed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15CF7243219282AF00E6BF19 /* UITextViewFixed.swift */; };
 		15F9981721629965009E58DA /* TimelineTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F9981621629965009E58DA /* TimelineTableViewController.swift */; };
 		15F998352162C0E8009E58DA /* MastodonDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F998342162C0E8009E58DA /* MastodonDataManager.swift */; };
+		EAD1445C219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; };
+		EAD1445D219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -150,13 +150,6 @@
 			remoteGlobalIDString = 4CB928431C66E1A700CE5F08;
 			remoteInfo = AlamofireNetworkActivityIndicatorTests;
 		};
-		1522EC812193EBCB0082C3FA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1522EC752193EBA10082C3FA /* AlamofireNetworkActivityIndicator.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 4CB928381C66E1A600CE5F08;
-			remoteInfo = AlamofireNetworkActivityIndicator;
-		};
 		152FBCEB219799E50079B3E8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 152FBCE7219799E50079B3E8 /* FLAnimatedImage.xcodeproj */;
@@ -220,6 +213,13 @@
 			remoteGlobalIDString = E4202FE01B667AA100C997FB;
 			remoteInfo = "Alamofire watchOS";
 		};
+		EAD1445E219A6CAF002C5338 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1522EC752193EBA10082C3FA /* AlamofireNetworkActivityIndicator.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 4CB928381C66E1A600CE5F08;
+			remoteInfo = AlamofireNetworkActivityIndicator;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -232,7 +232,7 @@
 				151AD4D9216899AD00F07403 /* AlamofireImage.framework in Embed Frameworks */,
 				152FBCEE219799FC0079B3E8 /* FLAnimatedImage.framework in Embed Frameworks */,
 				151AD4E621689A0F00F07403 /* Alamofire.framework in Embed Frameworks */,
-				1522EC802193EBCB0082C3FA /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */,
+				EAD1445D219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -304,7 +304,7 @@
 				15A79B2E215C63B6007A326E /* AlamofireImage.framework in Frameworks */,
 				152FBCED219799FC0079B3E8 /* FLAnimatedImage.framework in Frameworks */,
 				157405D1215890D700EEAAEB /* Alamofire.framework in Frameworks */,
-				1522EC7F2193EBCB0082C3FA /* AlamofireNetworkActivityIndicator.framework in Frameworks */,
+				EAD1445C219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -530,8 +530,8 @@
 			dependencies = (
 				151AD4DB216899AD00F07403 /* PBXTargetDependency */,
 				151AD4E821689A0F00F07403 /* PBXTargetDependency */,
-				1522EC822193EBCB0082C3FA /* PBXTargetDependency */,
 				152FBCF0219799FC0079B3E8 /* PBXTargetDependency */,
+				EAD1445F219A6CAF002C5338 /* PBXTargetDependency */,
 			);
 			name = "elpha-ios";
 			productName = "elpha-ios";
@@ -798,16 +798,16 @@
 			name = "Alamofire iOS";
 			targetProxy = 151AD4E721689A0F00F07403 /* PBXContainerItemProxy */;
 		};
-		1522EC822193EBCB0082C3FA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = AlamofireNetworkActivityIndicator;
-			targetProxy = 1522EC812193EBCB0082C3FA /* PBXContainerItemProxy */;
-		};
 		152FBCF0219799FC0079B3E8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = FLAnimatedImage;
 			targetProxy = 152FBCEF219799FC0079B3E8 /* PBXContainerItemProxy */;
 		};
+		EAD1445F219A6CAF002C5338 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = AlamofireNetworkActivityIndicator;
+			targetProxy = EAD1445E219A6CAF002C5338 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
diff --git a/elpha-ios/Base.lproj/Main.storyboard b/elpha-ios/Base.lproj/Main.storyboard
index fcd65ba..0da517d 100644
--- a/elpha-ios/Base.lproj/Main.storyboard
+++ b/elpha-ios/Base.lproj/Main.storyboard
@@ -1059,6 +1059,100 @@
             </objects>
             <point key="canvasLocation" x="1632.8" y="-1094.3349753694581"/>
         </scene>
+        <!--View Controller-->
+        <scene sceneID="K94-uj-No4">
+            <objects>
+                <viewController id="MNp-Rq-Swn" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="NDm-1a-rKP">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Type something..." borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-y7-EDA">
+                                <rect key="frame" x="20" y="64" width="335" height="522"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Content Warning" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WUG-su-Fog">
+                                <rect key="frame" x="20" y="691" width="335" height="50"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="50" id="Wsd-wk-qNZ"/>
+                                </constraints>
+                                <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bRl-St-wBw">
+                                <rect key="frame" x="15" y="623" width="345" height="60"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p9x-bR-vKb">
+                                        <rect key="frame" x="8" y="15" width="80" height="30"/>
+                                        <state key="normal" title="Attachment">
+                                            <color key="titleColor" name="Primary"/>
+                                        </state>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YtP-mc-9ah">
+                                        <rect key="frame" x="103" y="15" width="45" height="30"/>
+                                        <state key="normal" title="GIPHY">
+                                            <color key="titleColor" name="Primary"/>
+                                        </state>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3r6-Fu-wdF">
+                                        <rect key="frame" x="306" y="15" width="31" height="30"/>
+                                        <state key="normal" title="Toot">
+                                            <color key="titleColor" name="Primary"/>
+                                        </state>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="YtP-mc-9ah" firstAttribute="centerY" secondItem="bRl-St-wBw" secondAttribute="centerY" id="8Cj-1i-Jlh"/>
+                                    <constraint firstItem="YtP-mc-9ah" firstAttribute="leading" secondItem="p9x-bR-vKb" secondAttribute="trailing" constant="15" id="MWV-Jg-4rk"/>
+                                    <constraint firstAttribute="trailing" secondItem="3r6-Fu-wdF" secondAttribute="trailing" constant="8" id="Qq0-N5-ZPl"/>
+                                    <constraint firstAttribute="height" constant="60" id="gWv-dI-qJe"/>
+                                    <constraint firstItem="p9x-bR-vKb" firstAttribute="centerY" secondItem="bRl-St-wBw" secondAttribute="centerY" id="lXI-Fi-kX0"/>
+                                    <constraint firstItem="3r6-Fu-wdF" firstAttribute="centerY" secondItem="bRl-St-wBw" secondAttribute="centerY" id="mIt-5o-KTB"/>
+                                    <constraint firstItem="p9x-bR-vKb" firstAttribute="leading" secondItem="bRl-St-wBw" secondAttribute="leading" constant="8" id="u9D-K8-ghg"/>
+                                </constraints>
+                            </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="500" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="urp-v1-YyC">
+                                <rect key="frame" x="20" y="594" width="335" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" name="Primary"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Description of content warnings." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iMd-HH-Dfv">
+                                <rect key="frame" x="20" y="749" width="335" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="iMd-HH-Dfv" firstAttribute="top" secondItem="WUG-su-Fog" secondAttribute="bottom" constant="8" id="3ET-fx-Eq6"/>
+                            <constraint firstItem="17A-fV-wOt" firstAttribute="trailing" secondItem="XJL-y7-EDA" secondAttribute="trailing" constant="20" id="9cl-YR-22N"/>
+                            <constraint firstItem="WUG-su-Fog" firstAttribute="leading" secondItem="17A-fV-wOt" secondAttribute="leading" constant="20" id="CtJ-sd-FcH"/>
+                            <constraint firstItem="17A-fV-wOt" firstAttribute="trailing" secondItem="bRl-St-wBw" secondAttribute="trailing" constant="15" id="Cxd-vT-MqH"/>
+                            <constraint firstItem="XJL-y7-EDA" firstAttribute="top" secondItem="17A-fV-wOt" secondAttribute="top" constant="20" id="G5U-KX-u09"/>
+                            <constraint firstItem="17A-fV-wOt" firstAttribute="bottom" secondItem="iMd-HH-Dfv" secondAttribute="bottom" constant="8" id="GcA-JN-wkC"/>
+                            <constraint firstItem="bRl-St-wBw" firstAttribute="leading" secondItem="17A-fV-wOt" secondAttribute="leading" constant="15" id="KAU-gs-6Uo"/>
+                            <constraint firstItem="WUG-su-Fog" firstAttribute="top" secondItem="bRl-St-wBw" secondAttribute="bottom" constant="8" id="Liy-3h-Coq"/>
+                            <constraint firstItem="17A-fV-wOt" firstAttribute="trailing" secondItem="iMd-HH-Dfv" secondAttribute="trailing" constant="20" id="O22-rm-0oM"/>
+                            <constraint firstItem="urp-v1-YyC" firstAttribute="leading" secondItem="17A-fV-wOt" secondAttribute="leading" constant="20" id="QkN-Rp-orl"/>
+                            <constraint firstItem="urp-v1-YyC" firstAttribute="top" secondItem="XJL-y7-EDA" secondAttribute="bottom" constant="8" id="VA7-Hl-Zov"/>
+                            <constraint firstItem="17A-fV-wOt" firstAttribute="trailing" secondItem="WUG-su-Fog" secondAttribute="trailing" constant="20" id="aPC-Uo-01w"/>
+                            <constraint firstItem="bRl-St-wBw" firstAttribute="top" secondItem="urp-v1-YyC" secondAttribute="bottom" constant="8" id="hrG-7p-JA7"/>
+                            <constraint firstItem="iMd-HH-Dfv" firstAttribute="leading" secondItem="17A-fV-wOt" secondAttribute="leading" constant="20" id="meg-sw-z4I"/>
+                            <constraint firstItem="XJL-y7-EDA" firstAttribute="leading" secondItem="17A-fV-wOt" secondAttribute="leading" constant="20" id="mzo-aG-HWn"/>
+                            <constraint firstItem="17A-fV-wOt" firstAttribute="trailing" secondItem="urp-v1-YyC" secondAttribute="trailing" constant="20" id="zIl-fU-EGY"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="17A-fV-wOt"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Wh6-Fa-5O1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2436" y="-762.5615763546798"/>
+        </scene>
         <!--Timeline-->
         <scene sceneID="jGL-v8-K0I">
             <objects>