- Sign Up 변경사항 반영

OneCable/Classes/ViewControllers/MainScreens/LoginViewController.h

@@ -21,12 +21,17 @@
 #pragma mark - Properties
 @property (weak, nonatomic) IBOutlet CustomTextField2 *txtEmail;
 @property (weak, nonatomic) IBOutlet CustomTextField2 *txtPasswd;
+@property (weak, nonatomic) IBOutlet CustomButton *btnLogin;
+@property (weak, nonatomic) IBOutlet CustomButton *btnIdFind;
+@property (weak, nonatomic) IBOutlet CustomButton *btnPwFind;
 @property (weak, nonatomic) IBOutlet CustomImageView *imgvBg;
 
 @property (weak, nonatomic) IBOutlet CustomLabel *lblSignUp;
 @property (weak, nonatomic) IBOutlet CustomLabel *lblFindId;
 
 @property (weak, nonatomic) IBOutlet CustomCheckBox *chkAutoLogin;
+@property (weak, nonatomic) IBOutlet CustomCheckBox *chkIdSave;
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintLeftPadding;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintRightPadding;
 

OneCable/Classes/ViewControllers/MainScreens/LoginViewController.m

@@ -47,7 +47,13 @@
 }
 
 - (void)initUI {
-
+    [self.btnLogin setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnLogin setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnLogin setBackgroundImage:[UIImage imageNamed:@"img_btn_common_disable"] forState:UIControlStateDisabled capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    [self.lblFindId setHidden:YES];
+    
     CGRect screen = [UIScreen mainScreen].bounds;
     if (screen.size.height == 480) {//iphone4s
         [_imgvBg setImage:[UIImage imageNamed:@"img_login_bg_4inch"]];
@@ -79,14 +85,14 @@
     
     //Localization
     [_chkAutoLogin setTitle:NSLocalizedString(@"자동로그인", @"자동로그인") forState:UIControlStateNormal];
-    _txtEmail.placeholder = NSLocalizedString(@"이메일", @"이메일");
+    _txtEmail.placeholder = NSLocalizedString(@"아이디", @"아이디");
     _txtPasswd.placeholder = NSLocalizedString(@"비밀번호", @"비밀번호");
     
-    _lblSignUp.text = NSLocalizedString(@"회원가입", @"회원가입");
+    _lblSignUp.text = NSLocalizedString(@"회원가입하기", @"회원가입하기");
     _lblFindId.text = NSLocalizedString(@"아이디/비번찾기", @"아이디/비번찾기");
     
     
-    [_lblSignUp setUnderLine:_lblSignUp.text];
+//    [_lblSignUp setUnderLine:_lblSignUp.text];
     [_lblSignUp addTouchEventHandler:^(id label) {
         [self lblSignUpTouched];
     }];
@@ -369,6 +375,14 @@
     [self presentViewController:vc animated:YES completion:nil];
 }
 
+- (IBAction)btnIdFindTouched:(id)sender {
+    
+}
+- (IBAction)btnPwFindTouched:(id)sender {
+    
+}
+
+
 #pragma mark - CustomTextField
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {

OneCable/Classes/ViewControllers/SignUpScreens/AgreementViewController.h

@@ -17,9 +17,12 @@
 
 #pragma mark - Properties
 @property (weak, nonatomic) IBOutlet CustomTableView *tableView;
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
 
 
 #pragma mark - Instance Methods
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancle;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
 
 - (IBAction)btnNextTouched:(id)sender;
 - (IBAction)btnCancelTouched:(id)sender;
@@ -30,6 +33,7 @@
 
 @property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
 @property (weak, nonatomic) IBOutlet CustomCheckBox *chkAgree;
+@property (weak, nonatomic) IBOutlet CustomButton *btnDescLook;
 
 @end
 
@@ -37,9 +41,16 @@
 
 @property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
 @property (weak, nonatomic) IBOutlet CustomCheckBox *chkAgree;
+@property (weak, nonatomic) IBOutlet CustomButton *btnDescLook;
 
 @end
 
+@interface AgreementLocationTableViewCell : KNTableViewCell2
+@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
+@property (weak, nonatomic) IBOutlet CustomCheckBox *chkAgree;
+@property (weak, nonatomic) IBOutlet CustomButton *btnDescLook;
+
+@end
 
 @interface AgreementAllTableViewCell : KNTableViewCell2
 

OneCable/Classes/ViewControllers/SignUpScreens/AgreementViewController.m

@@ -15,7 +15,7 @@
 @implementation AgreementTermTableViewCell
 
 - (void)didMoveToSuperview {
-    [_lblTitle setUnderLine:_lblTitle.text];
+//    [_lblTitle setUnderLine:_lblTitle.text];
 }
 
 @end
@@ -23,7 +23,15 @@
 @implementation AgreementServiceTableViewCell
 
 - (void)didMoveToSuperview {
-    [_lblTitle setUnderLine:_lblTitle.text];
+//    [_lblTitle setUnderLine:_lblTitle.text];
+}
+
+@end
+
+@implementation AgreementLocationTableViewCell
+
+- (void)didMoveToSuperview{
+    
 }
 
 @end
@@ -46,7 +54,7 @@
 
 @interface AgreementViewController () <CustomCheckBoxDelegate> {
     NSArray *_tableZombieValues;
-    CustomCheckBox *_chkTerm, *_chkService, *_chkAll;
+    CustomCheckBox *_chkTerm, *_chkService, *_chkAll,*_chkLocation;
     BOOL _isNotFirstLoading;
 }
 @end
@@ -67,8 +75,11 @@
 
 
 - (void)initUI {
+    [self.btnCancle setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
-    _tableZombieValues = @[@"t0", @"t1", @"t2", @"t3"];
+    _tableZombieValues = @[@"t0", @"t1", @"t2", @"t3",@"t4"];
     
     [self initTableViewAsDefaultStyle:_tableView];
 }
@@ -91,17 +102,17 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 4;
+    return 5;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    CGFloat height = 65;
+    CGFloat height = 67;
     
-    if (indexPath.row == 2) {
-        height = 80;
-    } else if (indexPath.row == 3) {
-        height = 120;
-    }
+//    if (indexPath.row == 2) {
+//        height = 80;
+//    } else if (indexPath.row == 3) {
+//        height = 120;
+//    }
     
     return height;
 }
@@ -137,7 +148,22 @@
         tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
         
         cell = tcell;
-    } else if (indexPath.row == 2) {
+        
+    }else if (indexPath.row == 2) {
+        AgreementLocationTableViewCell *tcell = (AgreementLocationTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"locationCellIdentifier"];
+        
+        if (!_chkLocation) {
+            _chkLocation = tcell.chkAgree;
+        }
+        
+        tcell.chkAgree.delegate = self;
+        tcell.chkAgree.value = tzombie;
+        tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
+
+        cell = tcell;
+        
+        
+    }else if (indexPath.row == 3){
         AgreementAllTableViewCell *tcell = (AgreementAllTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"AllCellIdentifier"];
         
         if (!_chkAll) {
@@ -149,7 +175,8 @@
         tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
         
         cell = tcell;
-    } else if (indexPath.row == 3) {//Guide
+        
+    }else if (indexPath.row == 4) {//Guide
         AgreementGuideTableViewCell *tcell = (AgreementGuideTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"GuideCellIdentifier"];
         cell = tcell;
     }
@@ -179,9 +206,9 @@
 - (void)didCheckBoxClicked:(id)sender {
     
     if ([sender isEqual:_chkAll]) {
-        _chkTerm.checked = _chkService.checked = _chkAll.checked;
+        _chkTerm.checked = _chkService.checked = _chkLocation.checked =_chkAll.checked;
     } else {
-        if (_chkTerm.checked && _chkService.checked) {
+        if (_chkTerm.checked && _chkService.checked && _chkLocation.checked) {
             _chkAll.checked = YES;
         } else {
             _chkAll.checked = NO;
@@ -197,7 +224,7 @@
         return;
     }
     
-    UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"SignUpViewController" storyboardName:@"SignUp"];
+    UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"CertificationViewController" storyboardName:@"SignUp"];
     
     vc.providesPresentationContextTransitionStyle = YES;
     vc.definesPresentationContext = YES;

OneCable/Classes/ViewControllers/SignUpScreens/CertificationViewController.h

@@ -15,11 +15,13 @@
 @interface CertificationViewController : JDViewController
 
 
-
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
 @property (weak, nonatomic) IBOutlet CustomTextField *txtPhoneNum;
 @property (weak, nonatomic) IBOutlet CustomTextField *txtCertifyInput;
 @property (weak, nonatomic) IBOutlet CustomButton *btnSend;
 
 
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
 
 @end

OneCable/Classes/ViewControllers/SignUpScreens/CertificationViewController.m

@@ -34,6 +34,13 @@
     
     [self.btnSend setBackgroundImage:[UIImage imageNamed:@"img_btn_common_disable"] forState:UIControlStateDisabled capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
+    [self.btnCancel setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    _txtPhoneNum.keyboardType = UIKeyboardTypeDefault;
+    _txtCertifyInput.keyboardType = UIKeyboardTypeDefault;
+    
     _txtPhoneNum.returnKeyType = UIReturnKeyDone;
     _txtCertifyInput.returnKeyType = UIReturnKeyDone;
     
@@ -52,10 +59,17 @@
 
 - (IBAction)btnCancelTouched:(id)sender {
 
-   [self dismissViewControllerAnimated:YES completion:nil];
+    UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"LoginViewController" storyboardName:@"Main"];
+    
+    vc.providesPresentationContextTransitionStyle = NO;
+    vc.definesPresentationContext = NO;
+    
+    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+    
+    [self presentViewController:vc animated:YES completion:nil];
 }
 
-- (IBAction)btnSend:(id)sender {
+- (IBAction)btnSendTouched:(id)sender {
 }
 
 @end

OneCable/Classes/ViewControllers/SignUpScreens/IDSetViewController.h

@@ -13,4 +13,14 @@
 
 @interface IDSetViewController : JDViewController
 
+
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+
+@property (weak, nonatomic) IBOutlet CustomTextField *txtIdInput;
+@property (weak, nonatomic) IBOutlet CustomButton *btnOverlap;
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
 @end

OneCable/Classes/ViewControllers/SignUpScreens/IDSetViewController.m

@@ -19,6 +19,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    [self initUI];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -27,14 +28,18 @@
 }
 
 - (void)initUI {
-    [self.btnSend setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
-    [self.btnSend setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
-    [self.btnSend setBackgroundImage:[UIImage imageNamed:@"img_btn_common_disable"] forState:UIControlStateDisabled capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_disable"] forState:UIControlStateDisabled capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
-    _txtPhoneNum.returnKeyType = UIReturnKeyDone;
-    _txtCertifyInput.returnKeyType = UIReturnKeyDone;
+    [self.btnCancel setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    _txtIdInput.keyboardType = UIKeyboardTypeDefault;
+    _txtIdInput.returnKeyType = UIReturnKeyDone;
     
 }
 
@@ -52,4 +57,7 @@
 - (IBAction)btnCancelTouched:(id)sender {
        [self dismissViewControllerAnimated:YES completion:nil];
 }
+
+- (IBAction)btnOverlapTouched:(id)sender {
+}
 @end

OneCable/Classes/ViewControllers/SignUpScreens/JoinFinishViewController.h

@@ -8,6 +8,13 @@
 
 #import "JDViewController.h"
 
+@class CustomButton;
+@class CustomTextField;
+
 @interface JoinFinishViewController : JDViewController
 
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm;
+
 @end

OneCable/Classes/ViewControllers/SignUpScreens/JoinFinishViewController.m

@@ -7,6 +7,8 @@
 //
 
 #import "JoinFinishViewController.h"
+#import "CustomButton.h"
+#import "CustomTextField.h"
 
 @interface JoinFinishViewController ()
 
@@ -17,6 +19,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    [self initUI];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -24,6 +27,10 @@
     
 }
 
+- (void)initUI {
+    
+    [self.btnConfirm setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+}
 
 - (IBAction)btnConfirmTouched:(id)sender {
        [self dismissViewControllerAnimated:YES completion:nil];

OneCable/Classes/ViewControllers/SignUpScreens/QuizViewController.h

@@ -8,6 +8,19 @@
 
 #import "JDViewController.h"
 
+@class CustomButton;
+@class CustomTextField;
+
 @interface QuizViewController : JDViewController
 
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtYear;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtMonth;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtDay;
+@property (weak, nonatomic) IBOutlet CustomButton *btnOverlap;
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
 @end

OneCable/Classes/ViewControllers/SignUpScreens/QuizViewController.m

@@ -7,6 +7,8 @@
 //
 
 #import "QuizViewController.h"
+#import "CustomButton.h"
+#import "CustomTextField.h"
 
 @interface QuizViewController ()
 
@@ -16,13 +18,34 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+ 
+    [self initUI];
 }
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     
 }
+- (void)initUI {
+    [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_disable"] forState:UIControlStateDisabled capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnCancel setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    _txtYear.keyboardType = UIKeyboardTypeDefault;
+    _txtMonth.keyboardType = UIKeyboardTypeDefault;
+    _txtDay.keyboardType = UIKeyboardTypeDefault;
+    
+    _txtYear.returnKeyType = UIReturnKeyNext;
+    _txtMonth.returnKeyType = UIReturnKeyNext;
+    _txtDay.returnKeyType = UIReturnKeyDone;
+    
+}
 
 
 - (IBAction)btnNextTouched:(id)sender {
@@ -40,4 +63,8 @@
        [self dismissViewControllerAnimated:YES completion:nil];
 }
 
+- (IBAction)btnOverlapTouched:(id)sender {
+}
+
+
 @end

OneCable/Classes/ViewControllers/SignUpScreens/UserNameSetViewController.h

@@ -8,6 +8,16 @@
 
 #import "JDViewController.h"
 
+@class CustomButton;
+@class CustomTextField;
+
 @interface UserNameSetViewController : JDViewController
 
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtNickInput;
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
 @end

OneCable/Classes/ViewControllers/SignUpScreens/UserNameSetViewController.m

@@ -7,6 +7,8 @@
 //
 
 #import "UserNameSetViewController.h"
+#import "CustomButton.h"
+#import "CustomTextField.h"
 
 @interface UserNameSetViewController ()
 
@@ -17,6 +19,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    [self initUI];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -24,6 +27,17 @@
     
 }
 
+- (void)initUI {
+
+    [self.btnCancel setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    _txtNickInput.keyboardType = UIKeyboardTypeDefault;
+    _txtNickInput.returnKeyType = UIReturnKeyDone;
+    
+}
+
 - (IBAction)btnNextTouched:(id)sender {
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"JoinFinishViewController" storyboardName:@"SignUp"];