Merge pull request #125 from Sopt-Mongle/feature/#124

scenedelegate 완성
Sopt-Mongle · Nov 13, 2020 · 84b140c · 84b140c
2 parents bbf89fe + c578e73
commit 84b140c
Show file tree

Hide file tree

Showing 49 changed files with 3,088 additions and 1,284 deletions.
diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj
@@ -147,6 +147,7 @@
 		EC148CF924BC67E7006925A0 /* 43-emoji-wink.json in Resources */ = {isa = PBXBuildFile; fileRef = EC148CF824BC67E7006925A0 /* 43-emoji-wink.json */; };
 		EC178CCC24BE26F5008CF514 /* SignUpEnd.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EC178CCB24BE26F5008CF514 /* SignUpEnd.storyboard */; };
 		EC178CCE24BE2719008CF514 /* SignUpEndVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC178CCD24BE2719008CF514 /* SignUpEndVC.swift */; };
+		EC265295255D91590043C629 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC265294255D91590043C629 /* SplashView.swift */; };
 		EC2713EA2507C9D300E4B8C3 /* SignUpAgree.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EC2713E92507C9D300E4B8C3 /* SignUpAgree.storyboard */; };
 		EC304629254ED08800DB6E4A /* ServiceAgreeForSignUp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EC304628254ED08800DB6E4A /* ServiceAgreeForSignUp.storyboard */; };
 		EC30462C254ED0AA00DB6E4A /* ServiceAgreeForSignUpVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC30462B254ED0AA00DB6E4A /* ServiceAgreeForSignUpVC.swift */; };
@@ -362,6 +363,7 @@
 		EC148CF824BC67E7006925A0 /* 43-emoji-wink.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "43-emoji-wink.json"; sourceTree = "<group>"; };
 		EC178CCB24BE26F5008CF514 /* SignUpEnd.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignUpEnd.storyboard; sourceTree = "<group>"; };
 		EC178CCD24BE2719008CF514 /* SignUpEndVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpEndVC.swift; sourceTree = "<group>"; };
+		EC265294255D91590043C629 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
 		EC2713E92507C9D300E4B8C3 /* SignUpAgree.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignUpAgree.storyboard; sourceTree = "<group>"; };
 		EC304628254ED08800DB6E4A /* ServiceAgreeForSignUp.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ServiceAgreeForSignUp.storyboard; sourceTree = "<group>"; };
 		EC30462B254ED0AA00DB6E4A /* ServiceAgreeForSignUpVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceAgreeForSignUpVC.swift; sourceTree = "<group>"; };
@@ -460,6 +462,7 @@
 				7FFEA28024BECD70003D381A /* MonglePopupView.swift */,
 				7FBFAB75255850CA0079FAC5 /* LoginRequestPopupView.swift */,
 				7FFEA28224BF4839003D381A /* ToastView.swift */,
+				EC265294255D91590043C629 /* SplashView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1078,6 +1081,7 @@
 				7FA8C4B124C0EFB900317F43 /* ThemeBookmarkData.swift in Sources */,
 				ECF391D0255826C5009337D3 /* OnboardingPVC.swift in Sources */,
 				EC7410B824BA5F1A00CBAF1C /* ThemeMakeImagesCVC.swift in Sources */,
+				EC265295255D91590043C629 /* SplashView.swift in Sources */,
 				B8F4DDF624B20FD00075FDC1 /* SearchTabMainVC.swift in Sources */,
 				7FFEA28924BF9C72003D381A /* TodaySentenceData.swift in Sources */,
 				ECA23EE024B5F5F100C100F1 /* WritingSentenceSecondVC.swift in Sources */,

diff --git a/Mongle/Mongle/AppDelegate.swift b/Mongle/Mongle/AppDelegate.swift
@@ -15,6 +15,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+
+
+
+
+
         return true
     }
 

diff --git a/Mongle/Mongle/Info.plist b/Mongle/Mongle/Info.plist
@@ -53,16 +53,12 @@
 					<string>Default Configuration</string>
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>LogIn</string>
 				</dict>
 			</array>
 		</dict>
 	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>UnderTab</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/Mongle/Mongle/Resource/Storyboard/Base.lproj/LaunchScreen.storyboard b/Mongle/Mongle/Resource/Storyboard/Base.lproj/LaunchScreen.storyboard
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,14 +16,8 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Comp 2_1.gif" translatesAutoresizingMaskIntoConstraints="NO" id="oLS-Dy-8x3">
-                                <rect key="frame" x="87" y="341" width="240" height="128"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -30,6 +26,8 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Comp 2_1.gif" width="1920" height="1080"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard b/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kJn-c1-6Jy">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

diff --git a/Mongle/Mongle/Resource/Storyboard/Onboarding.storyboard b/Mongle/Mongle/Resource/Storyboard/Onboarding.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HCh-c8-C0L">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -68,6 +68,9 @@
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="건너뛰기"/>
+                                <connections>
+                                    <action selector="jumpButtonAction:" destination="HCh-c8-C0L" eventType="touchUpInside" id="e28-fe-hft"/>
+                                </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IWU-xI-lrY">
                                 <rect key="frame" x="250" y="786" width="136" height="57"/>
@@ -102,6 +105,7 @@
                     <connections>
                         <outlet property="jumpButton" destination="fMy-34-Z2C" id="Unc-IO-J0E"/>
                         <outlet property="nextButton" destination="IWU-xI-lrY" id="D4k-id-34P"/>
+                        <outlet property="stackTopCons" destination="oDN-0G-9bP" id="oLD-8m-QpX"/>
                         <outletCollection property="circles" destination="cuK-W2-sb9" collectionClass="NSMutableArray" id="wta-Lp-iph"/>
                         <outletCollection property="circles" destination="zpM-MD-cnV" collectionClass="NSMutableArray" id="nZp-tF-0D2"/>
                         <outletCollection property="circles" destination="tok-3N-bhU" collectionClass="NSMutableArray" id="wfA-6n-PAB"/>

diff --git a/Mongle/Mongle/Resource/Storyboard/OnboardingFirst.storyboard b/Mongle/Mongle/Resource/Storyboard/OnboardingFirst.storyboard
@@ -17,8 +17,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LWw-TQ-Bkp">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="569"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LWw-TQ-Bkp">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="603"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="oTp-EI-NGY">
                                 <rect key="frame" x="82" y="371" width="274" height="218"/>
@@ -53,14 +53,18 @@
                             <constraint firstItem="Q9O-9B-Fzm" firstAttribute="top" secondItem="l9o-7Q-5je" secondAttribute="top" constant="116" id="kkG-d4-0cW"/>
                             <constraint firstItem="LWw-TQ-Bkp" firstAttribute="top" secondItem="l9o-7Q-5je" secondAttribute="top" id="rRI-U8-84C"/>
                             <constraint firstItem="Q9O-9B-Fzm" firstAttribute="leading" secondItem="OUy-pZ-T6k" secondAttribute="leading" constant="70" id="wvI-2N-WeA"/>
-                            <constraint firstItem="OUy-pZ-T6k" firstAttribute="bottom" secondItem="LWw-TQ-Bkp" secondAttribute="bottom" constant="293" id="xEU-Os-qWf"/>
+                            <constraint firstAttribute="bottom" secondItem="LWw-TQ-Bkp" secondAttribute="bottom" constant="293" id="xEU-Os-qWf"/>
                             <constraint firstItem="OUy-pZ-T6k" firstAttribute="trailing" secondItem="Q9O-9B-Fzm" secondAttribute="trailing" constant="69" id="zo5-Os-WqA"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="backgroundBottom" destination="xEU-Os-qWf" id="s53-53-ctC"/>
                         <outlet property="backgroundImage" destination="LWw-TQ-Bkp" id="Adk-3Q-qqR"/>
+                        <outlet property="bookBottom" destination="GGy-cf-hEb" id="Yg8-GB-moh"/>
                         <outlet property="bookImage" destination="oTp-EI-NGY" id="fvb-rR-NdD"/>
                         <outlet property="mentImage" destination="Q9O-9B-Fzm" id="tOf-yg-0iC"/>
+                        <outlet property="mentTopConstraint" destination="kkG-d4-0cW" id="6kT-P6-2cZ"/>
+                        <outlet property="mongleBottom" destination="578-1d-224" id="3c6-2k-rB3"/>
                         <outlet property="mongleImage" destination="XqO-hf-2yY" id="XJd-Bs-ssD"/>
                     </connections>
                 </viewController>
@@ -118,8 +122,11 @@
                     </view>
                     <connections>
                         <outlet property="backgroundImage" destination="QHG-yZ-MCP" id="79A-f3-ui9"/>
+                        <outlet property="curatorBottom" destination="9ul-1F-B9E" id="iPS-6y-qJn"/>
                         <outlet property="curatorImage" destination="1ZD-ap-imW" id="S4n-8f-2zR"/>
                         <outlet property="mentImage" destination="cHK-pn-T4m" id="AC5-4f-964"/>
+                        <outlet property="mentTop" destination="i3M-xJ-XYD" id="rgl-bz-SiM"/>
+                        <outlet property="mongleBottom" destination="RXn-94-6M8" id="OPb-F4-3O7"/>
                         <outlet property="mongleImage" destination="RQB-7c-1M8" id="apV-Y4-IrZ"/>
                     </connections>
                 </viewController>
@@ -177,8 +184,11 @@
                     </view>
                     <connections>
                         <outlet property="backgroundImage" destination="XPZ-9u-BCe" id="zsc-z8-axZ"/>
+                        <outlet property="bookBottom" destination="zVR-uH-LGd" id="CFD-2z-l65"/>
                         <outlet property="booksImage" destination="F6j-C0-gsc" id="fFL-Aw-yLo"/>
                         <outlet property="mentImage" destination="pM0-p5-bPf" id="iBR-ed-Odm"/>
+                        <outlet property="mentTop" destination="cDR-Zf-Ypt" id="IgP-24-JQV"/>
+                        <outlet property="mongleBottom" destination="hUI-yS-fea" id="eVJ-iY-6eT"/>
                         <outlet property="mongleImage" destination="eFa-Jb-KFU" id="CnR-MP-2hZ"/>
                     </connections>
                 </viewController>
@@ -194,7 +204,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rlC-Ej-x5V">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rlC-Ej-x5V">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="705"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ljo-Yy-sxP">
@@ -266,6 +276,8 @@
                         <outlet property="backgroundImage" destination="rlC-Ej-x5V" id="mF8-c4-KB4"/>
                         <outlet property="lookAroundButton" destination="AWN-Pm-3A4" id="hLk-Vd-yTI"/>
                         <outlet property="mentImage" destination="ljo-Yy-sxP" id="Iya-es-hU0"/>
+                        <outlet property="mentTop" destination="pEx-ey-yC9" id="CNh-qy-0N4"/>
+                        <outlet property="mongleBottomConstraint" destination="3kg-aH-7yH" id="zoh-5W-ZX3"/>
                         <outlet property="mongleContainView" destination="yVF-Rk-6pD" id="wr2-do-BBQ"/>
                         <outlet property="mongleImage" destination="aJO-UE-f0w" id="4u1-xT-ONJ"/>
                         <outlet property="mongleTopConstraint" destination="qr7-jl-gVu" id="Tj5-xB-Kjd"/>

diff --git a/Mongle/Mongle/Resource/Storyboard/SignUp.storyboard b/Mongle/Mongle/Resource/Storyboard/SignUp.storyboard
@@ -202,7 +202,10 @@
                                 </constraints>
                             </imageView>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="nut-NH-Djr">
-                                <rect key="frame" x="41.666666666666657" y="115.66666666666667" width="290" height="4"/>
+                                <rect key="frame" x="41.666666666666657" y="115.66666666666667" width="290" height="2"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="2" id="25J-pU-7Lt"/>
+                                </constraints>
                             </progressView>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="PHE-eL-YDu">
                                 <rect key="frame" x="121.66666666666669" y="663" width="132" height="19"/>
@@ -274,6 +277,7 @@
                         <outlet property="registerButton" destination="75b-aA-Vtg" id="DmH-hN-6e1"/>
                         <outlet property="scrollViewBottomConstraint" destination="iJB-KE-Azv" id="x82-dD-fxm"/>
                         <outlet property="signUpScrollView" destination="ych-rx-w6B" id="diJ-4J-emp"/>
+                        <outlet property="upperBlurHeight" destination="Vhl-Og-kec" id="90g-Vz-9BF"/>
                         <outlet property="upperBlurImageView" destination="bXD-b3-Y7y" id="qmc-ZB-cV0"/>
                     </connections>
                 </viewController>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate { @@
         func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
             // Override point for customization after application launch.
             return true
         }
@@ Expand Down @@