3
This commit is contained in:
@@ -117,9 +117,9 @@
|
||||
// 底部协议文案(单个富文本视图,内部 terms/privacy 文案可点击)
|
||||
[self.contentContainerView addSubview:self.agreementTextView];
|
||||
[self.agreementTextView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.contentContainerView);
|
||||
make.left.greaterThanOrEqualTo(self.contentContainerView).offset(30);
|
||||
make.right.lessThanOrEqualTo(self.contentContainerView).offset(-30);
|
||||
// 协议文案占满容器左右 30 的留白,配合 textAlignmentCenter 实现真正水平居中
|
||||
make.left.equalTo(self.contentContainerView).offset(30);
|
||||
make.right.equalTo(self.contentContainerView).offset(-30);
|
||||
make.bottom.equalTo(self.contentContainerView).offset(-KB_SAFE_BOTTOM - 84);
|
||||
}];
|
||||
|
||||
@@ -128,14 +128,14 @@
|
||||
[self.contentContainerView addSubview:forgot];
|
||||
[forgot mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.contentContainerView);
|
||||
make.bottom.equalTo(self.contentContainerView).offset(-KB_SAFE_BOTTOM - 24);
|
||||
make.bottom.equalTo(self.contentContainerView).offset(-KB_SAFE_BOTTOM - 10);
|
||||
}];
|
||||
|
||||
UIView *accountLine = [UIView new];
|
||||
[self.contentContainerView addSubview:accountLine];
|
||||
[accountLine mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.contentContainerView);
|
||||
make.bottom.equalTo(forgot.mas_top).offset(-8);
|
||||
make.bottom.equalTo(forgot.mas_top).offset(-2);
|
||||
}];
|
||||
|
||||
[accountLine addSubview:self.noAccountLabel];
|
||||
@@ -246,7 +246,7 @@
|
||||
_emailLoginButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[_emailLoginButton setTitle:KBLocalized(@"Continue Via Email") forState:UIControlStateNormal];
|
||||
[_emailLoginButton setTitleColor:[UIColor colorWithHex:KBBlackValue] forState:UIControlStateNormal];
|
||||
_emailLoginButton.titleLabel.font = [KBFont medium:16];
|
||||
_emailLoginButton.titleLabel.font = [KBFont medium:19];
|
||||
// _emailLoginButton.backgroundColor = [UIColor colorWithHex:0xF7F7F7];
|
||||
_emailLoginButton.layer.cornerRadius = 10.0;
|
||||
_emailLoginButton.layer.masksToBounds = YES;
|
||||
@@ -291,10 +291,14 @@
|
||||
NSString *termsText = @"terms of service";
|
||||
NSString *privacyText = @"privacy policy";
|
||||
|
||||
NSMutableParagraphStyle *paragraph = [[NSMutableParagraphStyle alloc] init];
|
||||
paragraph.alignment = NSTextAlignmentCenter; // 多行文本整体居中
|
||||
|
||||
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:fullText
|
||||
attributes:@{
|
||||
NSFontAttributeName : [KBFont regular:12],
|
||||
NSForegroundColorAttributeName : [UIColor colorWithHex:0x717171]
|
||||
NSFontAttributeName : [KBFont regular:10],
|
||||
NSForegroundColorAttributeName : [UIColor colorWithHex:0x717171],
|
||||
NSParagraphStyleAttributeName : paragraph
|
||||
}];
|
||||
|
||||
NSString *lowerFull = fullText.lowercaseString;
|
||||
@@ -332,8 +336,8 @@
|
||||
if (!_noAccountLabel) {
|
||||
_noAccountLabel = [UILabel new];
|
||||
_noAccountLabel.text = KBLocalized(@"Don't Have An Account?");
|
||||
_noAccountLabel.font = [KBFont regular:13];
|
||||
_noAccountLabel.textColor = [UIColor colorWithWhite:0.45 alpha:1.0];
|
||||
_noAccountLabel.font = [KBFont regular:10];
|
||||
_noAccountLabel.textColor = [UIColor colorWithHex:KBBlackValue];
|
||||
}
|
||||
return _noAccountLabel;
|
||||
}
|
||||
@@ -343,7 +347,7 @@
|
||||
_signUpButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[_signUpButton setTitle:KBLocalized(@"Sign Up") forState:UIControlStateNormal];
|
||||
[_signUpButton setTitleColor:[UIColor colorWithHex:KBColorValue] forState:UIControlStateNormal];
|
||||
_signUpButton.titleLabel.font = [KBFont medium:13];
|
||||
_signUpButton.titleLabel.font = [KBFont medium:10];
|
||||
[_signUpButton addTarget:self action:@selector(onTapSignUp) forControlEvents:UIControlEventTouchUpInside];
|
||||
}
|
||||
return _signUpButton;
|
||||
@@ -354,7 +358,7 @@
|
||||
_forgotPasswordButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[_forgotPasswordButton setTitle:KBLocalized(@"Forgot Password?") forState:UIControlStateNormal];
|
||||
[_forgotPasswordButton setTitleColor:[UIColor colorWithHex:KBColorValue] forState:UIControlStateNormal];
|
||||
_forgotPasswordButton.titleLabel.font = [KBFont regular:13];
|
||||
_forgotPasswordButton.titleLabel.font = [KBFont regular:10];
|
||||
[_forgotPasswordButton addTarget:self action:@selector(onTapForgotPassword) forControlEvents:UIControlEventTouchUpInside];
|
||||
}
|
||||
return _forgotPasswordButton;
|
||||
|
||||
Reference in New Issue
Block a user