Prechádzať zdrojové kódy

- 설정 페이지 UI 수정
- 장치 이름변경 팝업 수정
- 신규 이미지 파일 업로드

TaeHyun 8 rokov pred
rodič
commit
5300198623

+ 22 - 0
OneCable/Assets.xcassets/images/common_bg_list_02.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "common_bg_list_02@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "common_bg_list_02@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
OneCable/Assets.xcassets/images/common_bg_list_02.imageset/common_bg_list_02@2x.png


BIN
OneCable/Assets.xcassets/images/common_bg_list_02.imageset/common_bg_list_02@3x.png


+ 22 - 0
OneCable/Assets.xcassets/images/common_bg_list_03.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "common_bg_list_03@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "common_bg_list_03@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
OneCable/Assets.xcassets/images/common_bg_list_03.imageset/common_bg_list_03@2x.png


BIN
OneCable/Assets.xcassets/images/common_bg_list_03.imageset/common_bg_list_03@3x.png


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 73 - 61
OneCable/Base.lproj/Settings.storyboard


+ 3 - 3
OneCable/Classes/ViewControllers/SettingsScreens/ChangeNamePopupView.xib

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -41,7 +41,7 @@
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_popup_bg_head" translatesAutoresizingMaskIntoConstraints="NO" id="34h-ob-myl" customClass="CustomImageView">
                                             <rect key="frame" x="0.0" y="0.0" width="270" height="56"/>
                                         </imageView>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="이름변경" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IE2-24-gHl" customClass="CustomLabel">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="이름 변경" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IE2-24-gHl" customClass="CustomLabel">
                                             <rect key="frame" x="25" y="0.0" width="245" height="56"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                             <color key="textColor" red="0.011764705882352941" green="0.60392156862745094" blue="0.87450980392156863" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

+ 1 - 1
OneCable/Classes/ViewControllers/SettingsScreens/SettingsViewController.m

@@ -26,7 +26,7 @@
 #import "ConfirmPasswdPopupView.h"
 #import "ChangeEmailPopupView.h"
 
-#define kiAccountCellHeight 504
+#define kiAccountCellHeight 473
 #define kiNotiCellHeight 137
 #define kiServiceCellHeight 143
 #define kiVersionCellHeight 103

+ 9 - 7
OneCable/Classes/ViewControllers/ThingsScreens/ModifyDeviceNamePopupView.xib

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -103,7 +103,7 @@
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_popup_bg_body" translatesAutoresizingMaskIntoConstraints="NO" id="HHK-o9-aA8">
                                             <rect key="frame" x="0.0" y="0.0" width="270" height="102"/>
                                         </imageView>
-                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" background="img_input_round_bg_default" translatesAutoresizingMaskIntoConstraints="NO" id="IfD-X3-70g" userLabel="txt - pwd" customClass="CustomTextField2">
+                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" placeholder="이름입력" textAlignment="center" minimumFontSize="17" background="img_input_round_bg_default" translatesAutoresizingMaskIntoConstraints="NO" id="IfD-X3-70g" userLabel="txt - pwd" customClass="CustomTextField2">
                                             <rect key="frame" x="25" y="35" width="220" height="32"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="32" id="SLJ-0l-P6n">
@@ -114,11 +114,11 @@
                                                 </constraint>
                                             </constraints>
                                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <textInputTraits key="textInputTraits"/>
                                             <userDefinedRuntimeAttributes>
                                                 <userDefinedRuntimeAttribute type="rect" keyPath="rectForCapBackground">
-                                                    <rect key="value" x="20" y="0.0" width="20" height="0.0"/>
+                                                    <rect key="value" x="16" y="16" width="16" height="16"/>
                                                 </userDefinedRuntimeAttribute>
                                                 <userDefinedRuntimeAttribute type="boolean" keyPath="autoScrollUp" value="YES"/>
                                             </userDefinedRuntimeAttributes>
@@ -175,7 +175,7 @@
                                     <rect key="frame" x="0.0" y="158" width="270" height="50"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" placeholderIntrinsicWidth="136" placeholderIntrinsicHeight="43" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o3L-5c-QN3" customClass="CustomButton">
-                                            <rect key="frame" x="0.0" y="0.0" width="136" height="50"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="135" height="50"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                             <state key="normal" title="취소" backgroundImage="img_popup_btn_left">
@@ -187,7 +187,7 @@
                                             </connections>
                                         </button>
                                         <button opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="136" placeholderIntrinsicHeight="43" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5YZ-ir-0oi" customClass="CustomButton">
-                                            <rect key="frame" x="134" y="0.0" width="136" height="50"/>
+                                            <rect key="frame" x="135" y="0.0" width="135" height="50"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                             <state key="normal" title="확인" backgroundImage="img_popup_btn_right">
@@ -202,8 +202,10 @@
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <constraints>
                                         <constraint firstItem="5YZ-ir-0oi" firstAttribute="top" secondItem="8M7-gg-LCe" secondAttribute="top" id="3yk-WP-LQc"/>
+                                        <constraint firstItem="o3L-5c-QN3" firstAttribute="width" secondItem="5YZ-ir-0oi" secondAttribute="width" id="7d0-xk-tEq"/>
                                         <constraint firstAttribute="trailing" secondItem="5YZ-ir-0oi" secondAttribute="trailing" id="Ds3-Zm-Tyj"/>
                                         <constraint firstAttribute="bottom" secondItem="o3L-5c-QN3" secondAttribute="bottom" id="IAK-v5-O5k"/>
+                                        <constraint firstItem="5YZ-ir-0oi" firstAttribute="leading" secondItem="o3L-5c-QN3" secondAttribute="trailing" id="NBA-8q-Sy8"/>
                                         <constraint firstAttribute="height" constant="50" id="n23-VS-7sr"/>
                                         <constraint firstItem="o3L-5c-QN3" firstAttribute="leading" secondItem="8M7-gg-LCe" secondAttribute="leading" id="t1A-gX-zEL"/>
                                         <constraint firstAttribute="bottom" secondItem="5YZ-ir-0oi" secondAttribute="bottom" id="uFr-6K-Zdz"/>