diff --git a/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate index 0e67d58..43969c5 100644 Binary files a/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 8190485..dfc67b1 100644 --- a/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -127,21 +127,5 @@ - - - - diff --git a/FireBoltt/Const/MultiLanguageKey.swift b/FireBoltt/Const/MultiLanguageKey.swift index a7a5296..2e43e2b 100644 --- a/FireBoltt/Const/MultiLanguageKey.swift +++ b/FireBoltt/Const/MultiLanguageKey.swift @@ -230,7 +230,7 @@ struct MultiLanguageKey_FB { static let checkIntervalFB = "测量间隔（分钟）" static let weChatPayCodeFB = "微信" static let weChatPayCodeGFB = "微信个人收款码" - static let aliPayCodeFB = "支付宝" +// static let aliPayCodeFB = "支付宝" static let payPalCodeFB = "Paypal" static let selectNoPhoneFB = "请选择电话号码" static let paymentCodeFB = "收款码:" diff --git a/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.h b/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.h index 24e99e0..8c4fbf8 100644 --- a/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.h +++ b/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.h @@ -45,7 +45,7 @@ 二维码推送 @param cmd 命令类型 - @param payType 收款码类型 1:支付宝收款码，2：微信收款码，3：Paypal收款码，4.个人微信码 + @param payType 收款码类型 1:zfb收款码，2：微信收款码，3：Paypal收款码，4.个人微信码 @param qrCodeImg 二维码字符串 */ - (void)qrCodePushWithBleCmdTypeFB:(BleCMD_FireBoltt )cmd @@ -489,7 +489,7 @@ 发送收款码 @param cmd 命令类型 - @param codeType 收款码类型 0：支付宝 1：微信 + @param codeType 收款码类型 0：zfb 1：微信 @param codeData 收款码字串 @param isClear 清空收款码 */ diff --git a/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.m b/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.m index feec048..81108e9 100644 --- a/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.m +++ b/FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.m @@ -121,7 +121,7 @@ 二维码推送 @param cmd 命令类型 - @param payType 收款码类型 1:支付宝收款码，2：微信收款码，3：Paypal收款码，4.个人微信码 + @param payType 收款码类型 1:zfb收款码，2：微信收款码，3：Paypal收款码，4.个人微信码 @param qrCodeImg 二维码字符串 */ - (void)qrCodePushWithBleCmdTypeFB:(BleCMD_FireBoltt )cmd diff --git a/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift b/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift index 1926fb0..2d0a52f 100644 --- a/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift @@ -11,13 +11,17 @@ import AVFoundation class PaymentCodeViewControllers: ViewController { - var payArr:[String] = [MultiLanguageKey_FB.aliPayCodeFB.localized, - MultiLanguageKey_FB.weChatPayCodeFB.localized, +// var payArr:[String] = [MultiLanguageKey_FB.aliPayCodeFB.localized, +// MultiLanguageKey_FB.weChatPayCodeFB.localized, +// MultiLanguageKey_FB.payPalCodeFB.localized] +// var imgArr:[String] = ["fb_aliPayCode_cell_icon", +// "fb_icon_wechat", +// "fb_paypalCode_cell_icon"] + + var payArr:[String] = [MultiLanguageKey_FB.weChatPayCodeFB.localized, MultiLanguageKey_FB.payPalCodeFB.localized] - var imgArr:[String] = ["fb_aliPayCode_cell_icon", - "fb_icon_wechat", - "fb_paypalCode_cell_icon", - ] + var imgArr:[String] = ["fb_icon_wechat", + "fb_paypalCode_cell_icon"] var tableView:UITableView? override func loadView() { diff --git a/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift b/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift index 9c7a178..f45a129 100644 --- a/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift +++ b/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift @@ -16,6 +16,7 @@ class MineViewController: TableViewController { lazy var headerView: MineHeaderView = { let view = MineHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180)+10)) + view.bgView.addTarget(self, action: #selector(pusInfo), for: .touchUpInside) return view }() @@ -48,16 +49,21 @@ class MineViewController: TableViewController { // 头视图 tableView.tableHeaderView = headerView tableView.isScrollEnabled = false - headerView.rx.tap - .subscribe(onNext: { [weak self] _ in - guard let `self` = self else { return } - let vm = UserInfoViewModel() - self.navigator.show(segue: .userInfo(viewModel: vm), sender: self) - }) - .disposed(by: rx.disposeBag) +// headerView.rx.tap +// .subscribe(onNext: { [weak self] _ in +// guard let `self` = self else { return } +// let vm = UserInfoViewModel() +// self.navigator.show(segue: .userInfo(viewModel: vm), sender: self) +// }) +// .disposed(by: rx.disposeBag) layoutUI() } + @objc func pusInfo(){ + let vm = UserInfoViewModel() + self.navigator.show(segue: .userInfo(viewModel: vm), sender: self) + } + func layoutUI() { tableView.snp.makeConstraints { (make) in make.edges.equalToSuperview() diff --git a/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift b/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift index 41a1233..46e841e 100644 --- a/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift +++ b/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift @@ -35,10 +35,13 @@ class MineHeaderView: UIButton { return img }() - lazy var bgView: UIView = { - let view = UIView() - view.gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], locations: nil, autoLaoutFrame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180))) - return view + lazy var bgView: UIButton = { + let btn = UIButton(type: .custom).then { + $0.setTitleColor(.white, for: .normal) + } + btn.gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5), locations: [0, 1], autoLaoutFrame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180))) + + return btn }() override init(frame: CGRect) { diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@2x.png index a865c95..c2a1d41 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@3x.png index 87a1966..571386c 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@2x.png index 55016d5..2fa134f 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@3x.png index 725127c..b372365 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@2x.png index 9efa792..c2eadc8 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@3x.png index 01b54ae..276d790 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@2x.png index f7ca539..a019a2e 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@3x.png index 190d32d..7c02ad0 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@2x.png index ed56e8e..b662628 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@3x.png index ba67c23..5eabc41 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@2x.png index c5d2e8e..9b5a9c3 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@3x.png index 12148d9..1b43ef1 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@2x.png index 9fbdfb6..44e9956 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@3x.png index d42efad..7fa519c 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@2x.png index d2e31b1..01a6379 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@3x.png index f4e8226..0db9f57 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@2x.png index 2abd2b2..c156773 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@3x.png index f1e1b57..7e0b8be 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@2x.png index 625ea1f..a842a30 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@3x.png index 6818adf..b2ccf8c 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@2x.png index 382b934..b1cd16b 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@3x.png index fea35d3..2d1ed19 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@2x.png index 6a12992..38f8a59 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@3x.png index 8ee583f..870579f 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@2x.png index 2bec8ac..f1b9917 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@2x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@3x.png index dd13eef..8a4f5a6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@3x.png and b/FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@2x.png index ca5f2e1..a060919 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@3x.png index 4afe69b..ec3bda6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@2x.png index b0dc3af..e833376 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@3x.png index ade6e70..01f69ee 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png index b7e2089..bbbcf19 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png index fe3647c..06eefde 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@2x.png index 307d21f..983e707 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@3x.png index 901b9b8..ba54732 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png index 2da6edc..da581d5 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png index 4b8d6f4..e154d66 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@2x.png index ed4d1cf..3617af7 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@3x.png index b426d24..d2460b7 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png index de1a97e..7b982a3 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png index 5221f06..4a86e76 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@2x.png index ba17fe8..e68d856 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@3x.png index 444bc86..37e32b6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@2x.png index 96f419a..c823c9b 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@3x.png index a8e4e85..1352fb8 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@2x.png index d0b7411..ca22322 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@3x.png index 02dae0e..e4c5bb2 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@2x.png index 9fb22d9..70a04e6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@3x.png index 618f92f..a9ef4fa 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@2x.png index 866c501..f225ac4 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@3x.png index 1981289..53267b6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@2x.png index 88ea5b9..918a09f 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@3x.png index 3a74e45..3babb8f 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@2x.png index b9174a0..cf35b16 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@3x.png index d0f8dae..7398c55 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@2x.png index e0269b7..0f4f848 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@3x.png index 90a67d6..4974713 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@2x.png index 69d8c11..8fbd0be 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@3x.png index 74468d0..3b86696 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png index 7efa19b..9f11dd5 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png index aacb1d4..41e2155 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png index 324957c..98de184 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png index f2217d7..0147e5d 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@2x.png index ac03810..5878cf6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@3x.png index 5825202..df25c04 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@2x.png index 1956190..7161ff5 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@3x.png index e25e521..7105582 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@2x.png index b23eb06..ea0acd8 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@3x.png index 8097cbe..1279683 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png index bf61282..64f3b8c 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png index 136a5a7..e19dc30 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png index c13bf3b..e14454a 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png index c62070e..d25c5dd 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png index a44ce75..ecf519a 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png index 9fec57e..ce8f2c4 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png index 6628c54..01ae733 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png index d568f6d..5659c41 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png index 5e98b2d..80ad8a6 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png index c13339c..ea9476b 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@2x.png index e59c5ba..525a7bc 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@3x.png index 0470929..2f03ec1 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@2x.png index b4c3ba4..3a22499 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@3x.png index 5fc93d7..0f29f15 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png index ed006fc..2159f2f 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png index c78eb09..f4d73b4 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@2x.png index d9a6941..24e3f70 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@3x.png index 68ef4cb..659ae94 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png index 00856c4..b99504d 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png index c6f46d4..8dcb308 100644 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/Contents.json deleted file mode 100644 index 9bec148..0000000 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "rb_icon_Step count@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/rb_icon_Step count@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/rb_icon_Step count@3x.png deleted file mode 100644 index 9fec57e..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/rb_icon_Step count@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Info.plist b/FireBoltt/Resource/Info.plist index fe451d2..102770c 100644 --- a/FireBoltt/Resource/Info.plist +++ b/FireBoltt/Resource/Info.plist @@ -47,7 +47,6 @@ 开启后，FireBoltt才能获取相册的照片 UIBackgroundModes - audio bluetooth-central bluetooth-peripheral diff --git a/FireBoltt/Resource/ar.lproj/Localizable.strings b/FireBoltt/Resource/ar.lproj/Localizable.strings index b3253a1..778c165 100644 --- a/FireBoltt/Resource/ar.lproj/Localizable.strings +++ b/FireBoltt/Resource/ar.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "بطاقة"; "钱包" = "المحفظة"; "收款" = "جرى تحصيلها"; -"支付宝" = "ادفع ثمن"; +//"支付宝" = "ادفع ثمن"; "隐私政策" = "سياسة الخصوصية"; "用户协议" = "بروتوكول المستخدم"; diff --git a/FireBoltt/Resource/de.lproj/Localizable.strings b/FireBoltt/Resource/de.lproj/Localizable.strings index 88bba25..358f099 100644 --- a/FireBoltt/Resource/de.lproj/Localizable.strings +++ b/FireBoltt/Resource/de.lproj/Localizable.strings @@ -207,6 +207,6 @@ "名片" = "Die karte"; "钱包" = "Die brieftasche"; "收款" = "Eine forderung"; -"支付宝" = "Zahlt und zahlt"; +//"支付宝" = "Zahlt und zahlt"; "隐私政策" = "Unsere privateigentum ist privat"; "用户协议" = "Eine vereinbarung"; diff --git a/FireBoltt/Resource/en.lproj/Localizable.strings b/FireBoltt/Resource/en.lproj/Localizable.strings index f526ba6..f0d9824 100644 --- a/FireBoltt/Resource/en.lproj/Localizable.strings +++ b/FireBoltt/Resource/en.lproj/Localizable.strings @@ -220,7 +220,7 @@ "血氧饱和度" = "SpO2"; "测量间隔（分钟）" = "Check Interval(min)"; "微信收" = "WeChat"; -"支付宝" = "Alipay"; +//"支付宝" = "Alipay"; "微信个人收款码" = "WeChat personal money receiving QR code"; "Paypal" = "Paypal"; //"收款码:" = "fee code" diff --git a/FireBoltt/Resource/es.lproj/Localizable.strings b/FireBoltt/Resource/es.lproj/Localizable.strings index 3a8f7c9..85cef9e 100644 --- a/FireBoltt/Resource/es.lproj/Localizable.strings +++ b/FireBoltt/Resource/es.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "tarjeta"; "钱包" = "cartera"; "收款" = "Los recibos"; -"支付宝" = "alipay"; +//"支付宝" = "alipay"; "隐私政策" = "Política de privacidad"; "用户协议" = "Acuerdo de usuario"; diff --git a/FireBoltt/Resource/fr.lproj/Localizable.strings b/FireBoltt/Resource/fr.lproj/Localizable.strings index e93dd4d..4b8a7e3 100644 --- a/FireBoltt/Resource/fr.lproj/Localizable.strings +++ b/FireBoltt/Resource/fr.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "carte"; "钱包" = "portefeuille"; "收款" = "recouvrement"; -"支付宝" = "Paiement avec alipay"; +//"支付宝" = "Paiement avec alipay"; "隐私政策" = "Politique de confidentialité"; "用户协议" = "Accord de l’utilisateur"; diff --git a/FireBoltt/Resource/ja.lproj/Localizable.strings b/FireBoltt/Resource/ja.lproj/Localizable.strings index b09139f..c9667bc 100644 --- a/FireBoltt/Resource/ja.lproj/Localizable.strings +++ b/FireBoltt/Resource/ja.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "名刺です"; "钱包" = "財布です"; "收款" = "集金します"; -"支付宝" = "アリペイです"; +//"支付宝" = "アリペイです"; "隐私政策" = "プライバシーポリシーです"; "用户协议" = "ユーザープロトコルです"; diff --git a/FireBoltt/Resource/ko.lproj/Localizable.strings b/FireBoltt/Resource/ko.lproj/Localizable.strings index 56d30bc..0ad3287 100644 --- a/FireBoltt/Resource/ko.lproj/Localizable.strings +++ b/FireBoltt/Resource/ko.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "명함"; "钱包" = "지갑"; "收款" = "수금"; -"支付宝" = "알리페이"; +//"支付宝" = "알리페이"; "隐私政策" = "개인정보 보호정책"; "用户协议" = "사용자 협의"; diff --git a/FireBoltt/Resource/ms.lproj/Localizable.strings b/FireBoltt/Resource/ms.lproj/Localizable.strings index cc18929..090345c 100644 --- a/FireBoltt/Resource/ms.lproj/Localizable.strings +++ b/FireBoltt/Resource/ms.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "kad perniagaan"; "钱包" = "dompet"; "收款" = "Koleksi"; -"支付宝" = "Alipay"; +//"支付宝" = "Alipay"; "隐私政策" = "Dasar Privasi"; "用户协议" = "Perjanjian Pengguna"; diff --git a/FireBoltt/Resource/nl.lproj/Localizable.strings b/FireBoltt/Resource/nl.lproj/Localizable.strings index 6c72895..9722e64 100644 --- a/FireBoltt/Resource/nl.lproj/Localizable.strings +++ b/FireBoltt/Resource/nl.lproj/Localizable.strings @@ -201,7 +201,6 @@ "绑定二维码获取失败,请稍后重试" = "Het verkrijgen van de gebonden QR-code is mislukt. Probeer het later opnieuw"; "注意：升级过程中请勿关闭APP，并设备与APP保持在有效的蓝牙距离内，避免升级失败" = "Opmerking: sluit de APP niet tijdens het upgradeproces en houd het apparaat en de APP binnen een geldige Bluetooth-afstand om te voorkomen dat de upgrade mislukt"; "微信收" = "WeChat"; -"支付宝" = "Alipay"; "微信个人收款码" = "WeChat personal money receiving QR code"; "Paypal" = "Paypal"; //"收款码:" = "fee code" @@ -243,6 +242,6 @@ "名片" = "visitekaartjes"; "钱包" = "portefeuille"; "收款" = "ontvangsten"; -"支付宝" = "bedrag"; +//"支付宝" = "bedrag"; "隐私政策" = "privacybeleid"; "用户协议" = "gebruikersovereenkomst"; diff --git a/FireBoltt/Resource/pl.lproj/Localizable.strings b/FireBoltt/Resource/pl.lproj/Localizable.strings index c421f60..acfed87 100644 --- a/FireBoltt/Resource/pl.lproj/Localizable.strings +++ b/FireBoltt/Resource/pl.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "wizytówka"; "钱包" = "portmonetka"; "收款" = "Kolekcja"; -"支付宝" = "Alipay"; +//"支付宝" = "Alipay"; "隐私政策" = "Polityka prywatności"; "用户协议" = "Umowa z użytkownikiem"; diff --git a/FireBoltt/Resource/pt-PT.lproj/Localizable.strings b/FireBoltt/Resource/pt-PT.lproj/Localizable.strings index e87cb24..1c4da85 100644 --- a/FireBoltt/Resource/pt-PT.lproj/Localizable.strings +++ b/FireBoltt/Resource/pt-PT.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "cartão"; "钱包" = "carteira"; "收款" = "recepção"; -"支付宝" = "Alianças de pagamento"; +//"支付宝" = "Alianças de pagamento"; "隐私政策" = "Politica de privacidade"; "用户协议" = "Acordo do usuário"; diff --git a/FireBoltt/Resource/ru.lproj/Localizable.strings b/FireBoltt/Resource/ru.lproj/Localizable.strings index 582a63b..d75646a 100644 --- a/FireBoltt/Resource/ru.lproj/Localizable.strings +++ b/FireBoltt/Resource/ru.lproj/Localizable.strings @@ -201,7 +201,6 @@ "其他" = "друг"; "微信" = "wechat"; -"支付宝" = "Alipay"; "微信个人收款码" = "Микроверу в личный код сбора средст"; "Paypal" = "Paypal"; "收款码:" = "Код сбора:"; @@ -223,6 +222,6 @@ "名片" = "визитк"; "钱包" = "сумочк"; "收款" = "Сбор платеж за электроэнерг"; -"支付宝" = "Плати"; +//"支付宝" = "Плати"; "隐私政策" = "Политика конфиденциальности"; "用户协议" = "Протокол пользователя"; diff --git a/FireBoltt/Resource/th.lproj/Localizable.strings b/FireBoltt/Resource/th.lproj/Localizable.strings index 2bf8fc4..4ddcf27 100644 --- a/FireBoltt/Resource/th.lproj/Localizable.strings +++ b/FireBoltt/Resource/th.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "นามบัตร"; "钱包" = "กระเป๋าสตางค์"; "收款" = "ปิดบัญชี"; -"支付宝" = "จ่ายโบ"; +//"支付宝" = "จ่ายโบ"; "隐私政策" = "นโยบายความเป็นส่วนตัว"; "用户协议" = "โปรโตคอลของผู้ใช้"; diff --git a/FireBoltt/Resource/tr.lproj/Localizable.strings b/FireBoltt/Resource/tr.lproj/Localizable.strings index f90949e..795ab39 100644 --- a/FireBoltt/Resource/tr.lproj/Localizable.strings +++ b/FireBoltt/Resource/tr.lproj/Localizable.strings @@ -206,6 +206,6 @@ "名片" = "kartvizit"; "钱包" = "cüzdan"; "收款" = "Koleksiyon"; -"支付宝" = "Arjantin"; +//"支付宝" = "Arjantin"; "隐私政策" = "Gizlilik Politikası"; "用户协议" = "Kullanıcı Sözleşmesi"; diff --git a/FireBoltt/Resource/zh-Hans.lproj/Localizable.strings b/FireBoltt/Resource/zh-Hans.lproj/Localizable.strings index 5102d40..e8149fc 100644 --- a/FireBoltt/Resource/zh-Hans.lproj/Localizable.strings +++ b/FireBoltt/Resource/zh-Hans.lproj/Localizable.strings @@ -220,7 +220,7 @@ "血氧饱和度" = "血氧饱和度"; "测量间隔（分钟）" = "测量间隔（分钟）"; "微信" = "微信"; -"支付宝" = "支付宝"; +//"支付宝" = "支付宝"; "微信个人收款码" = "微信个人收款码"; "Paypal" = "Paypal"; "收款码:" = "收款码:"; diff --git a/R.generated.swift b/R.generated.swift index 31132e0..013dc49 100644 --- a/R.generated.swift +++ b/R.generated.swift @@ -158,7 +158,7 @@ struct R: Rswift.Validatable { fileprivate init() {} } - /// This `R.image` struct is generated, and contains static references to 167 images. + /// This `R.image` struct is generated, and contains static references to 166 images. struct image { /// Image `LaunchImage`. static let launchImage = Rswift.ImageResource(bundle: R.hostingBundle, name: "LaunchImage") @@ -468,8 +468,6 @@ struct R: Rswift.Validatable { static let power_3 = Rswift.ImageResource(bundle: R.hostingBundle, name: "power_3") /// Image `power_4`. static let power_4 = Rswift.ImageResource(bundle: R.hostingBundle, name: "power_4") - /// Image `rb_icon_Step count`. - static let rb_icon_StepCount = Rswift.ImageResource(bundle: R.hostingBundle, name: "rb_icon_Step count") /// Image `redPotint`. static let redPotint = Rswift.ImageResource(bundle: R.hostingBundle, name: "redPotint") /// Image `sleep_bg_fb`. @@ -1574,13 +1572,6 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "rb_icon_Step count", bundle: ..., traitCollection: ...)` - static func rb_icon_StepCount(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.rb_icon_StepCount, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) /// `UIImage(named: "redPotint", bundle: ..., traitCollection: ...)` static func redPotint(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { return UIKit.UIImage(resource: R.image.redPotint, compatibleWith: traitCollection) @@ -2011,7 +2002,7 @@ struct R: Rswift.Validatable { fileprivate init() {} } - /// This `R.string.localizable` struct is generated, and contains static references to 245 localization keys. + /// This `R.string.localizable` struct is generated, and contains static references to 244 localization keys. struct localizable { /// en translation: Synchronizing Succeed /// @@ -2037,10 +2028,6 @@ struct R: Rswift.Validatable { /// /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant static let 闹钟设置 = Rswift.StringResource(key: "闹钟设置", tableName: "Localizable", bundle: R.hostingBundle, locales: ["en", "zh-Hans", "nl", "ru", "fr", "de", "pt-PT", "es", "tr", "pl", "ar", "ms", "th", "ja", "ko", "zh-HK", "zh-Hant"], comment: nil) - /// en translation: Alipay - /// - /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko - static let 支付宝 = Rswift.StringResource(key: "支付宝", tableName: "Localizable", bundle: R.hostingBundle, locales: ["en", "zh-Hans", "nl", "ru", "fr", "de", "pt-PT", "es", "tr", "pl", "ar", "ms", "th", "ja", "ko"], comment: nil) /// en translation: All Sport /// /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant @@ -3084,21 +3071,6 @@ struct R: Rswift.Validatable { return NSLocalizedString("闹钟设置", bundle: bundle, comment: "") } - /// en translation: Alipay - /// - /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko - static func 支付宝(preferredLanguages: [String]? = nil) -> String { - guard let preferredLanguages = preferredLanguages else { - return NSLocalizedString("支付宝", bundle: hostingBundle, comment: "") - } - - guard let (_, bundle) = localeBundle(tableName: "Localizable", preferredLanguages: preferredLanguages) else { - return "支付宝" - } - - return NSLocalizedString("支付宝", bundle: bundle, comment: "") - } - /// en translation: All Sport /// /// Locales: en, zh-Hans, nl, ru, fr, de, pt-PT, es, tr, pl, ar, ms, th, ja, ko, zh-HK, zh-Hant