zw/keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
CodeST
2025-11-25 16:10:08 +08:00
parent 1eb73f5257
commit b660eb19f4
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/Localization/en.lproj/Localizable.strings
View File

@@ -129,6 +129,10 @@
"Editor" = "Editor"; "Editor" = "Editor";
"Cancel" = "Cancel"; "Cancel" = "Cancel";
"Delete" = "Delete"; "Delete" = "Delete";
"Points\nMall" = "Points\nMall";
"Log Out" = "Log Out";
"Ranking List" = "Ranking List";
"Persona circle" = "Persona circle";

4
Shared/Localization/zh-Hans.lproj/Localizable.strings
View File

@@ -129,6 +129,10 @@
"Editor" = "编辑"; "Editor" = "编辑";
"Cancel" = "取消"; "Cancel" = "取消";
"Delete" = "删除"; "Delete" = "删除";
"Points\nMall" = "积分\n商城";
"Log Out" = "退出";
"Ranking List" = "排行榜";
"Persona circle" = "圈子";
// 皮肤示例名称 // 皮肤示例名称
"极光" = "极光"; "极光" = "极光";

4
keyBoard/Class/Home/V/KBPanModalView.m
View File

@@ -212,7 +212,7 @@
// 两个按钮 // 两个按钮
self.hotButton = [UIButton buttonWithType:UIButtonTypeCustom]; self.hotButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.hotButton setTitle:@"Ranking List" forState:UIControlStateNormal]; [self.hotButton setTitle:KBLocalized(@"Ranking List") forState:UIControlStateNormal];
[self.hotButton setTitleColor:[UIColor darkTextColor] forState:UIControlStateNormal]; [self.hotButton setTitleColor:[UIColor darkTextColor] forState:UIControlStateNormal];
[self.hotButton setTitleColor:[UIColor blackColor] forState:UIControlStateSelected]; [self.hotButton setTitleColor:[UIColor blackColor] forState:UIControlStateSelected];
self.hotButton.titleLabel.font = [UIFont boldSystemFontOfSize:16]; self.hotButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
@@ -221,7 +221,7 @@
[self.topBar addSubview:self.hotButton]; [self.topBar addSubview:self.hotButton];
self.rankButton = [UIButton buttonWithType:UIButtonTypeCustom]; self.rankButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.rankButton setTitle:@"Persona circle" forState:UIControlStateNormal]; [self.rankButton setTitle:KBLocalized(@"Persona circle") forState:UIControlStateNormal];
[self.rankButton setTitleColor:[UIColor darkTextColor] forState:UIControlStateNormal]; [self.rankButton setTitleColor:[UIColor darkTextColor] forState:UIControlStateNormal];
[self.rankButton setTitleColor:[UIColor blackColor] forState:UIControlStateSelected]; [self.rankButton setTitleColor:[UIColor blackColor] forState:UIControlStateSelected];
self.rankButton.titleLabel.font = [UIFont boldSystemFontOfSize:16]; self.rankButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];

2
keyBoard/Class/Home/VC/FunctionTest/KBSkinCenterVC.m
View File

@@ -26,7 +26,7 @@
[_applyBtn mas_makeConstraints:^(MASConstraintMaker *make) { [_applyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.contentView).offset(-16); make.right.equalTo(self.contentView).offset(-16);
make.centerY.equalTo(self.contentView); make.centerY.equalTo(self.contentView);
make.width.mas_equalTo(110); make.width.mas_greaterThanOrEqualTo(110);
make.height.mas_equalTo(34); make.height.mas_equalTo(34);
}]; }];
} }

18
keyBoard/Class/Me/V/KBMyHeaderView.m
View File

@@ -44,7 +44,7 @@
make.centerY.equalTo(self.titleLabel); make.centerY.equalTo(self.titleLabel);
make.right.equalTo(self).offset(-20); make.right.equalTo(self).offset(-20);
make.height.mas_equalTo(34); make.height.mas_equalTo(34);
make.width.mas_greaterThanOrEqualTo(110); make.width.mas_greaterThanOrEqualTo(90);
}]; }];
[self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self).offset(26); make.left.equalTo(self).offset(26);
@@ -124,14 +124,22 @@
_keyboardBtn.layer.cornerRadius = 17; _keyboardBtn.layer.cornerRadius = 17;
_keyboardBtn.layer.masksToBounds = YES; _keyboardBtn.layer.masksToBounds = YES;
// 图标 + 文本，图文间距 6 // 图标 + 文本，保持不同语言下左右内边距一致
UIImage *kbImg = [UIImage imageNamed:@"my_kb_icon"]; UIImage *kbImg = [UIImage imageNamed:@"my_kb_icon"];
if (kbImg) { if (kbImg) {
[_keyboardBtn setImage:kbImg forState:UIControlStateNormal]; [_keyboardBtn setImage:kbImg forState:UIControlStateNormal];
_keyboardBtn.imageView.contentMode = UIViewContentModeScaleAspectFit; _keyboardBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
CGFloat spacing = 3.0; // 按钮左右内边距（与文字无关，始终生效）
_keyboardBtn.contentEdgeInsets = UIEdgeInsetsMake(0, spacing, 0, spacing); CGFloat horizontalPadding = 10.0;
_keyboardBtn.titleEdgeInsets = UIEdgeInsetsMake(0, spacing, 0, -spacing); _keyboardBtn.contentEdgeInsets = UIEdgeInsetsMake(0, horizontalPadding, 0, horizontalPadding);
// 图片与文字之间的间距
CGFloat spacing = 6.0;
_keyboardBtn.imageEdgeInsets = UIEdgeInsetsMake(0, -spacing / 2.0, 0, spacing / 2.0);
_keyboardBtn.titleEdgeInsets = UIEdgeInsetsMake(0, spacing / 2.0, 0, -spacing / 2.0);
// 保证宽度由内容决定，避免中英文长度不同导致被压扁
[_keyboardBtn setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
[_keyboardBtn setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
} }
// 点击事件 // 点击事件

2
keyBoard/Class/Search/V/KBSearchBarView.m
View File

@@ -36,7 +36,7 @@
[self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.bgView); make.centerY.equalTo(self.bgView);
make.right.equalTo(self.bgView).offset(-8); make.right.equalTo(self.bgView).offset(-8);
make.width.mas_equalTo(84); make.width.mas_greaterThanOrEqualTo(84);
make.height.mas_equalTo(32); make.height.mas_equalTo(32);
}]; }];

2
keyBoard/Class/Shop/V/KBShopHeadView.m
View File

@@ -132,7 +132,7 @@
[self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(self.infoCard).offset(-32); make.bottom.equalTo(self.infoCard).offset(-32);
make.right.equalTo(self.infoCard).offset(-15); make.right.equalTo(self.infoCard).offset(-15);
make.width.mas_equalTo(114); make.width.mas_greaterThanOrEqualTo(114);
make.height.mas_equalTo(42); make.height.mas_equalTo(42);
}]; }];
} }