Merge pull request #190 from Sopt-Mongle/feature/#189

digh
Sopt-Mongle · Nov 27, 2020 · 2800de8 · 2800de8
2 parents 38525cd + c9f6932
commit 2800de8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj
@@ -1237,7 +1237,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1291,7 +1291,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -1314,7 +1314,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.09;
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1335,7 +1335,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.09;
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Mongle/Mongle/Resource/Storyboard/SignUp.storyboard b/Mongle/Mongle/Resource/Storyboard/SignUp.storyboard
@@ -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="new-password"/>
+                                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" 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="new-password"/>
+                                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" 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"/>

diff --git a/Mongle/Mongle/Source/VCs/SignUpVC.swift b/Mongle/Mongle/Source/VCs/SignUpVC.swift
@@ -421,13 +421,13 @@ class SignUpVC: UIViewController, UITextFieldDelegate {
             hideEmailWarning()
             emailTextField.setBorder(borderColor: .softGreen, borderWidth: 1.0)
         case passWordTextField:
-
+            textField.isSecureTextEntry = true
             hidePasswordWarning()
 
             comparePasswords()
             passWordTextField.setBorder(borderColor: .softGreen, borderWidth: 1.0)
         case passWordTextField2 :
-
+            textField.isSecureTextEntry = true
             passWordTextField2.setBorder(borderColor: .softGreen, borderWidth: 1.0)
         case nickNameTextField :
             hideNickNameWarning()

diff --git a/Mongle/Mongle/Source/VCs/UnderTabBarController.swift b/Mongle/Mongle/Source/VCs/UnderTabBarController.swift
@@ -73,7 +73,7 @@ class UnderTabBarController: UITabBarController {
         super.viewDidLayoutSubviews()
         if(deviceBound < 1){
             tabBar.frame.size.height = 83*deviceBound - 10
-            tabBar.frame.origin.y = view.frame.height - 83*deviceBound
+            tabBar.frame.origin.y = view.frame.height - 83*deviceBound 
             seperateLine.snp.makeConstraints{
 
                 $0.bottom.equalToSuperview().offset(-self.tabBar.frame.size.height-10)