diff --git a/keyBoard/AppDelegate.m b/keyBoard/AppDelegate.m index 0449ddd..1702cd9 100644 --- a/keyBoard/AppDelegate.m +++ b/keyBoard/AppDelegate.m @@ -19,7 +19,8 @@ #import "KBULBridge.h" // Darwin 通知常量：用于通知扩展“UL已处理” #import "LSTPopView.h" #import "KBLoginPopView.h" - +#import "IAPVerifyTransactionObj.h" +#import "FGIAPManager.h" // 注意：用于判断系统已启用本输入法扩展的 bundle id 需与扩展 target 的 // PRODUCT_BUNDLE_IDENTIFIER 完全一致。 // 当前工程的 CustomKeyboard target 为 com.loveKey.nyx.CustomKeyboard @@ -29,7 +30,8 @@ static NSString * const kKBKeyboardExtensionBundleId = @"com.loveKey.nyx.CustomK - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - + // 1. 配置内购服务 + [[FGIAPManager shared] setConfigureWith:[IAPVerifyTransactionObj new]]; [self setupRootVC]; // 主工程默认开启网络总开关（键盘扩展仍需用户允许完全访问后再行开启） [KBNetworkManager shared].enabled = YES; diff --git a/keyBoard/Assets.xcassets/Ohter/Contents.json b/keyBoard/Assets.xcassets/Ohter/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/keyBoard/Assets.xcassets/Ohter/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/Contents.json new file mode 100644 index 0000000..8f9ae45 --- /dev/null +++ b/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "close_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "close_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/close_icon@2x.png b/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/close_icon@2x.png new file mode 100644 index 0000000..77df800 Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/close_icon@2x.png differ diff --git a/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/close_icon@3x.png b/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/close_icon@3x.png new file mode 100644 index 0000000..fc54891 Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/close_icon.imageset/close_icon@3x.png differ diff --git a/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/Contents.json new file mode 100644 index 0000000..3349ec7 --- /dev/null +++ b/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qx_ax_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qx_ax_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/qx_ax_icon@2x.png b/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/qx_ax_icon@2x.png new file mode 100644 index 0000000..dd462c9 Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/qx_ax_icon@2x.png differ diff --git a/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/qx_ax_icon@3x.png b/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/qx_ax_icon@3x.png new file mode 100644 index 0000000..9508a4a Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/qx_ax_icon.imageset/qx_ax_icon@3x.png differ diff --git a/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/Contents.json b/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/Contents.json new file mode 100644 index 0000000..ff8dd35 --- /dev/null +++ b/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "qx_bg_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "qx_bg_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/qx_bg_icon@2x.png b/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/qx_bg_icon@2x.png new file mode 100644 index 0000000..6e131db Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/qx_bg_icon@2x.png differ diff --git a/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/qx_bg_icon@3x.png b/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/qx_bg_icon@3x.png new file mode 100644 index 0000000..47f7b44 Binary files /dev/null and b/keyBoard/Assets.xcassets/Ohter/qx_bg_icon.imageset/qx_bg_icon@3x.png differ diff --git a/keyBoard/Class/Guard/VC/KBGuideVC.h b/keyBoard/Class/Guard/VC/KBGuideVC.h index 38950da..a82f7fa 100644 --- a/keyBoard/Class/Guard/VC/KBGuideVC.h +++ b/keyBoard/Class/Guard/VC/KBGuideVC.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface KBGuideVC : UIViewController +@interface KBGuideVC : BaseViewController @end diff --git a/keyBoard/Class/Guard/VC/KBGuideVC.m b/keyBoard/Class/Guard/VC/KBGuideVC.m index 32f4b4b..0af12e2 100644 --- a/keyBoard/Class/Guard/VC/KBGuideVC.m +++ b/keyBoard/Class/Guard/VC/KBGuideVC.m @@ -29,6 +29,8 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { @property (nonatomic, strong) NSMutableArray *items; // 数据源 [{type, text}] /// 权限引导页作为子控制器（用于“同时隐藏”） @property (nonatomic, strong, nullable) KBPermissionViewController *permVC; +/// 记录上一次的输入法标识，避免重复提示 +@property (nonatomic, copy, nullable) NSString *kb_lastInputModeIdentifier; @end @@ -45,8 +47,9 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { [self.inputBar addSubview:self.textField]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self.view); + make.left.right.equalTo(self.view); make.bottom.equalTo(self.view); + make.top.mas_equalTo(KB_NAV_TOTAL_HEIGHT); }]; [self.inputBar mas_makeConstraints:^(MASConstraintMaker *make) { @@ -83,8 +86,17 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { // 监听应用回到前台/变为活跃：用于从设置返回时再次校验权限 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(kb_checkKeyboardPermission) name:UIApplicationDidBecomeActiveNotification object:nil]; + // 监听输入法切换（系统未公开常量，使用字符串名以兼容不同系统版本） + NSArray *modeNotiNames = @[ @"UITextInputCurrentInputModeDidChangeNotification", + @"UITextInputCurrentInputModeDidChange" ]; + for (NSString *n in modeNotiNames) { + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(kb_inputModeDidChange:) name:n object:nil]; + } + // 提前创建并铺满权限引导页（默认隐藏），避免后续显示时出现布局进场感 [self kb_preparePermissionOverlayIfNeeded]; + + } - (void)dealloc { @@ -95,6 +107,19 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { [super viewWillAppear:animated]; // 每次进入页面都校验一次（包括从其它页面返回） [self kb_checkKeyboardPermission]; + // 仅在“权限已满足/引导未显示”时再去判断当前键盘是否为自家扩展 + BOOL permissionReady = (self.permVC && self.permVC.view.hidden == YES); + if (permissionReady) { + // 不要在未成为第一响应者时立即判断，避免拿不到 textInputMode 导致“误判不是自己的键盘” + if (![self.textField isFirstResponder]) { + [self.textField becomeFirstResponder]; + } + // 尝试在下一轮主线程循环评估一次；若键盘尚未完全弹出，会在 + // UIKeyboardWillChangeFrame 或输入法切换通知里再次评估 + dispatch_async(dispatch_get_main_queue(), ^{ + [self kb_evaluateCurrentInputModeAndNotifyIfNeeded]; + }); + } } /// 校验键盘权限： @@ -179,6 +204,8 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { // self.tableView.scrollIndicatorInsets = inset; } completion:^(BOOL finished) { [self scrollToBottomAnimated:YES]; + // 键盘位置变化后，尝试检测是否发生了输入法切换 + [self kb_evaluateCurrentInputModeAndNotifyIfNeeded]; }]; } @@ -191,6 +218,58 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { } } +#pragma mark - Keyboard Detection + +/// 判断当前激活在本页输入框上的系统键盘是否为我方扩展键盘 +/// 说明： +/// - 依赖 `UITextField.textInputMode` 获取当前输入法； +/// - 通过 KVC 读取其 `identifier`（系统未公开的属性），再与扩展的 bundle id 比较； +/// - 仅在 `textField` 为第一响应者、且软键盘弹出时才有意义。 +- (BOOL)kb_isMyExtensionKeyboardSelected { + UITextInputMode *mode = self.textField.textInputMode; + if (!mode) { return NO; } + NSString *identifier = nil; + @try { + // 私有字段：仅用于判断是否为自家扩展；与 App 内其它用法保持一致 + identifier = [mode valueForKey:@"identifier"]; + } @catch (__unused NSException *e) { + identifier = nil; + } + if (![identifier isKindOfClass:[NSString class]]) { return NO; } + return [identifier rangeOfString:KB_KEYBOARD_EXTENSION_BUNDLE_ID].location != NSNotFound; +} + +- (void)kb_inputModeDidChange:(NSNotification *)note { + // 用户从地球键切换输入法时调用 + [self kb_evaluateCurrentInputModeAndNotifyIfNeeded]; +} + +/// 读取当前输入法 identifier（可能为 nil） +- (NSString *)kb_currentInputModeIdentifier { + UITextInputMode *mode = self.textField.textInputMode; + if (!mode) return nil; + NSString *identifier = nil; + @try { identifier = [mode valueForKey:@"identifier"]; } @catch (__unused NSException *e) { identifier = nil; } + return [identifier isKindOfClass:NSString.class] ? identifier : nil; +} + +/// 若输入法发生变化，则立刻提示是否为自家键盘 +- (void)kb_evaluateCurrentInputModeAndNotifyIfNeeded { + // 仅在本页输入框处于编辑状态时判断，避免误触发 + if (![self.textField isFirstResponder]) return; + + // 若权限引导正在显示，不弹提示（未满足前置条件） + if (self.permVC && self.permVC.view.hidden == NO) return; + + NSString *currId = [self kb_currentInputModeIdentifier]; + if (currId.length == 0) return; + if ([self.kb_lastInputModeIdentifier isEqualToString:currId]) return; // 去抖 + self.kb_lastInputModeIdentifier = currId; + + BOOL isMine = [currId rangeOfString:KB_KEYBOARD_EXTENSION_BUNDLE_ID].location != NSNotFound; + [KBHUD showInfo:(isMine ? @"是自己的键盘" : @"❎不是自己的键盘")]; +} + #pragma mark - UITableView - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { diff --git a/keyBoard/Class/Home/V/HomeHeadView.m b/keyBoard/Class/Home/V/HomeHeadView.m index bfce22e..793e4d9 100644 --- a/keyBoard/Class/Home/V/HomeHeadView.m +++ b/keyBoard/Class/Home/V/HomeHeadView.m @@ -163,8 +163,8 @@ #pragma mark - Actions - (void)onTapBuyAction { // if (self.onTapBuy) { self.onTapBuy(); } -// KBJfPay *vc = [[KBJfPay alloc] init]; -// [KB_CURRENT_NAV pushViewController:vc animated:true]; + KBJfPay *vc = [[KBJfPay alloc] init]; + [KB_CURRENT_NAV pushViewController:vc animated:true]; } #pragma mark - Lazy diff --git a/keyBoard/Class/Pay/VC/KBJfPay.m b/keyBoard/Class/Pay/VC/KBJfPay.m index c72651f..ed3f1ef 100644 --- a/keyBoard/Class/Pay/VC/KBJfPay.m +++ b/keyBoard/Class/Pay/VC/KBJfPay.m @@ -4,7 +4,7 @@ #import "KBJfPay.h" #import "KBJfPayCell.h" - +#import "FGIAPProductsFilter.h" static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; @interface KBJfPay () @@ -34,12 +34,15 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; @property (nonatomic, strong) NSArray *data; // 简单演示数据：@{coins, price} @property (nonatomic, assign) NSInteger selectedIndex; // 当前选中项 +@property (nonatomic, strong) FGIAPProductsFilter *filter; + @end @implementation KBJfPay - (void)viewDidLoad { [super viewDidLoad]; + self.filter = [[FGIAPProductsFilter alloc] init]; self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"my_bg_icon"]]; self.bgImageView.contentMode = UIViewContentModeScaleAspectFill; self.kb_navView.backgroundColor = [UIColor clearColor]; @@ -51,12 +54,12 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; // 默认数据（演示） self.data = @[ - @{ @"coins": @690, @"price": @"$6.90" }, - @{ @"coins": @1280, @"price": @"$12.90" }, - @{ @"coins": @3290, @"price": @"$32.90" }, - @{ @"coins": @4990, @"price": @"$49.90" }, - @{ @"coins": @9990, @"price": @"$99.90" }, - @{ @"coins": @19990,@"price": @"$199.90" }, + @{ @"coins": @690, @"price": @"$6.90",@"product_id" : @"100_coin" }, + @{ @"coins": @1280, @"price": @"$12.90" ,@"product_id" : @"vip_a_week" }, + @{ @"coins": @3290, @"price": @"$32.90" ,@"product_id" : @"100_coin" }, + @{ @"coins": @4990, @"price": @"$49.90" ,@"product_id" : @"100_coin" }, + @{ @"coins": @9990, @"price": @"$99.90" ,@"product_id" : @"100_coin" }, + @{ @"coins": @19990,@"price": @"$199.90" ,@"product_id" : @"100_coin" }, ]; self.selectedIndex = 1; // 默认选中第二个，贴近截图 @@ -234,11 +237,20 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; #pragma mark - Actions - (void)onTapPayButton { // 这里只做 UI，实际支付逻辑由调用方接入 - if (self.selectedIndex >= 0 && self.selectedIndex < self.data.count) { - NSDictionary *item = self.data[self.selectedIndex]; - NSString *msg = [NSString stringWithFormat:@"购买：%@ Coins %@", item[@"coins"], item[@"price"]]; - [KBHUD showInfo:msg]; - } +// if (self.selectedIndex >= 0 && self.selectedIndex < self.data.count) { +// NSDictionary *item = self.data[self.selectedIndex]; +// NSString *msg = [NSString stringWithFormat:@"购买：%@ Coins %@", item[@"coins"], item[@"price"]]; +// [KBHUD showInfo:msg]; +// } + NSString *productId = @"com.yolo.vip.1month"; + /// 2.获取商品信息 + [self.filter requestProductsWith:[NSSet setWithObject:productId] completion:^(NSArray * _Nonnull products) { + NSLog(@"====="); + /// 3.支付购买 +// [[FGIAPManager shared].iap buyProduct:products.firstObject onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { +// [self.view makeToast:message]; +// }]; + }]; } - (void)agreementButtonAction{ diff --git a/keyBoard/VC/KBPermissionViewController.m b/keyBoard/VC/KBPermissionViewController.m index 6ba3ed3..0c0f116 100644 --- a/keyBoard/VC/KBPermissionViewController.m +++ b/keyBoard/VC/KBPermissionViewController.m @@ -12,65 +12,78 @@ @property (nonatomic, strong) UILabel *tipsLabel; // 步骤提示 @property (nonatomic, strong) UIView *cardView; // 中部卡片 @property (nonatomic, strong) UIButton *openButton; // 去设置 +@property (nonatomic, strong) UIButton *closeButton; // 去设置 + @property (nonatomic, strong) UILabel *helpLabel; // 底部帮助 +@property (nonatomic, strong) UIImageView *redImageView; + +@property (nonatomic, strong) UIImageView *bgImageView; + @end @implementation KBPermissionViewController - (void)viewDidLoad { [super viewDidLoad]; - self.view.backgroundColor = [UIColor colorWithWhite:0.96 alpha:1.0]; + [self.view addSubview:self.bgImageView]; + [self.view addSubview:self.redImageView]; // 懒加载控件 + 添加到视图 - [self.view addSubview:self.backButton]; + [self.view addSubview:self.closeButton]; [self.view addSubview:self.titleLabel]; [self.view addSubview:self.tipsLabel]; [self.view addSubview:self.cardView]; [self.view addSubview:self.openButton]; [self.view addSubview:self.helpLabel]; - // Masonry 约束 - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.view).offset(16); - make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop).offset(8); - - make.width.mas_equalTo(60); - make.height.mas_equalTo(32); + + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.view); }]; + // Masonry 约束 + [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(self.view).offset(16); + make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop).offset(20); + make.width.mas_equalTo(26); + make.height.mas_equalTo(26); + }]; + [self.redImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.closeButton.mas_centerY); + make.right.equalTo(self.view).offset(20); + make.width.mas_equalTo(143); + make.height.mas_equalTo(132); + }]; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop).offset(48); - - make.left.equalTo(self.view).offset(24); - make.right.equalTo(self.view).offset(-24); - make.height.mas_equalTo(28); + make.top.equalTo(self.closeButton.mas_bottom).offset(13); + make.left.equalTo(self.view).offset(22); + make.height.mas_equalTo(24); }]; [self.tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.titleLabel.mas_bottom).offset(8); - make.left.equalTo(self.view).offset(24); - make.right.equalTo(self.view).offset(-24); + make.left.equalTo(self.titleLabel); }]; [self.cardView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.tipsLabel.mas_bottom).offset(28); - make.left.equalTo(self.view).offset(32); - make.right.equalTo(self.view).offset(-32); - make.height.mas_equalTo(260); + make.bottom.equalTo(self.openButton.mas_top).offset(-36); + make.left.right.equalTo(self.view).inset(56); + make.top.equalTo(self.tipsLabel.mas_bottom).offset(36); }]; [self.openButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.cardView.mas_bottom).offset(32); - make.left.equalTo(self.view).offset(32); - make.right.equalTo(self.view).offset(-32); - make.height.mas_equalTo(48); + make.bottom.equalTo(self.view).offset(-KB_SAFE_BOTTOM-20); + make.left.equalTo(self.view).offset(47); + make.right.equalTo(self.view).offset(-47); + make.height.mas_equalTo(60); }]; - [self.helpLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.openButton.mas_bottom).offset(12); - make.left.equalTo(self.view).offset(24); - make.right.equalTo(self.view).offset(-24); - }]; +// [self.helpLabel mas_makeConstraints:^(MASConstraintMaker *make) { +// make.top.equalTo(self.openButton.mas_bottom).offset(12); +// make.left.equalTo(self.view).offset(24); +// make.right.equalTo(self.view).offset(-24); +// }]; } #pragma mark - Actions @@ -112,6 +125,10 @@ } } +- (void)closeButtonAction{ + [self.navigationController popViewControllerAnimated:true]; +} + #pragma mark - Lazy Subviews - (UIButton *)backButton { @@ -128,8 +145,8 @@ - (UILabel *)titleLabel { if (!_titleLabel) { _titleLabel = [UILabel new]; - _titleLabel.text = KBLocalized(@"perm_title_enable"); - _titleLabel.font = [UIFont systemFontOfSize:22 weight:UIFontWeightSemibold]; + _titleLabel.text = (@"key of love keyboard"); + _titleLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightSemibold]; _titleLabel.textColor = [UIColor blackColor]; _titleLabel.textAlignment = NSTextAlignmentCenter; } @@ -139,7 +156,7 @@ - (UILabel *)tipsLabel { if (!_tipsLabel) { _tipsLabel = [UILabel new]; - _tipsLabel.text = KBLocalized(@"perm_steps"); + _tipsLabel.text = (@"One-click to find a partner"); _tipsLabel.font = [UIFont systemFontOfSize:14]; _tipsLabel.textColor = [UIColor darkGrayColor]; _tipsLabel.textAlignment = NSTextAlignmentCenter; @@ -161,17 +178,26 @@ - (UIButton *)openButton { if (!_openButton) { - _openButton = [UIButton buttonWithType:UIButtonTypeSystem]; - [_openButton setTitle:KBLocalized(@"perm_open_settings") forState:UIControlStateNormal]; - _openButton.titleLabel.font = [UIFont systemFontOfSize:17 weight:UIFontWeightSemibold]; + _openButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_openButton setTitle:@"Turn on the keyboard" forState:UIControlStateNormal]; + _openButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; [_openButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _openButton.backgroundColor = [UIColor colorWithRed:0.22 green:0.49 blue:0.96 alpha:1.0]; - _openButton.layer.cornerRadius = 8; + _openButton.backgroundColor = [UIColor colorWithHex:KBBlackValue]; + _openButton.layer.cornerRadius = 30; [_openButton addTarget:self action:@selector(openSettings) forControlEvents:UIControlEventTouchUpInside]; } return _openButton; } +- (UIButton *)closeButton { + if (!_closeButton) { + _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_closeButton setImage:[UIImage imageNamed:@"close_icon"] forState:UIControlStateNormal]; + [_closeButton addTarget:self action:@selector(closeButtonAction) forControlEvents:UIControlEventTouchUpInside]; + } + return _closeButton; +} + - (UILabel *)helpLabel { if (!_helpLabel) { _helpLabel = [UILabel new]; @@ -184,4 +210,20 @@ return _helpLabel; } + +- (UIImageView *)bgImageView{ + if (!_bgImageView) { + _bgImageView = [[UIImageView alloc] init]; + _bgImageView.image = [UIImage imageNamed:@"qx_bg_icon"]; + } + return _bgImageView; +} +- (UIImageView *)redImageView{ + if (!_redImageView) { + _redImageView = [[UIImageView alloc] init]; + _redImageView.image = [UIImage imageNamed:@"qx_ax_icon"]; + } + return _redImageView; +} + @end