Skip to content

Commit

Permalink
Merge pull request #184 from Sopt-Mongle/feature/#180
Browse files Browse the repository at this point in the history
버그들 고침
  • Loading branch information
qodhrkawk authored Nov 25, 2020
2 parents d4985eb + 2d8e715 commit 7551d1a
Show file tree
Hide file tree
Showing 10 changed files with 197 additions and 160 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
"images" : [
{
"filename" : "onboarding1Bg.png",
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"idiom" : "universal"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
109 changes: 53 additions & 56 deletions Mongle/Mongle/Resource/Storyboard/LogIn.storyboard

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions Mongle/Mongle/Resource/Storyboard/OnboardingFirst.storyboard
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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"/>
Expand All @@ -18,7 +17,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<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"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
</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"/>
Expand Down Expand Up @@ -53,7 +52,7 @@
<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 firstAttribute="bottom" secondItem="LWw-TQ-Bkp" secondAttribute="bottom" constant="293" id="xEU-Os-qWf"/>
<constraint firstAttribute="bottom" secondItem="LWw-TQ-Bkp" secondAttribute="bottom" 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>
Expand Down
4 changes: 2 additions & 2 deletions Mongle/Mongle/Resource/Storyboard/SignUp.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@
<constraint firstAttribute="height" constant="45" id="dCu-29-aXB"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES" textContentType="one-time-code"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES" textContentType="new-password"/>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="prR-4h-Jdw">
<rect key="frame" x="28" y="226" width="319" height="48"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="sAc-w4-qJ4"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES" textContentType="one-time-code"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES" textContentType="new-password"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="닉네임" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fla-zP-bL1">
<rect key="frame" x="28" y="308" width="39" height="18"/>
Expand Down
2 changes: 1 addition & 1 deletion Mongle/Mongle/Source/VCs/OnboardingFirstVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class OnboardingFirstVC: UIViewController {
mongleImage.image = UIImage(named: "onboarding1ImgMongle")

mentImage.image = UIImage(named: "onboarding1Text")
backgroundImage.contentMode = .scaleToFill

backgroundBottom.constant = 293*deviceBound
mentTopConstraint.constant = 116*deviceBound
bookBottom.constant = 293*deviceBound
mongleBottom.constant = 237*deviceBound
Expand Down
3 changes: 2 additions & 1 deletion Mongle/Mongle/Source/VCs/SignUpVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,9 @@ class SignUpVC: UIViewController, UITextFieldDelegate {

passWordTextField.disableAutoFill()
passWordTextField2.disableAutoFill()
// passWordTextField.textContentType = .emailAddress



}

Expand Down
Loading

0 comments on commit 7551d1a

Please sign in to comment.