-- commit

kneet2.xcodeproj/project.pbxproj

@@ -996,14 +996,14 @@
 			children = (
 				A1FB17551BCF996F00FA2CF7 /* AgreementViewController.h */,
 				A1FB17561BCF996F00FA2CF7 /* AgreementViewController.m */,
+				A1EA40F01BBD2B1B00FA7ABF /* SignUpViewController.h */,
+				A1EA40F11BBD2B1B00FA7ABF /* SignUpViewController.m */,
 				A1EA40EA1BBD2B1B00FA7ABF /* NewMobileViewController.h */,
 				A1EA40EB1BBD2B1B00FA7ABF /* NewMobileViewController.m */,
 				A1EA40EC1BBD2B1B00FA7ABF /* SignUpCompleteViewController.h */,
 				A1EA40ED1BBD2B1B00FA7ABF /* SignUpCompleteViewController.m */,
 				A1EA40EE1BBD2B1B00FA7ABF /* SignUpInfoViewController.h */,
 				A1EA40EF1BBD2B1B00FA7ABF /* SignUpInfoViewController.m */,
-				A1EA40F01BBD2B1B00FA7ABF /* SignUpViewController.h */,
-				A1EA40F11BBD2B1B00FA7ABF /* SignUpViewController.m */,
 				A1EA40F41BBD2B1B00FA7ABF /* WelcomeViewController.h */,
 				A1EA40F51BBD2B1B00FA7ABF /* WelcomeViewController.m */,
 			);

kneet2/Base.lproj/HomeMember.storyboard

@@ -1063,7 +1063,7 @@
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" id="TQf-7M-vzh"/>
                                                     <constraint firstAttribute="height" constant="30" id="bvE-Yg-OAY">
-                                                        <variation key="heightClass=regular-widthClass=compact" constant="70"/>
+                                                        <variation key="heightClass=regular-widthClass=compact" constant="69"/>
                                                     </constraint>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
@@ -1086,6 +1086,24 @@
                                                     <action selector="btnSendTouched:" destination="Yr1-gT-mtB" eventType="touchUpInside" id="4G3-AI-YN6"/>
                                                 </connections>
                                             </button>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HK2-wr-JDJ" userLabel="View - line">
+                                                <rect key="frame" x="20" y="20" width="320" height="1"/>
+                                                <animations/>
+                                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="1" id="Rrh-Q5-BwS"/>
+                                                </constraints>
+                                                <variation key="default">
+                                                    <mask key="constraints">
+                                                        <exclude reference="Rrh-Q5-BwS"/>
+                                                    </mask>
+                                                </variation>
+                                                <variation key="heightClass=regular-widthClass=compact">
+                                                    <mask key="constraints">
+                                                        <include reference="Rrh-Q5-BwS"/>
+                                                    </mask>
+                                                </variation>
+                                            </view>
                                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" placeholderIntrinsicWidth="160" placeholderIntrinsicHeight="70" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qma-tS-uvo" customClass="CustomButton">
                                                 <rect key="frame" x="172" y="25" width="160" height="70"/>
                                                 <animations/>
@@ -1114,30 +1132,12 @@
                                                     <action selector="btnCancelTouched:" destination="Yr1-gT-mtB" eventType="touchUpInside" id="2NU-Uu-a4v"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HK2-wr-JDJ" userLabel="View - line">
-                                                <rect key="frame" x="20" y="20" width="320" height="1"/>
-                                                <animations/>
-                                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="1" id="Rrh-Q5-BwS"/>
-                                                </constraints>
-                                                <variation key="default">
-                                                    <mask key="constraints">
-                                                        <exclude reference="Rrh-Q5-BwS"/>
-                                                    </mask>
-                                                </variation>
-                                                <variation key="heightClass=regular-widthClass=compact">
-                                                    <mask key="constraints">
-                                                        <include reference="Rrh-Q5-BwS"/>
-                                                    </mask>
-                                                </variation>
-                                            </view>
                                         </subviews>
                                         <animations/>
                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstItem="Qma-tS-uvo" firstAttribute="leading" secondItem="IYm-QS-Q8K" secondAttribute="trailing" id="5QU-iP-ZwU">
-                                                <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
+                                                <variation key="heightClass=regular-widthClass=compact" constant="1"/>
                                             </constraint>
                                             <constraint firstAttribute="trailing" secondItem="HK2-wr-JDJ" secondAttribute="trailing" id="AUM-au-Zvn"/>
                                             <constraint firstItem="IYm-QS-Q8K" firstAttribute="height" secondItem="Qma-tS-uvo" secondAttribute="height" id="CQj-D5-twQ"/>
@@ -1147,8 +1147,12 @@
                                                 <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
                                             </constraint>
                                             <constraint firstItem="HK2-wr-JDJ" firstAttribute="top" secondItem="QUB-y1-QI4" secondAttribute="top" id="ddd-S2-gRC"/>
-                                            <constraint firstItem="IYm-QS-Q8K" firstAttribute="top" secondItem="QUB-y1-QI4" secondAttribute="top" id="iul-0N-zcG"/>
-                                            <constraint firstItem="IYm-QS-Q8K" firstAttribute="width" secondItem="Qma-tS-uvo" secondAttribute="width" id="lVo-B1-4of"/>
+                                            <constraint firstItem="IYm-QS-Q8K" firstAttribute="top" secondItem="QUB-y1-QI4" secondAttribute="top" id="iul-0N-zcG">
+                                                <variation key="heightClass=regular-widthClass=compact" constant="1"/>
+                                            </constraint>
+                                            <constraint firstItem="IYm-QS-Q8K" firstAttribute="width" secondItem="Qma-tS-uvo" secondAttribute="width" id="lVo-B1-4of">
+                                                <variation key="heightClass=regular-widthClass=compact" constant="1"/>
+                                            </constraint>
                                             <constraint firstItem="IYm-QS-Q8K" firstAttribute="leading" secondItem="QUB-y1-QI4" secondAttribute="leading" constant="-2" id="nyY-RZ-Hrh">
                                                 <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
                                             </constraint>

kneet2/Base.lproj/Main.storyboard

@@ -1612,7 +1612,7 @@
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" id="GM0-YB-RXS"/>
                                                     <constraint firstAttribute="height" constant="30" id="dZl-vm-2Z6">
-                                                        <variation key="heightClass=regular-widthClass=compact" constant="70"/>
+                                                        <variation key="heightClass=regular-widthClass=compact" constant="69"/>
                                                     </constraint>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
@@ -1666,7 +1666,9 @@
                                             <constraint firstItem="tbJ-pm-GoU" firstAttribute="leading" secondItem="Hz7-xb-Nhw" secondAttribute="leading" id="TyU-pd-gmP"/>
                                             <constraint firstAttribute="trailing" secondItem="tbJ-pm-GoU" secondAttribute="trailing" id="Uxl-El-QKg"/>
                                             <constraint firstAttribute="height" constant="70" id="f8k-HH-MjP"/>
-                                            <constraint firstItem="mAH-Qz-VYm" firstAttribute="top" secondItem="Hz7-xb-Nhw" secondAttribute="top" id="uZX-3Y-kbs"/>
+                                            <constraint firstItem="mAH-Qz-VYm" firstAttribute="top" secondItem="Hz7-xb-Nhw" secondAttribute="top" id="uZX-3Y-kbs">
+                                                <variation key="heightClass=regular-widthClass=compact" constant="1"/>
+                                            </constraint>
                                         </constraints>
                                         <variation key="default">
                                             <mask key="constraints">
@@ -2018,7 +2020,7 @@
                                                 <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="30" id="njb-L2-DXI">
-                                                        <variation key="heightClass=regular-widthClass=compact" constant="70"/>
+                                                        <variation key="heightClass=regular-widthClass=compact" constant="69"/>
                                                     </constraint>
                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" id="pwb-Hi-z0A"/>
                                                 </constraints>
@@ -2068,7 +2070,9 @@
                                             <constraint firstItem="grb-gm-MwJ" firstAttribute="top" secondItem="sBO-aa-fcd" secondAttribute="top" id="Bbc-A0-l0r"/>
                                             <constraint firstAttribute="height" constant="70" id="Jnx-YN-9Zl"/>
                                             <constraint firstItem="grb-gm-MwJ" firstAttribute="leading" secondItem="sBO-aa-fcd" secondAttribute="leading" id="RuE-8R-OqN"/>
-                                            <constraint firstItem="a2s-NZ-mzX" firstAttribute="top" secondItem="sBO-aa-fcd" secondAttribute="top" id="SgF-nZ-qEh"/>
+                                            <constraint firstItem="a2s-NZ-mzX" firstAttribute="top" secondItem="sBO-aa-fcd" secondAttribute="top" id="SgF-nZ-qEh">
+                                                <variation key="heightClass=regular-widthClass=compact" constant="1"/>
+                                            </constraint>
                                             <constraint firstItem="a2s-NZ-mzX" firstAttribute="leading" secondItem="sBO-aa-fcd" secondAttribute="leading" constant="-2" id="VGd-a6-8kP">
                                                 <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
                                             </constraint>

kneet2/Base.lproj/Settings.storyboard

@@ -148,7 +148,9 @@
                                 <constraints>
                                     <constraint firstItem="bjb-qM-OdJ" firstAttribute="top" secondItem="lVK-yN-fyh" secondAttribute="top" id="GOj-to-4xR"/>
                                     <constraint firstAttribute="height" constant="70" id="Jr6-Kc-Kgt"/>
-                                    <constraint firstItem="FTb-ke-0lJ" firstAttribute="top" secondItem="lVK-yN-fyh" secondAttribute="top" id="TrW-dC-n5p"/>
+                                    <constraint firstItem="FTb-ke-0lJ" firstAttribute="top" secondItem="lVK-yN-fyh" secondAttribute="top" id="TrW-dC-n5p">
+                                        <variation key="heightClass=regular-widthClass=compact" constant="1"/>
+                                    </constraint>
                                     <constraint firstAttribute="trailing" secondItem="bjb-qM-OdJ" secondAttribute="trailing" id="Vs0-Ea-bQO"/>
                                     <constraint firstAttribute="trailing" secondItem="FTb-ke-0lJ" secondAttribute="trailing" id="e9u-WM-vUV"/>
                                     <constraint firstItem="FTb-ke-0lJ" firstAttribute="leading" secondItem="lVK-yN-fyh" secondAttribute="leading" constant="-2" id="g2a-KV-Rnw">
@@ -221,9 +223,6 @@
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
-                                                    <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="105" y="40" width="120" height="21"/>
-                                                    </variation>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="200" placeholderIntrinsicHeight="21" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bvH-t2-fQc" customClass="CustomLabel">
                                                     <rect key="frame" x="-42" y="-21" width="42" height="21"/>
@@ -231,9 +230,6 @@
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
-                                                    <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="105" y="64" width="120" height="21"/>
-                                                    </variation>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="70" placeholderIntrinsicHeight="21" text="이름변경" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YyU-p8-ShZ" customClass="CustomLabel">
                                                     <rect key="frame" x="-42" y="-21" width="42" height="21"/>
@@ -249,8 +245,7 @@
                                                             <exclude reference="FQB-Fh-oiS"/>
                                                         </mask>
                                                     </variation>
-                                                    <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="105" y="89" width="0.0" height="21"/>
+                                                    <variation key="heightClass=regular-widthClass=compact">
                                                         <mask key="constraints">
                                                             <include reference="FQB-Fh-oiS"/>
                                                         </mask>
@@ -270,8 +265,7 @@
                                                             <exclude reference="0nm-qS-rxO"/>
                                                         </mask>
                                                     </variation>
-                                                    <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="147" y="89" width="70" height="21"/>
+                                                    <variation key="heightClass=regular-widthClass=compact">
                                                         <mask key="constraints">
                                                             <include reference="0nm-qS-rxO"/>
                                                         </mask>
@@ -320,8 +314,7 @@
                                                             <exclude reference="QZN-eb-tyV"/>
                                                         </mask>
                                                     </variation>
-                                                    <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="217" y="133" width="0.0" height="30"/>
+                                                    <variation key="heightClass=regular-widthClass=compact">
                                                         <mask key="constraints">
                                                             <include reference="QZN-eb-tyV"/>
                                                         </mask>

kneet2/Base.lproj/Things.storyboard

@@ -14,7 +14,7 @@
                         <viewControllerLayoutGuide type="bottom" id="GmQ-vK-nv0"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="6V6-bV-85k" userLabel="View - ViewController">
-                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z09-xT-S74" userLabel="View - Main">
@@ -30,7 +30,7 @@
                                                     <constraint firstAttribute="width" constant="56" id="0Ze-RO-SxF"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                                 <variation key="default">
                                                     <mask key="constraints">
@@ -84,12 +84,12 @@
                                             </mask>
                                             <mask key="constraints">
                                                 <exclude reference="oxc-Y6-2xq"/>
-                                                <exclude reference="8zZ-Ab-drp"/>
-                                                <exclude reference="Yvx-uf-tCy"/>
-                                                <exclude reference="lg7-QO-MDR"/>
                                                 <exclude reference="Lix-dJ-aRk"/>
                                                 <exclude reference="Nqk-Py-Z09"/>
                                                 <exclude reference="kiP-a2-DJw"/>
+                                                <exclude reference="8zZ-Ab-drp"/>
+                                                <exclude reference="Yvx-uf-tCy"/>
+                                                <exclude reference="lg7-QO-MDR"/>
                                             </mask>
                                         </variation>
                                         <variation key="heightClass=regular-widthClass=compact">
@@ -99,16 +99,16 @@
                                             </mask>
                                             <mask key="constraints">
                                                 <include reference="oxc-Y6-2xq"/>
-                                                <include reference="8zZ-Ab-drp"/>
-                                                <include reference="Yvx-uf-tCy"/>
-                                                <include reference="lg7-QO-MDR"/>
                                                 <include reference="Lix-dJ-aRk"/>
                                                 <include reference="Nqk-Py-Z09"/>
                                                 <include reference="kiP-a2-DJw"/>
+                                                <include reference="8zZ-Ab-drp"/>
+                                                <include reference="Yvx-uf-tCy"/>
+                                                <include reference="lg7-QO-MDR"/>
                                             </mask>
                                         </variation>
                                     </view>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="100" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="9hO-Lt-FuA">
+                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="100" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="9hO-Lt-FuA">
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="488"/>
                                         <animations/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -865,7 +865,7 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <view contentMode="scaleToFill" ambiguous="YES" placeholderIntrinsicWidth="320" placeholderIntrinsicHeight="60" translatesAutoresizingMaskIntoConstraints="NO" id="Y35-2O-7JF" userLabel="View - ButtonContainer">
+                            <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" placeholderIntrinsicWidth="320" placeholderIntrinsicHeight="60" translatesAutoresizingMaskIntoConstraints="NO" id="Y35-2O-7JF" userLabel="View - ButtonContainer">
                                 <rect key="frame" x="0.0" y="276" width="320" height="60"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" ambiguous="YES" placeholderIntrinsicWidth="160" placeholderIntrinsicHeight="60" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="58z-Pl-MlL" customClass="CustomButton">

kneet2/Classes/ViewControllers/SignUpScreens/AgreementViewController.h

@@ -8,13 +8,47 @@
 
 #import "JDViewController.h"
 
+@class KNTableViewCell;
+@class CustomLabel;
+@class CustomCheckBox;
+
 @interface AgreementViewController : JDViewController
 
 
 #pragma mark - Properties
+@property (weak, nonatomic) IBOutlet CustomTableView *tableView;
 
 
 #pragma mark - Instance Methods
 
+- (IBAction)btnNextTouched:(id)sender;
+- (IBAction)btnCancelTouched:(id)sender;
+
+@end
+
+@interface AgreementTermTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
+@property (weak, nonatomic) IBOutlet CustomCheckBox *chkAgree;
+
+@end
+
+@interface AgreementServiceTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
+@property (weak, nonatomic) IBOutlet CustomCheckBox *chkAgree;
+
+@end
+
+
+@interface AgreementAllTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomCheckBox *chkAgree;
+
+@end
+
+@interface AgreementGuideTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblGuide;
 
 @end

kneet2/Classes/ViewControllers/SignUpScreens/AgreementViewController.m

@@ -7,11 +7,47 @@
 //
 
 #import "AgreementViewController.h"
+#import "CustomLabel.h"
+#import "CustomCheckBox.h"
+#import "CustomTableView.h"
+#import "WebBrowseViewController.h"
 
+@implementation AgreementTermTableViewCell
 
-@interface AgreementViewController () {
+- (void)didMoveToSuperview {
+    [_lblTitle setUnderLine:_lblTitle.text];
+}
+
+@end
+
+@implementation AgreementServiceTableViewCell
+
+- (void)didMoveToSuperview {
+    [_lblTitle setUnderLine:_lblTitle.text];
+}
+
+@end
+
+@implementation AgreementAllTableViewCell
+
+- (void)didMoveToSuperview {
 
 }
+
+@end
+
+@implementation AgreementGuideTableViewCell
+
+- (void)didMoveToSuperview {
+    [_lblGuide setUnderLine:_lblGuide.text];
+}
+
+@end
+
+@interface AgreementViewController () <CustomCheckBoxDelegate> {
+    NSArray *_tableZombieValues;
+    CustomCheckBox *_chkTerm, *_chkService, *_chkAll;
+}
 @end
 
 
@@ -31,6 +67,9 @@
 
 - (void)initUI {
     
+    _tableZombieValues = @[@"t0", @"t1", @"t2", @"t3"];
+    
+    [self initTableViewAsDefaultStyle:_tableView];
 }
 
 - (void)prepareViewDidLoad {
@@ -39,10 +78,127 @@
 
 #pragma mark - Main Logic
 
+#pragma mark - UITableView DataSource & Delegate
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 4;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    CGFloat height = 65;
+    
+    if (indexPath.row == 2) {
+        height = 80;
+    } else if (indexPath.row == 3) {
+        height = 115;
+    }
+    
+    return height;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    UITableViewCell *cell = nil;
 
+    NSString *tzombie = _tableZombieValues[indexPath.row];
+    
+    if (indexPath.row == 0) {
+        AgreementTermTableViewCell *tcell = (AgreementTermTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"TermCellIdentifier"];
+        
+        if (!_chkTerm) {
+            _chkTerm = tcell.chkAgree;
+        }
+        
+        tcell.chkAgree.delegate = self;
+        tcell.chkAgree.value = tzombie;
+        tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
+        
+        cell = tcell;
+    } else if (indexPath.row == 1) {
+        AgreementServiceTableViewCell *tcell = (AgreementServiceTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"ServiceCellIdentifier"];
+        
+        if (!_chkService) {
+            _chkService = tcell.chkAgree;
+        }
+        
+        tcell.chkAgree.delegate = self;
+        tcell.chkAgree.value = tzombie;
+        tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
+        
+        cell = tcell;
+    } else if (indexPath.row == 2) {
+        AgreementAllTableViewCell *tcell = (AgreementAllTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"AllCellIdentifier"];
+        
+        if (!_chkAll) {
+            _chkAll = tcell.chkAgree;
+        }
+        
+        tcell.chkAgree.delegate = self;
+        tcell.chkAgree.value = tzombie;
+        tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
+        
+        cell = tcell;
+    } else if (indexPath.row == 3) {//Guide
+        AgreementGuideTableViewCell *tcell = (AgreementGuideTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"GuideCellIdentifier"];
+        cell = tcell;
+    }
+    
+    return cell;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    [super tableView:tableView didSelectRowAtIndexPath:indexPath];
+    
+    if (indexPath.row == 2 || indexPath.row == 3) {
+        return;
+    }
+    
+    WebBrowseViewController *vc = (WebBrowseViewController *)[CommonUtil instantiateViewControllerWithIdentifier:@"WebBrowseViewController" storyboardName:@"Common"];
+    if (indexPath.row == 0) {
+        vc.titleString = NSLocalizedString(@"서비스 이용약관", @"서비스 이용약관");
+        vc.URLString = [NSString stringWithFormat:@"%@/guide/service", kAPIServer];
+        
+    } else if (indexPath.row == 1) {
+        vc.titleString = NSLocalizedString(@"개인정보 취급정책", @"개인정보 취급정책");
+        vc.URLString = [NSString stringWithFormat:@"%@/guide/policy", kAPIServer];
+    }
+    
+    [self presentViewController:vc animated:YES completion:nil];
+}
+
+#pragma mark - CustomCheckBox Delegate {
+- (void)didCheckBoxClicked:(id)sender {
+    
+    if ([sender isEqual:_chkAll]) {
+        _chkTerm.checked = _chkService.checked = _chkAll.checked;
+    } else {
+        if (_chkTerm.checked && _chkService.checked) {
+            _chkAll.checked = YES;
+        } else {
+            _chkAll.checked = NO;
+        }
+    }
+}
 
 #pragma mark - UI Events
+- (IBAction)btnNextTouched:(id)sender {
+    
+    if (!_chkAll.checked) {
+        [[JDFacade facade] toast:@"모든 약관에 동의해주세요"];
+        return;
+    }
+    
+    UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"SignUpViewController" storyboardName:@"SignUp"];
+    [self presentViewController:vc animated:YES completion:nil];
+}
 
+- (IBAction)btnCancelTouched:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
 
 
 #pragma mark - MemoryWarning
@@ -52,4 +208,5 @@
     // Dispose of any resources that can be recreated.
 }
 
+
 @end

kneet2/Classes/ViewControllers/SignUpScreens/SignUpViewController.h

@@ -7,43 +7,66 @@
 //
 
 #import "JDTableViewController.h"
+#import "JDViewController.h"
+
 @class CustomTextField;
 @class CustomLabel;
 @class CustomButton;
-@class CustomCheckBox;
 
-@interface SignUpViewController : JDTableViewController
+@class KNTableViewCell;
+
+@interface SignUpViewController : JDViewController
 
 
 #pragma mark - Properties
-@property (weak, nonatomic) IBOutlet CustomTextField *txtUserName;
-@property (weak, nonatomic) IBOutlet CustomLabel *lblUserName;
 
 
-@property (weak, nonatomic) IBOutlet CustomTextField *txtUserEmail;
-@property (weak, nonatomic) IBOutlet CustomLabel *lblUserEmail;
+@property (weak, nonatomic) IBOutlet CustomButton *btnSignUp;
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+
+#pragma mark - Instance Methods
+- (IBAction)btnSignUpTouched:(id)sender;
+- (IBAction)btnCancelTouched:(id)sender;
+
+@end
+
+@interface SignUpProfileTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnProfile;
+
+@end
+
+@interface SignUpNameTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomTextField *txtName;
+
+@end
+
+@interface SignUpEmailTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomTextField *txtEmail;
+
+@end
 
+@interface SignUpPasswdTableViewCell : KNTableViewCell
 
 @property (weak, nonatomic) IBOutlet CustomTextField *txtPasswd;
-@property (weak, nonatomic) IBOutlet CustomTextField *txtPasswdConfirm;
-@property (weak, nonatomic) IBOutlet CustomLabel *lblPasswd;
 
-@property (weak, nonatomic) IBOutlet CustomLabel *lblTermUse;
-@property (weak, nonatomic) IBOutlet CustomCheckBox *chkTermUse;
+@end
 
-@property (weak, nonatomic) IBOutlet CustomLabel *lblPolicy;
-@property (weak, nonatomic) IBOutlet CustomCheckBox *chkPolicy;
 
-@property (weak, nonatomic) IBOutlet CustomLabel *lblLocation;
-@property (weak, nonatomic) IBOutlet CustomCheckBox *chkLocation;
+@interface SignUpPGuideTableViewCell : KNTableViewCell
 
-@property (weak, nonatomic) IBOutlet CustomLabel *lblMinor;
-@property (weak, nonatomic) IBOutlet CustomButton *btnMinor;
+@property (weak, nonatomic) IBOutlet CustomLabel *lblGuide;
 
-@property (weak, nonatomic) IBOutlet CustomButton *btnSignUp;
+@end
 
-#pragma mark - Instance Methods
-- (IBAction)btnSignUpTouched:(id)sender;
-- (IBAction)btnMinorTouched:(id)sender;
+@interface SignUpPasswdConfirmTableViewCell : KNTableViewCell
+
+@property (weak, nonatomic) IBOutlet CustomTextField *txtPasswdConfirm;
 
 @end
+
+
+
+

kneet2/Classes/ViewControllers/SignUpScreens/SignUpViewController.m

@@ -6,20 +6,79 @@
 //  Copyright (c) 2015 ntels. All rights reserved.
 //
 
+#import "JDObject.h"
+#import "RequestHandler.h"
+#import "JDJSONModel.h"
+
 #import "CustomLabel.h"
 #import "CustomCheckBox.h"
-
-#import "SignUpViewController.h"
-#import "JDObject.h"
 #import "CustomTextField.h"
+#import "CustomButton.h"
 #import "ValidateUtil.h"
-#import "RequestHandler.h"
-#import "JDJSONModel.h"
+
 #import "WebBrowseViewController.h"
-#import "CustomButton.h"
+#import "SignUpViewController.h"
 
-@interface SignUpViewController () {
+@implementation SignUpProfileTableViewCell
 
+@end
+
+@implementation SignUpNameTableViewCell
+
+- (void)didMoveToSuperview {
+    _txtName.placeholder = NSLocalizedString(@"이름", @"이름");
+    
+    _txtName.autoScrollUp = YES;
+    _txtName.customTextFieldSuperview = CustomTextFieldSuperviewIsViewController;
+}
+
+@end
+
+
+@implementation SignUpEmailTableViewCell
+
+- (void)didMoveToSuperview {
+    _txtEmail.placeholder = NSLocalizedString(@"이메일", @"이메일");
+    
+    _txtEmail.autoScrollUp = YES;
+    _txtEmail.customTextFieldSuperview = CustomTextFieldSuperviewIsViewController;
+}
+
+@end
+
+
+@implementation SignUpPasswdTableViewCell
+
+- (void)didMoveToSuperview {
+    _txtPasswd.placeholder = NSLocalizedString(@"비밀번호", @"비밀번호");
+    
+    _txtPasswd.autoScrollUp = YES;
+    _txtPasswd.customTextFieldSuperview = CustomTextFieldSuperviewIsViewController;
+}
+
+@end
+
+
+@implementation SignUpPGuideTableViewCell
+
+@end
+
+@implementation SignUpPasswdConfirmTableViewCell
+
+- (void)didMoveToSuperview {
+    _txtPasswdConfirm.placeholder = NSLocalizedString(@"비밀번호 확인", @"비밀번호 확인");
+    
+    _txtPasswdConfirm.autoScrollUp = YES;
+    _txtPasswdConfirm.customTextFieldSuperview = CustomTextFieldSuperviewIsViewController;
+}
+
+
+@end
+
+
+@interface SignUpViewController () {
+    CustomTextField *_txtUserName, *_txtUserEmail, *_txtPasswd, *_txtPasswdConfirm;
+    CustomButton *_btnProfile;
 }
 @end
 
@@ -45,35 +104,6 @@
 
 - (void)initUI {
     
-    
-    
-    
-    [_lblTermUse setText:NSLocalizedString(@"이용약관 동의", @"이용약관 동의")];
-    [_lblPolicy setText:NSLocalizedString(@"개인정보 취급정책 동의", @"개인정보 취급정책 동의")];
-    [_lblLocation setText:NSLocalizedString(@"위치정보 활용 동의", @"위치정보 활용 동의")];
-    [_lblMinor setText:NSLocalizedString(@"14세 미만인가요?", @"14세 미만인가요?")];
-
-    [_lblTermUse setUnderLine:_lblTermUse.text];
-    [_lblPolicy setUnderLine:_lblPolicy.text];
-    [_lblLocation setUnderLine:_lblLocation.text];
-    [_lblMinor setUnderLine:_lblMinor.text];
-
-    [_lblTermUse addTouchEventHandler:^{
-        [self showTermUse];
-    }];
-
-    [_lblPolicy addTouchEventHandler:^{
-        [self showPolicy];
-    }];
-
-    [_lblLocation addTouchEventHandler:^{
-        [self showLocation];
-    }];
-
-    [_lblMinor addTouchEventHandler:^{
-        [self showMinor];
-    }];
-
 
     _txtUserEmail.keyboardType = UIKeyboardTypeEmailAddress;
     _txtUserEmail.returnKeyType = UIReturnKeyDone;
@@ -90,15 +120,6 @@
     _txtPasswdConfirm.returnKeyType = UIReturnKeyDone;
 
     //Localization
-    _txtUserName.placeholder = NSLocalizedString(@"이름", @"이름");
-    _txtUserEmail.placeholder = NSLocalizedString(@"이메일", @"이메일");
-    _txtPasswd.placeholder = NSLocalizedString(@"비밀번호", @"비밀번호");
-    _txtPasswdConfirm.placeholder = NSLocalizedString(@"비밀번호 확인", @"비밀번호 확인");
-    
-    _lblUserName.text = NSLocalizedString(@"홈 멤버끼리는 이름으로 보여집니다", @"홈 멤버끼리는 이름으로 보여집니다");
-    _lblUserEmail.text = NSLocalizedString(@"이메일은 로그인과 비밀번호 찾기 등\n서비스 이용 인증이 필요한 경우에 사용됩니다", @"이메일은 로그인과 비밀번호 찾기 등\n서비스 이용 인증이 필요한 경우에 사용됩니다");    
-    _lblPasswd.text = NSLocalizedString(@"영어, 숫자, 특수문자 중 2가지 이상을\n사용해서 8글자 이상으로 만들어주세요", @"영어, 숫자, 특수문자 중 2가지 이상을\n사용해서 8글자 이상으로 만들어주세요");
-    
     [_btnSignUp setTitle:NSLocalizedString(@"가입하기", @"가입하기") forState:UIControlStateNormal];
 }
 
@@ -247,6 +268,9 @@
     [self requestSignUp];
 }
 
+- (IBAction)btnCancelTouched:(id)sender {
+}
+
 #pragma mark - MemoryWarning
 - (void)didReceiveMemoryWarning
 {
@@ -254,4 +278,5 @@
     // Dispose of any resources that can be recreated.
 }
 
+
 @end