Переглянути джерело

- 정답 날짜 입력 : 클래스 명 및 파일경로 수정

TaeHyun 8 роки тому
батько
коміт
0cdacb2412

+ 10 - 10
OneCable.xcodeproj/project.pbxproj

@@ -180,8 +180,8 @@
 		A5F267DA1E544A530096276E /* NSNetService+Util.m in Sources */ = {isa = PBXBuildFile; fileRef = A5F267D91E544A530096276E /* NSNetService+Util.m */; };
 		E2295F0B1E83857A008C5915 /* ThingsDelValveStartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2295F0A1E83857A008C5915 /* ThingsDelValveStartViewController.m */; };
 		E251A87B1E933966004A70CF /* FaqViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E251A87A1E933966004A70CF /* FaqViewController.m */; };
-		E2A21B971E9CD0720028CD9F /* DateSelectPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2A21B961E9CD0720028CD9F /* DateSelectPopupView.xib */; };
-		E2A21B9A1E9CD0C30028CD9F /* DateSelectPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A21B991E9CD0C30028CD9F /* DateSelectPopupView.m */; };
+		E2A21B971E9CD0720028CD9F /* CustomDatePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2A21B961E9CD0720028CD9F /* CustomDatePopupView.xib */; };
+		E2A21B9A1E9CD0C30028CD9F /* CustomDatePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A21B991E9CD0C30028CD9F /* CustomDatePopupView.m */; };
 		E2A252121E7F540700B3D007 /* CertificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A252091E7F540700B3D007 /* CertificationViewController.m */; };
 		E2A252131E7F540700B3D007 /* IDSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A2520B1E7F540700B3D007 /* IDSetViewController.m */; };
 		E2A252141E7F540700B3D007 /* JoinFinishViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A2520D1E7F540700B3D007 /* JoinFinishViewController.m */; };
@@ -529,9 +529,9 @@
 		E2295F0A1E83857A008C5915 /* ThingsDelValveStartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveStartViewController.m; sourceTree = "<group>"; };
 		E251A8791E933966004A70CF /* FaqViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FaqViewController.h; sourceTree = "<group>"; };
 		E251A87A1E933966004A70CF /* FaqViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FaqViewController.m; sourceTree = "<group>"; };
-		E2A21B961E9CD0720028CD9F /* DateSelectPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectPopupView.xib; sourceTree = "<group>"; };
-		E2A21B981E9CD0C30028CD9F /* DateSelectPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateSelectPopupView.h; sourceTree = "<group>"; };
-		E2A21B991E9CD0C30028CD9F /* DateSelectPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateSelectPopupView.m; sourceTree = "<group>"; };
+		E2A21B961E9CD0720028CD9F /* CustomDatePopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CustomDatePopupView.xib; path = ../ViewControllers/HomeMemberScreens/CustomDatePopupView.xib; sourceTree = "<group>"; };
+		E2A21B981E9CD0C30028CD9F /* CustomDatePopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomDatePopupView.h; path = ../ViewControllers/HomeMemberScreens/CustomDatePopupView.h; sourceTree = "<group>"; };
+		E2A21B991E9CD0C30028CD9F /* CustomDatePopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomDatePopupView.m; path = ../ViewControllers/HomeMemberScreens/CustomDatePopupView.m; sourceTree = "<group>"; };
 		E2A252081E7F540700B3D007 /* CertificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CertificationViewController.h; sourceTree = "<group>"; };
 		E2A252091E7F540700B3D007 /* CertificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CertificationViewController.m; sourceTree = "<group>"; };
 		E2A2520A1E7F540700B3D007 /* IDSetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDSetViewController.h; sourceTree = "<group>"; };
@@ -808,6 +808,9 @@
 				A1BC6EC61C3E578F00D957D9 /* CustomLabelButton.h */,
 				A1BC6EC71C3E578F00D957D9 /* CustomLabelButton.m */,
 				A1BC6EC91C3E57A000D957D9 /* CustomLabelButton.xib */,
+				E2A21B981E9CD0C30028CD9F /* CustomDatePopupView.h */,
+				E2A21B991E9CD0C30028CD9F /* CustomDatePopupView.m */,
+				E2A21B961E9CD0720028CD9F /* CustomDatePopupView.xib */,
 			);
 			path = CustomUI;
 			sourceTree = "<group>";
@@ -922,9 +925,6 @@
 				A13BCF5C1C3B491400C76527 /* HomeMemberViewController.m */,
 				A13BCF591C3B491400C76527 /* HomeMemberAddViewController.h */,
 				A13BCF5A1C3B491400C76527 /* HomeMemberAddViewController.m */,
-				E2A21B981E9CD0C30028CD9F /* DateSelectPopupView.h */,
-				E2A21B991E9CD0C30028CD9F /* DateSelectPopupView.m */,
-				E2A21B961E9CD0720028CD9F /* DateSelectPopupView.xib */,
 			);
 			path = HomeMemberScreens;
 			sourceTree = "<group>";
@@ -1279,7 +1279,7 @@
 				A13BCFEE1C3B491400C76527 /* CommandClassControlView.xib in Resources */,
 				A13BCFEC1C3B491400C76527 /* CommandClassControlNodeView.xib in Resources */,
 				A13BD0621C3B491400C76527 /* ModifySecureKeyPopupView.xib in Resources */,
-				E2A21B971E9CD0720028CD9F /* DateSelectPopupView.xib in Resources */,
+				E2A21B971E9CD0720028CD9F /* CustomDatePopupView.xib in Resources */,
 				A13BD0DB1C3B563D00C76527 /* TimePickerPopupView.xib in Resources */,
 				A13BD0E01C3B563D00C76527 /* WeatherLocationPopupView.xib in Resources */,
 				A13BD08A1C3B492A00C76527 /* Things.storyboard in Resources */,
@@ -1377,7 +1377,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A13BD0691C3B491400C76527 /* ThingsAddViewController.m in Sources */,
-				E2A21B9A1E9CD0C30028CD9F /* DateSelectPopupView.m in Sources */,
+				E2A21B9A1E9CD0C30028CD9F /* CustomDatePopupView.m in Sources */,
 				A13BCFDD1C3B491400C76527 /* NSData+AESCrypt.m in Sources */,
 				A13BD01B1C3B491400C76527 /* LoginModel.m in Sources */,
 				A13BD0201C3B491400C76527 /* CypherUtil.m in Sources */,

+ 1 - 1
OneCable/Classes/ViewControllers/HomeMemberScreens/DateSelectPopupView.h

@@ -11,7 +11,7 @@
 
 @class CustomTextField;
 
-@interface DateSelectPopupView : CustomAlertView
+@interface CustomDatePopupView : CustomAlertView
 
 @property (weak, nonatomic) IBOutlet CustomTextField *txtYear;
 @property (weak, nonatomic) IBOutlet CustomTextField *txtMonth;

+ 6 - 6
OneCable/Classes/ViewControllers/HomeMemberScreens/DateSelectPopupView.m

@@ -10,21 +10,21 @@
 #import "CustomLabel.h"
 #import "CustomButton.h"
 #import "CustomTextField.h"
-#import "DateSelectPopupView.h"
+#import "CustomDatePopupView.h"
 
-@interface DateSelectPopupView () <CustomTextFieldDelegate>
+@interface CustomDatePopupView () <CustomTextFieldDelegate>
 {
     
 }
 
 @end
 
-@implementation DateSelectPopupView
+@implementation CustomDatePopupView
 
 - (id)initFromNib {
-    for (UIView *view in [CommonUtil nibViews:@"DateSelectPopupView"]) {
-        if ([view isKindOfClass:[DateSelectPopupView class]]) {
-            self = (DateSelectPopupView *)view;
+    for (UIView *view in [CommonUtil nibViews:@"CustomDatePopupView"]) {
+        if ([view isKindOfClass:[CustomDatePopupView class]]) {
+            self = (CustomDatePopupView *)view;
     
             //XIB의 경우, 현재 화면 사이즈로 맞춰줘야 함.
             self.frame = [UIScreen mainScreen].bounds;

+ 9 - 9
OneCable/Classes/ViewControllers/HomeMemberScreens/DateSelectPopupView.xib

@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="DateSelectPopupView">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="CustomDatePopupView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -86,8 +86,8 @@
                                         <mask key="constraints">
                                             <exclude reference="T24-bs-oJT"/>
                                             <exclude reference="mEA-tM-8yP"/>
-                                            <exclude reference="qcA-UM-g8G"/>
                                             <exclude reference="qGa-0j-lNQ"/>
+                                            <exclude reference="qcA-UM-g8G"/>
                                         </mask>
                                     </variation>
                                     <variation key="heightClass=regular-widthClass=compact">
@@ -97,8 +97,8 @@
                                         <mask key="constraints">
                                             <exclude reference="T24-bs-oJT"/>
                                             <include reference="mEA-tM-8yP"/>
-                                            <include reference="qcA-UM-g8G"/>
                                             <include reference="qGa-0j-lNQ"/>
+                                            <include reference="qcA-UM-g8G"/>
                                         </mask>
                                     </variation>
                                 </view>
@@ -321,14 +321,14 @@
                                     <exclude reference="OaN-i1-LEG"/>
                                 </mask>
                                 <mask key="constraints">
-                                    <exclude reference="MMt-Z7-bQp"/>
                                     <exclude reference="8kz-Pz-b2R"/>
+                                    <exclude reference="MMt-Z7-bQp"/>
                                     <exclude reference="sDp-iE-LLk"/>
                                     <exclude reference="waK-ot-Fpl"/>
-                                    <exclude reference="qX5-05-eVH"/>
-                                    <exclude reference="hYB-SG-2dp"/>
                                     <exclude reference="UXG-zG-h4v"/>
+                                    <exclude reference="hYB-SG-2dp"/>
                                     <exclude reference="mkd-RQ-Kdo"/>
+                                    <exclude reference="qX5-05-eVH"/>
                                     <exclude reference="QDE-GY-xj7"/>
                                     <exclude reference="Xyl-uE-uAD"/>
                                 </mask>
@@ -339,14 +339,14 @@
                                     <include reference="OaN-i1-LEG"/>
                                 </mask>
                                 <mask key="constraints">
-                                    <include reference="MMt-Z7-bQp"/>
                                     <include reference="8kz-Pz-b2R"/>
+                                    <include reference="MMt-Z7-bQp"/>
                                     <include reference="sDp-iE-LLk"/>
                                     <include reference="waK-ot-Fpl"/>
-                                    <include reference="qX5-05-eVH"/>
-                                    <include reference="hYB-SG-2dp"/>
                                     <include reference="UXG-zG-h4v"/>
+                                    <include reference="hYB-SG-2dp"/>
                                     <include reference="mkd-RQ-Kdo"/>
+                                    <include reference="qX5-05-eVH"/>
                                     <include reference="QDE-GY-xj7"/>
                                     <include reference="Xyl-uE-uAD"/>
                                 </mask>