Pārlūkot izejas kodu

- 멤버초대 페이지 디자인 가이드 적용

TaeHyun 8 gadi atpakaļ
vecāks
revīzija
84e92a5ffd

+ 8 - 0
OneCable/Base.lproj/Common.storyboard

@@ -29,6 +29,7 @@
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bO9-PD-f6o" customClass="CustomButton">
                                                 <rect key="frame" x="0.0" y="0.0" width="80" height="47"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="normal" image="img_bg_morepopup_icon_masterchange"/>
                                                 <state key="highlighted" image="img_bg_morepopup_icon_masterchange_press"/>
                                                 <connections>
                                                     <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="gR8-AF-O4L"/>
@@ -37,6 +38,7 @@
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Ci-wC-hR9" customClass="CustomButton">
                                                 <rect key="frame" x="80" y="0.0" width="80" height="47"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="normal" image="img_bg_morepopup_icon_add"/>
                                                 <state key="highlighted" image="img_bg_morepopup_icon_add_press"/>
                                                 <connections>
                                                     <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="JQ6-ai-2mA"/>
@@ -45,6 +47,7 @@
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jDL-F6-Yhx" customClass="CustomButton">
                                                 <rect key="frame" x="160" y="0.0" width="80" height="47"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="normal" image="img_bg_morepopup_icon_delete"/>
                                                 <state key="highlighted" image="img_bg_morepopup_icon_delete_press"/>
                                                 <connections>
                                                     <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="sdB-vM-rGF"/>
@@ -53,6 +56,7 @@
                                             <button opaque="NO" contentMode="scaleToFill" restorationIdentifier="MorePopVC" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ocQ-lF-sEP" customClass="CustomButton">
                                                 <rect key="frame" x="240" y="0.0" width="80" height="47"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <state key="normal" image="img_bg_morepopup_icon_refresh"/>
                                                 <state key="highlighted" image="img_bg_morepopup_icon_refresh_press"/>
                                                 <connections>
                                                     <action selector="btnAction:" destination="bhZ-03-HmT" eventType="touchUpInside" id="CKx-Eu-h9S"/>
@@ -604,9 +608,13 @@
         </scene>
     </scenes>
     <resources>
+        <image name="img_bg_morepopup_icon_add" width="23" height="23"/>
         <image name="img_bg_morepopup_icon_add_press" width="23" height="23"/>
+        <image name="img_bg_morepopup_icon_delete" width="23" height="23"/>
         <image name="img_bg_morepopup_icon_delete_press" width="23" height="23"/>
+        <image name="img_bg_morepopup_icon_masterchange" width="23" height="23"/>
         <image name="img_bg_morepopup_icon_masterchange_press" width="23" height="23"/>
+        <image name="img_bg_morepopup_icon_refresh" width="23" height="23"/>
         <image name="img_bg_morepopup_icon_refresh_press" width="23" height="23"/>
         <image name="shadow_top" width="1" height="1"/>
         <image name="tp_01_img_control_camera_down" width="40" height="40"/>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 300 - 143
OneCable/Base.lproj/HomeMember.storyboard


+ 1 - 1
OneCable/Classes/CustomUI/CustomLabel.m

@@ -341,7 +341,7 @@
 
 - (void)didLabelTouchedWithHandler:(UIGestureRecognizer *)gestureRecognizer {
     UIColor *_tmpColor = self.textColor;
-    self.textColor = self.highlightedTextColor;
+//    self.textColor = self.highlightedTextColor;
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         self.textColor = _tmpColor;

+ 3 - 3
OneCable/Classes/CustomUI/CustomTextField.m

@@ -12,7 +12,7 @@
 
 #define kUIBtnTintColor [UIColor whiteColor]
 #define kfBoxCap 16.0f
-#define kUIPlaceHolderColor RGBCOLOR(170, 170, 170)
+#define kUIPlaceHolderColor RGBCOLOR(136, 143, 168)
 
 @interface CustomTextField () <UIKeyInput> {
 @protected
@@ -456,7 +456,7 @@ CGRect gKeyboardRect;
 // placeholder position
 - (CGRect)textRectForBounds:(CGRect)bounds {
     //    CGFloat y = IOS_VERSION < 7.0f ? 6 : 0;
-    CGFloat margin = 0;
+    CGFloat margin = 15;
     CGRect inset = CGRectMake(bounds.origin.x + margin, bounds.origin.y, bounds.size.width, bounds.size.height);
     return inset;
 }
@@ -464,7 +464,7 @@ CGRect gKeyboardRect;
 // text position
 - (CGRect)editingRectForBounds:(CGRect)bounds {
     //    CGFloat y = IOS_VERSION < 7.0f ? 6 : 0;
-    CGFloat margin = 0;
+    CGFloat margin = 15;
     CGRect inset = CGRectMake(bounds.origin.x + margin, bounds.origin.y, bounds.size.width, bounds.size.height);
     return inset;
 }

+ 5 - 0
OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberAddViewController.h

@@ -31,6 +31,10 @@
 @class CustomLabel;
 @class CustomButton;
 
+@interface MemberHeaderTableViewCell : KNTableViewCell
+
+@end
+
 @interface MemberAddedTableViewCell : KNTableViewCell
 
 @property (weak, nonatomic) IBOutlet CustomTextField *txtEmail;
@@ -53,6 +57,7 @@
 @property (weak, nonatomic) IBOutlet CustomLabel *lblQuizInfo;
 @property (weak, nonatomic) IBOutlet DatePickerButton *btnDate;
 @property (weak, nonatomic) IBOutlet CustomTextField *txtQuestion;
+@property (weak, nonatomic) IBOutlet CustomButton *btnQuizSelect;
 
 @end
 

+ 8 - 1
OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberAddViewController.m

@@ -89,8 +89,12 @@
     
     [self initTableViewAsDefaultStyle:_tableView];
     
+    [self.btnCancel setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnSend setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
     //Localization
-    [_btnSend setTitle:NSLocalizedString(@"초대", @"초대") forState:UIControlStateNormal];
+    [_btnSend setTitle:NSLocalizedString(@"확인", @"확인") forState:UIControlStateNormal];
     [_btnCancel setTitle:NSLocalizedString(@"취소", @"취소") forState:UIControlStateNormal];
 }
 
@@ -281,6 +285,9 @@
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
+- (IBAction)btnQuizSelectTouched:(id)sender {
+    
+}
 
 #pragma mark - UITextField Delegate