diff --git a/FireBoltt.xcodeproj/project.pbxproj b/FireBoltt.xcodeproj/project.pbxproj index 48c3621..cc796f5 100644 --- a/FireBoltt.xcodeproj/project.pbxproj +++ b/FireBoltt.xcodeproj/project.pbxproj @@ -184,6 +184,9 @@ 61DF3C482AAF2F4B00E69AE9 /* BViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61DF3C452AAF2F4B00E69AE9 /* BViewController.swift */; }; 61DF3C4D2AAF2F5300E69AE9 /* MagicTabbarTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61DF3C4A2AAF2F5300E69AE9 /* MagicTabbarTransition.swift */; }; 61DF3C4E2AAF2F5300E69AE9 /* OtherViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61DF3C4B2AAF2F5300E69AE9 /* OtherViewController.swift */; }; + 61DF3C542AB1460400E69AE9 /* UIColor+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 61DF3C522AB1460300E69AE9 /* UIColor+Extension.m */; }; + 61DF3C552AB1460400E69AE9 /* XFGradientProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61DF3C532AB1460300E69AE9 /* XFGradientProgressView.m */; }; + 61DF3C572AB1A5EA00E69AE9 /* DeviceFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61DF3C562AB1A5EA00E69AE9 /* DeviceFooterView.swift */; }; 716B2AAA2AA8D265006F17EB /* BlueToothItemFireBoltt.m in Sources */ = {isa = PBXBuildFile; fileRef = 716B2A992AA8D264006F17EB /* BlueToothItemFireBoltt.m */; }; 716B2AAB2AA8D265006F17EB /* BluetoothToolFireBoltt.m in Sources */ = {isa = PBXBuildFile; fileRef = 716B2A9B2AA8D264006F17EB /* BluetoothToolFireBoltt.m */; }; 716B2AAC2AA8D265006F17EB /* L2DataParseFireBoltt.m in Sources */ = {isa = PBXBuildFile; fileRef = 716B2A9C2AA8D264006F17EB /* L2DataParseFireBoltt.m */; }; @@ -670,6 +673,11 @@ 61DF3C452AAF2F4B00E69AE9 /* BViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BViewController.swift; sourceTree = ""; }; 61DF3C4A2AAF2F5300E69AE9 /* MagicTabbarTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MagicTabbarTransition.swift; sourceTree = ""; }; 61DF3C4B2AAF2F5300E69AE9 /* OtherViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OtherViewController.swift; sourceTree = ""; }; + 61DF3C502AB1460300E69AE9 /* UIColor+Extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+Extension.h"; sourceTree = ""; }; + 61DF3C512AB1460300E69AE9 /* XFGradientProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XFGradientProgressView.h; sourceTree = ""; }; + 61DF3C522AB1460300E69AE9 /* UIColor+Extension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Extension.m"; sourceTree = ""; }; + 61DF3C532AB1460300E69AE9 /* XFGradientProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XFGradientProgressView.m; sourceTree = ""; }; + 61DF3C562AB1A5EA00E69AE9 /* DeviceFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceFooterView.swift; sourceTree = ""; }; 716B2A812AA8CA41006F17EB /* FireBoltt-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FireBoltt-Bridging-Header.h"; sourceTree = ""; }; 716B2A992AA8D264006F17EB /* BlueToothItemFireBoltt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BlueToothItemFireBoltt.m; sourceTree = ""; }; 716B2A9A2AA8D264006F17EB /* BluetoothToolFireBoltt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BluetoothToolFireBoltt.h; sourceTree = ""; }; @@ -1258,6 +1266,17 @@ path = tv; sourceTree = ""; }; + 61DF3C4F2AB1460300E69AE9 /* ProgressBar */ = { + isa = PBXGroup; + children = ( + 61DF3C502AB1460300E69AE9 /* UIColor+Extension.h */, + 61DF3C522AB1460300E69AE9 /* UIColor+Extension.m */, + 61DF3C512AB1460300E69AE9 /* XFGradientProgressView.h */, + 61DF3C532AB1460300E69AE9 /* XFGradientProgressView.m */, + ); + path = ProgressBar; + sourceTree = ""; + }; CC560CDD2425FDAF00578115 /* FB_Bluetooth */ = { isa = PBXGroup; children = ( @@ -1360,6 +1379,7 @@ CCA7A2FB245BF6E20068F1BB /* DialPushCell.swift */, CCA7A2FC245BF6E30068F1BB /* DialPushCell.xib */, CC560D1B2427A58900578115 /* DeviceHeaderView.swift */, + 61DF3C562AB1A5EA00E69AE9 /* DeviceFooterView.swift */, CC560D3024306CA000578115 /* DoubleTimePickerCell.swift */, CC560D2F24306CA000578115 /* SinglePickerCell.swift */, ); @@ -1782,10 +1802,11 @@ CCE8FFDD241352CC00E5E23D /* FB_Health */ = { isa = PBXGroup; children = ( - CC6B306E244B4C8A00E4927E /* HealthSection.swift */, CCDD65D1243B07BA00263642 /* Controller */, CCDD65D5243B088F00263642 /* View */, CCDD65D2243B07C400263642 /* ViewModel */, + 61DF3C4F2AB1460300E69AE9 /* ProgressBar */, + CC6B306E244B4C8A00E4927E /* HealthSection.swift */, ); path = FB_Health; sourceTree = ""; @@ -2058,6 +2079,7 @@ CC5C7AB926CEAD1D00B2F1F2 /* FRIBinFileCheck.m in Sources */, 6110118D29C048BE00F4DFDF /* MusicModel.m in Sources */, CCE8FFDB2413520000E5E23D /* HomeTabBarController.swift in Sources */, + 61DF3C572AB1A5EA00E69AE9 /* DeviceFooterView.swift in Sources */, CC560D6A243656EF00578115 /* AboutVC.swift in Sources */, CCE8FFD22413511500E5E23D /* String+GetSize.swift in Sources */, CCE8FFB224132DD400E5E23D /* Application.swift in Sources */, @@ -2216,6 +2238,7 @@ CC560D3424306DAC00578115 /* MultipleSectionModel.swift in Sources */, CC560D4A2430E99F00578115 /* Tool.swift in Sources */, CCDD65F52443136900263642 /* NoDataChartView.swift in Sources */, + 61DF3C542AB1460400E69AE9 /* UIColor+Extension.m in Sources */, CCE8FFB42413344D00E5E23D /* Navigator.swift in Sources */, 617D2ECE2AA1CE53003C2D03 /* tvyourActionXfnjse.m in Sources */, CC560D5A2432490900578115 /* NewAlarmListViewModel.swift in Sources */, @@ -2297,6 +2320,7 @@ CCDF4DED241E4EC0000AFA5E /* UIImagePickerController+RxCreate.swift in Sources */, 61DF3C352AAF27C300E69AE9 /* CollectionReusableFooterView.swift in Sources */, 61DF3C1A2AAF23E600E69AE9 /* LTEmitterView.swift in Sources */, + 61DF3C552AB1460400E69AE9 /* XFGradientProgressView.m in Sources */, CC560D2A243061A300578115 /* NoticeViewModels.swift in Sources */, 617D2EE02AA1CE53003C2D03 /* qMSB_Class_Bevtyx.m in Sources */, CCD86EFB254423D400E64954 /* RealTimeModel.swift in Sources */, @@ -2531,7 +2555,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.1.0; + MARKETING_VERSION = 1.1.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.ecell.www.fireboltts; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2575,7 +2599,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.1.0; + MARKETING_VERSION = 1.1.1; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.ecell.www.fireboltts; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/FireBoltt.xcodeproj/xcshareddata/xcschemes/FireBoltt.xcscheme b/FireBoltt.xcodeproj/xcshareddata/xcschemes/FireBoltt.xcscheme index 4e7de71..9a50131 100644 --- a/FireBoltt.xcodeproj/xcshareddata/xcschemes/FireBoltt.xcscheme +++ b/FireBoltt.xcodeproj/xcshareddata/xcschemes/FireBoltt.xcscheme @@ -31,7 +31,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FireBoltt/Const/Enum.swift b/FireBoltt/Const/Enum.swift index f39faf0..5a287cc 100644 --- a/FireBoltt/Const/Enum.swift +++ b/FireBoltt/Const/Enum.swift @@ -38,6 +38,32 @@ enum FunctionTypeFireBoltt { } } + func imgName() -> String { + switch self { + case .findPhone: return "icon_find" /// 找设备 + case .handUp: return "icon_bright_screen" ///抬手亮屏 + case .callRemind: return "icon_call_notification" ///来电通知 + case .messageRemind: return "icon_message_notification" /// 短信提醒 + case .remoteCamera: return "icon_camera" /// 远程拍照 + case .notice: return "icon_app_notification" /// 应用通知 + case .heartCheck: return "icon_hr" /// 心率监测 + case .dialPush: return "icon_devide_dial" ///表盘推送 + case .firmwareUpgrade: return "icon_version" ///固件升级 + //case .unBinding: return "" ///解除绑定 + case .notDisturb: return "icon_DND" /// 勿扰模式 + case .alarmClock: return "icon_remind" /// 闹钟设置 + case .sedentary: return "icon_sedentary" /// 久坐提醒 + case .drinkRemind: return "icon_drink" /// 喝水提醒 + case .tempeartureCheck: return "icon_temperature" /// 体温监测 + case .wechatSport: return "fb_icon_wechat" /// 微信运动 + case .telephoneBook: return "icon_phonebook" /// 通讯录 + case .businessCard: return "icon_card" /// 名片 + case .theWallet: return "icon_wallet" /// 钱包 + case .music: return "icon_music" /// 音乐管理 + default: return "" + } + } + func isSwitch() -> Bool { switch self { case .handUp, .callRemind, .messageRemind: diff --git a/FireBoltt/FB_Common/CommonTableViewCell.xib b/FireBoltt/FB_Common/CommonTableViewCell.xib index 2945362..aef177b 100644 --- a/FireBoltt/FB_Common/CommonTableViewCell.xib +++ b/FireBoltt/FB_Common/CommonTableViewCell.xib @@ -1,13 +1,15 @@ + + - + @@ -21,10 +23,10 @@ - + - - + + @@ -69,7 +71,7 @@ - + @@ -101,7 +103,7 @@ - - + + diff --git a/FireBoltt/FB_Common/DateSwitchHeaderView.swift b/FireBoltt/FB_Common/DateSwitchHeaderView.swift index 646e69a..a4a8504 100644 --- a/FireBoltt/FB_Common/DateSwitchHeaderView.swift +++ b/FireBoltt/FB_Common/DateSwitchHeaderView.swift @@ -29,11 +29,11 @@ class DateSwitchHeaderView: UIView { override init(frame: CGRect) { super.init(frame: frame) - let segBackView = UIView(frame: CGRect(x: 0, y: 0, width: self.width, height: kScaleHeight(45.0))) + let segBackView = UIView(frame: CGRect(x: 0, y: 0, width: self.width, height: kScaleHeight(50.0))) segBackView.backgroundColor = UIColor.white self.addSubview(segBackView) //创建segment组件 - segControl = DateSegmentView(frame: CGRect.init(x: 0, y: kScaleHeight(15), width: kScaleWidth(258), height: kScaleWidth(30))) + segControl = DateSegmentView(frame: CGRect.init(x: 0, y: 15, width: kScaleWidth(258), height: kScaleWidth(30))) segControl.centerX = segBackView.center.x segControl.titles = ["日".localized, "周".localized, "月".localized]; segControl.selectedClosure = { [weak self] index in @@ -43,7 +43,7 @@ class DateSwitchHeaderView: UIView { segBackView.addSubview(segControl) //创建日期选择组件 - dateSelectedView = DateSelectView(frame: CGRect(x: 0, y: segBackView.height, width: self.width, height: self.height - segBackView.height)) + dateSelectedView = DateSelectView(frame: CGRect(x: 0, y: segBackView.bottom, width: self.width, height: self.height - segBackView.height)) dateSelectedView.backgroundColor = UIColor.white dateSelectedView.dateStr = DateClass.todayString().pregReplace(pattern: "-", with: "/") dateSelectedView.dateSelectClosure = { [weak self] (dateStr, isforward) in diff --git a/FireBoltt/FB_Modules/FB_Device/Controller/DeviceViewControllers.swift b/FireBoltt/FB_Modules/FB_Device/Controller/DeviceViewControllers.swift index 835252b..2e44d15 100644 --- a/FireBoltt/FB_Modules/FB_Device/Controller/DeviceViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Device/Controller/DeviceViewControllers.swift @@ -19,6 +19,12 @@ class DeviceViewControllers: TableViewController { var isCamera: Bool = false var isOpenCamera: Bool = false + lazy var footerView: DeviceFooterView = { + let view = DeviceFooterView(frame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(80))) + view.unBindingBtn.addTarget(self, action: #selector(unBindingTouch), for: .touchUpInside) + return view + }() + lazy var noDeviceImg: UIImageView = { return UIImageView(image: R.image.fb_default_device_icon()) }() @@ -37,7 +43,7 @@ class DeviceViewControllers: TableViewController { lazy var fbbindingBtn: UIButton = { let btn = UIButton() 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: kScaleWidth(190), height: kScaleWidth(45))) - btn.layer.cornerRadius = 22.5 + btn.layer.cornerRadius = kScaleWidth(22.5) btn.layer.masksToBounds = true btn.setTitle(MultiLanguageKey_FB.bindingDeviceFB.localized, for: .normal) btn.titleLabel?.font = SystemRegularFont(18) @@ -62,8 +68,13 @@ class DeviceViewControllers: TableViewController { super.makeUI() isTitleCenter = true navigationTitle = MultiLanguageKey_FB.mineDeviceFB.localized - tableViewStyle = .grouped + if #available(iOS 13.0, *) { + tableViewStyle = .insetGrouped + } else { + tableViewStyle = .grouped + } tableView.backgroundColor = kHexColor(0xFAFAFA) + tableView.rowHeight = kScaleWidth(52) view.addSubview(noDeviceImg) view.addSubview(fbbindingTipLabel) view.addSubview(fbbindingBtn) @@ -71,6 +82,10 @@ class DeviceViewControllers: TableViewController { // 头视图 fbheaderView.backgroundColor = .white tableView.tableHeaderView = fbheaderView + + footerView.backgroundColor = .clear + tableView.tableFooterView = footerView + layoutUI() } @@ -95,7 +110,7 @@ class DeviceViewControllers: TableViewController { } fbheaderView.snp.makeConstraints { (make) in make.width.equalTo(kScreenW) - make.height.equalTo(kScaleWidth(85) + 10) + make.height.equalTo(kScaleWidth(150) + 10) } } @@ -357,6 +372,17 @@ class DeviceViewControllers: TableViewController { } + @objc func unBindingTouch(){ + print("解绑") + showAlert(self, MultiLanguageKey_FB.unbindingTipFB.localized, cancelText: MultiLanguageKey_FB.cancelFB.localized, confirmText: MultiLanguageKey_FB.confirmFB.localized) { (result) in + if result { + UserDefaultsManagerFrieBoltt.deleteDeviceInfo() + BluetoothFireBoltt.shareInstance()?.disConnectedCurrenDevice(true) + kNotificationCenter.post(name: NSNotification.Name(UnBindingDeviceFireBoltt), object: nil) + } + } + } + } // MARK: - 相机相册协议 diff --git a/FireBoltt/FB_Modules/FB_Device/Controller/NoticeViewConrtollers.swift b/FireBoltt/FB_Modules/FB_Device/Controller/NoticeViewConrtollers.swift index c3b2cb7..b64d568 100644 --- a/FireBoltt/FB_Modules/FB_Device/Controller/NoticeViewConrtollers.swift +++ b/FireBoltt/FB_Modules/FB_Device/Controller/NoticeViewConrtollers.swift @@ -21,7 +21,12 @@ class NoticeViewConrtollers: TableViewController { override func makeUI() { super.makeUI() - tableViewStyle = .grouped + if #available(iOS 13.0, *) { + tableViewStyle = .insetGrouped + } else { + // Fallback on earlier versions + tableViewStyle = .grouped + } tableView.backgroundColor = kHexColor(0xFAFAFA) view.addSubview(tableView) layoutUI() diff --git a/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift b/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift index 8af3317..1926fb0 100644 --- a/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift @@ -32,14 +32,18 @@ class PaymentCodeViewControllers: ViewController { override func viewDidLoad() { super.viewDidLoad() - let label:UILabel = UILabel(frame: CGRect(x: 25, y: 15, width: view.frame.size.width, height: 18)) - label.textColor = kHexColor(0x2A2A2A) - label.font = SystemSemiboldFont(16) - label.text = "收款".localized - self.view.addSubview(label); +// let label:UILabel = UILabel(frame: CGRect(x: 25, y: 15, width: view.frame.size.width, height: 18)) +// label.textColor = kHexColor(0x2A2A2A) +// label.font = SystemSemiboldFont(16) +// label.text = "收款:".localized +// self.view.addSubview(label); //创建表视图 - self.tableView = UITableView(frame: CGRect(x: 0, y: 48, width: Int(view.frame.size.width), height: 50*payArr.count), style:UITableView.Style.plain) + if #available(iOS 13.0, *) { + self.tableView = UITableView(frame: CGRect(x: 0, y: 0, width: Int(view.frame.size.width), height: Int(kScreenH)), style:UITableView.Style.insetGrouped) + } else { + // Fallback on earlier versions + } self.tableView!.delegate = self self.tableView!.dataSource = self self.tableView!.rowHeight = 50 @@ -89,7 +93,16 @@ extension PaymentCodeViewControllers: UITableViewDataSource { cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator return cell } + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return 40 + } + func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + return nil + } + func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + return "收款：" + } } diff --git a/FireBoltt/FB_Modules/FB_Device/Controller/WeChatSportViewControllers.swift b/FireBoltt/FB_Modules/FB_Device/Controller/WeChatSportViewControllers.swift index eccda88..488aa30 100644 --- a/FireBoltt/FB_Modules/FB_Device/Controller/WeChatSportViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Device/Controller/WeChatSportViewControllers.swift @@ -37,6 +37,8 @@ class WeChatSportViewControllerss: ViewController { return view }() + var button = UIView() + override func viewDidLoad() { super.viewDidLoad() } @@ -55,6 +57,9 @@ class WeChatSportViewControllerss: ViewController { let images = [R.image.wechatSportStep1(), R.image.wechatSportStep2(), R.image.wechatSportStep3(), R.image.wechatSportStep4()] for (index, title) in titles.enumerated() { let btn = stepBtn(image: images[index], title: title) + if index == titles.count-1 { + button = btn + } view.addSubview(btn) btn.snp.makeConstraints { (make) in make.top.equalTo(fbtitleLabel.snp.bottom).offset(30 + (index * (60 + 10))) @@ -63,21 +68,22 @@ class WeChatSportViewControllerss: ViewController { make.right.equalTo(-30) } } + + // 二维码 + view.addSubview(fbqrCodeImage) + fbqrCodeImage.snp.makeConstraints { (make) in + make.centerX.equalToSuperview() + make.top.equalTo(button.snp.bottom).offset(30) + make.width.height.equalTo(kScaleWidth(120)) + } // 保存按钮 view.addSubview(fbsaveBtn) fbsaveBtn.snp.makeConstraints { (make) in make.centerX.equalToSuperview() - make.bottom.equalTo(-20) + make.top.equalTo(fbqrCodeImage.snp_bottom).offset(20) make.height.equalTo(40) make.width.equalTo(120) } - // 二维码 - view.addSubview(fbqrCodeImage) - fbqrCodeImage.snp.makeConstraints { (make) in - make.centerX.equalToSuperview() - make.bottom.equalTo(fbsaveBtn.snp.top).offset(-30) - make.width.height.equalTo(kScaleWidth(120)) - } } private func stepBtn(image: UIImage?, title: String) -> UIView { diff --git a/FireBoltt/FB_Modules/FB_Device/Controller/businessCardViewControllers.swift b/FireBoltt/FB_Modules/FB_Device/Controller/businessCardViewControllers.swift index 1d00c1c..26f3e85 100644 --- a/FireBoltt/FB_Modules/FB_Device/Controller/businessCardViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Device/Controller/businessCardViewControllers.swift @@ -38,7 +38,11 @@ class businessCardViewControllers: ViewController { super.viewDidLoad() //创建表视图 - self.tableView = UITableView(frame: CGRect(x: 0, y: 10, width: Int(view.frame.size.width), height: 50*payArr.count), style:UITableView.Style.plain) + if #available(iOS 13.0, *) { + self.tableView = UITableView(frame: CGRect(x: 0, y: 0, width: Int(view.frame.size.width), height: Int(kScreenH)), style:UITableView.Style.insetGrouped) + } else { + // Fallback on earlier versions + } self.tableView!.delegate = self self.tableView!.dataSource = self self.tableView?.rowHeight = 50 @@ -89,4 +93,11 @@ extension businessCardViewControllers: UITableViewDataSource { return cell } + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return 10 + } + func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + return nil + } + } diff --git a/FireBoltt/FB_Modules/FB_Device/View/DeviceFooterView.swift b/FireBoltt/FB_Modules/FB_Device/View/DeviceFooterView.swift new file mode 100644 index 0000000..840981e --- /dev/null +++ b/FireBoltt/FB_Modules/FB_Device/View/DeviceFooterView.swift @@ -0,0 +1,58 @@ +// +// DeviceFooterView.swift +// FireBoltt +// +// Created by ecell on 2023/9/13. +// Copyright © 2023 Sheldon. All rights reserved. +// + +import UIKit + +class DeviceFooterView: UIView { + + lazy var unBindingBtn: UIButton = { + let btn = UIButton(type: .custom).then { + $0.setTitle(MultiLanguageKey_FB.unBindingFB.localized, for: .normal) + $0.setTitleColor(.white, for: .normal) + $0.titleLabel?.font = SystemRegularFont(18) + } + 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: self.frame.size.width-40, height: kScaleWidth(50))) + btn.layer.cornerRadius = kScaleWidth(25) + btn.layer.masksToBounds = true + return btn + }() + + override init(frame: CGRect) { + super.init(frame: frame) + self.addSubview(unBindingBtn) + setUpUI() + } + + func setUpUI() { + unBindingBtn.snp.makeConstraints { make in + make.left.right.equalTo(self).inset(20) + make.centerY.equalTo(self) + make.height.equalTo(kScaleWidth(50)); + } + } + + + + + + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + + + /* + // Only override draw() if you perform custom drawing. + // An empty implementation adversely affects performance during animation. + override func draw(_ rect: CGRect) { + // Drawing code + } + */ + +} diff --git a/FireBoltt/FB_Modules/FB_Device/View/DeviceHeaderView.swift b/FireBoltt/FB_Modules/FB_Device/View/DeviceHeaderView.swift index 6ef3092..ee32708 100644 --- a/FireBoltt/FB_Modules/FB_Device/View/DeviceHeaderView.swift +++ b/FireBoltt/FB_Modules/FB_Device/View/DeviceHeaderView.swift @@ -18,6 +18,13 @@ fileprivate struct Metric { class DeviceHeaderView: UIView { + lazy var commIcon: UIImageView = { + let imageView = UIImageView(image: UIImage(named: "picture_bg")).then { + addSubview($0) + } + return imageView + }() + lazy var fbdeviceNameLabel: UILabel = { let label = UILabel().then { $0.textColor = ThemeManagerFrieBoltt.commonTextColor @@ -82,26 +89,35 @@ class DeviceHeaderView: UIView { } func setUpUI() { - fbdeviceIcon.snp.makeConstraints { (make) in + commIcon.snp.makeConstraints { make in make.left.equalTo(kNavBarItemMargin) - make.top.equalTo(15) - make.width.height.equalTo(kScaleWidth(30)) - } - fbdeviceNameLabel.snp.makeConstraints { (make) in - make.centerY.equalTo(fbdeviceIcon.snp.centerY) - make.left.equalTo(fbdeviceIcon.snp.right).offset(kScaleWidth(10)) + make.centerY.equalTo(self) + make.size.equalTo(CGSize(width: kScaleWidth(110), height: kScaleWidth(110))) } + fbstatusBtn.snp.makeConstraints { (make) in - make.left.equalTo(fbdeviceNameLabel.snp.left) - make.top.equalTo(fbdeviceNameLabel.snp.bottom).offset(kScaleWidth(10)) + make.left.equalTo(commIcon.snp_right).offset(50) + make.centerY.equalTo(self.snp_centerY) } fbpowerBtn.snp.makeConstraints { (make) in make.left.equalTo(fbstatusBtn.snp.right).offset(kScaleWidth(13)) - make.top.equalTo(fbdeviceNameLabel.snp.bottom).offset(kScaleWidth(10)) + make.centerY.equalTo(fbstatusBtn.snp_centerY) } - fbsyncBtn.snp.makeConstraints { (make) in + + + fbdeviceIcon.snp.makeConstraints { (make) in + make.left.equalTo(fbstatusBtn.snp_left) + make.bottom.equalTo(fbstatusBtn.snp_top).inset(-20) + make.width.height.equalTo(kScaleWidth(30)) + } + fbdeviceNameLabel.snp.makeConstraints { (make) in make.centerY.equalTo(fbdeviceIcon.snp.centerY) - make.right.equalTo(-kNavBarItemMargin) + make.left.equalTo(fbdeviceIcon.snp.right).offset(kScaleWidth(10)) + } + + fbsyncBtn.snp.makeConstraints { (make) in + make.top.equalTo(fbstatusBtn.snp.bottom).offset(20) + make.left.equalTo(fbdeviceIcon.snp_left) make.width.equalTo(kScaleWidth(65)) make.height.equalTo(kScaleWidth(30)) } diff --git a/FireBoltt/FB_Modules/FB_Device/ViewModel/DeviceViewModels.swift b/FireBoltt/FB_Modules/FB_Device/ViewModel/DeviceViewModels.swift index 09d3d8b..c82775a 100644 --- a/FireBoltt/FB_Modules/FB_Device/ViewModel/DeviceViewModels.swift +++ b/FireBoltt/FB_Modules/FB_Device/ViewModel/DeviceViewModels.swift @@ -164,7 +164,8 @@ extension DeviceViewModels { // 默认功能列表 let section1: [FunctionTypeFireBoltt] = [.findPhone, .remoteCamera] var section2: [FunctionTypeFireBoltt] = [.callRemind, .messageRemind, .notice] - var section3: [FunctionTypeFireBoltt] = [.unBinding] + // var section3: [FunctionTypeFireBoltt] = [.unBinding] + var section3: [FunctionTypeFireBoltt] = [] // 功能适配 if let adapterInfo = UserDefaultsManagerFrieBoltt.getDeviceInfo()?.adapterInfo { // Section2 @@ -175,7 +176,7 @@ extension DeviceViewModels { if adapterInfo.alarmRemind { section2.append(.alarmClock) } if adapterInfo.drinkRemind { section2.append(.drinkRemind) } if adapterInfo.sedentaryRemind { section2.append(.sedentary) } - if adapterInfo.telephoneBook { section2.append(.telephoneBook) } + if adapterInfo.telephoneBook { section2.append(.telephoneBook) } if adapterInfo.businessCard { section2.append(.businessCard) } if adapterInfo.theWallet { section2.append(.theWallet) } if adapterInfo.music { section2.append(.music) } @@ -195,7 +196,7 @@ extension DeviceViewModels { if type == .firmwareUpgrade, let firmwareVersion = GlobalDeviceProfileModel.shareInstance.firwareModel?.firmwareVersion { description = "V" + firmwareVersion } - let cellModel = TableViewCellModel(title: type.title(), isSwitch: type.isSwitch(), description: description, isArrows: !type.isSwitch(), isOn: isON, image: nil, isBottomLine: isBottomLine, functionType: type) + let cellModel = TableViewCellModel(title: type.title(), isSwitch: type.isSwitch(), description: description, isArrows: !type.isSwitch(), isOn: isON, image: UIImage(named: type.imgName()), isBottomLine: isBottomLine, functionType: type) if type == .firmwareUpgrade { cellModel.redPoint.accept(isNewFirmware) } diff --git a/FireBoltt/FB_Modules/FB_Health/Controller/HealthHomeViewControllers.swift b/FireBoltt/FB_Modules/FB_Health/Controller/HealthHomeViewControllers.swift index 136f896..4630adb 100644 --- a/FireBoltt/FB_Modules/FB_Health/Controller/HealthHomeViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Health/Controller/HealthHomeViewControllers.swift @@ -35,6 +35,7 @@ class HealthHomeViewControllers: CollectionController { override func viewDidLoad() { super.viewDidLoad() +// view.backgroundColor = kRGBA(233, 247, 255, 0.5) // 未设置用户信息 guard let _ = UserDefaultsManagerFrieBoltt.getUserInfo() else { // 未设置用户信息 @@ -52,7 +53,7 @@ class HealthHomeViewControllers: CollectionController { flowLayout.minimumLineSpacing = 0 collectionViewFlowLayout = flowLayout // 设置视图 - collectionView.backgroundColor = .white + collectionView.backgroundColor = kRGBA(233, 247, 255, 0.5) collectionView.register(Resuable.stepCell) collectionView.register(Resuable.helathCell) collectionView.register(Resuable.blankCell) diff --git a/FireBoltt/FB_Modules/FB_Health/ProgressBar/UIColor+Extension.h b/FireBoltt/FB_Modules/FB_Health/ProgressBar/UIColor+Extension.h new file mode 100644 index 0000000..9b781cb --- /dev/null +++ b/FireBoltt/FB_Modules/FB_Health/ProgressBar/UIColor+Extension.h @@ -0,0 +1,30 @@ +// +// UIColor+Extension.h +// XFGradientProgressView +// +// Created by XFCoding on 2020/5/12. +// Copyright © 2020 XFCoding. All rights reserved. +// + +#import +NS_ASSUME_NONNULL_BEGIN +@interface UIColor (Extension) +/** + * 两个颜色之间的过渡颜色 + * beginColor 开始颜色 + * endColor 结束颜色 + * position 过渡的比例 （0~1） + */ ++ (UIColor *)transitionColorWithStartColor:(UIColor *)startColor endColor:(UIColor *)endColor position:(CGFloat )position; + +/** + * 取两个颜色的过渡颜色 + * startColorHex 开始颜色的 十六进制值 + * endColorHex 结束颜色的 十六进制值 + * position 过渡比例 （0~1） + */ ++ (UIColor *)transitionColorWithStartColorHex:(unsigned int)startColorHex endColorHex:(unsigned int)endColorHex position:(CGFloat )position; + +@end + +NS_ASSUME_NONNULL_END diff --git a/FireBoltt/FB_Modules/FB_Health/ProgressBar/UIColor+Extension.m b/FireBoltt/FB_Modules/FB_Health/ProgressBar/UIColor+Extension.m new file mode 100644 index 0000000..23943c3 --- /dev/null +++ b/FireBoltt/FB_Modules/FB_Health/ProgressBar/UIColor+Extension.m @@ -0,0 +1,66 @@ +// +// UIColor+Extension.m +// XFGradientProgressView +// +// Created by XFCoding on 2020/5/12. +// Copyright © 2020 XFCoding. All rights reserved. +// + +#import "UIColor+Extension.h" + +@implementation UIColor (Extension) + ++ (UIColor *)colorWithHexColor:(unsigned int)hexColor { + return [UIColor colorWithRed:((hexColor>>16)&0xFF)/255.0 green:((hexColor>>8)&0xFF)/255.0 blue:(hexColor&0xFF)/255.0 alpha:1.0]; +} + +/** + * 两个颜色之间的过渡颜色 + * beginColor 开始颜色 + * endColor 结束颜色 + * position 过渡的比例 （0~1） + */ ++ (UIColor *)transitionColorWithStartColor:(UIColor *)startColor endColor:(UIColor *)endColor position:(CGFloat )position { + UIColor *desColor = nil; + // 获取开始位置颜色的 R、G、B、A值 + CGFloat startR = 0; + CGFloat startG = 0; + CGFloat startB = 0; + CGFloat startA = 0; + [startColor getRed:&startR green:&startG blue:&startB alpha:&startA]; + + // 获取结束位置颜色的 R、G、B、A值 + CGFloat endR = 0; + CGFloat endG = 0; + CGFloat endB = 0; + CGFloat endA = 0; + [endColor getRed:&endR green:&endG blue:&endB alpha:&endA]; + + CGFloat R = (endR - startR)*position + startR; + CGFloat G = (endG - startG)*position + startG; + CGFloat B = (endB - startB)*position + startB; + CGFloat A = (endA - startA)*position + startA; + + //根据当前位置获取当前应该要展示的颜色值 + desColor = [UIColor colorWithRed:R green:G blue:B alpha:A]; + + return desColor; +} + +/** + * 取两个颜色的过渡颜色 + * startColorHex 开始颜色的 十六进制值 + * endColorHex 结束颜色的 十六进制值 + * position 过渡比例 （0~1） + */ ++ (UIColor *)transitionColorWithStartColorHex:(unsigned int)startColorHex endColorHex:(unsigned int)endColorHex position:(CGFloat )position { + return [self transitionColorWithStartColor:[self colorWithHexColor:startColorHex] endColor:[self colorWithHexColor:endColorHex] position:position]; + + +} + + + + +@end + diff --git a/FireBoltt/FB_Modules/FB_Health/ProgressBar/XFGradientProgressView.h b/FireBoltt/FB_Modules/FB_Health/ProgressBar/XFGradientProgressView.h new file mode 100644 index 0000000..9460e41 --- /dev/null +++ b/FireBoltt/FB_Modules/FB_Health/ProgressBar/XFGradientProgressView.h @@ -0,0 +1,33 @@ +// +// XFGradientProgressView.h +// XFGradientProgressView +// +// Created by XFCoding on 2020/5/12. +// Copyright © 2020 XFCoding. All rights reserved. +// + +#import + + + +@interface XFGradientProgressView : UIView + +/// 初始化进度条 +/// @param frame ~ +/// @param startColor 起始颜色 +/// @param endColor 结束颜色 +/// @param backProgressColor 进度条背景颜色 +- (instancetype)initWithFrame:(CGRect)frame startColor:(UIColor *)startColor endColor:(UIColor *)endColor backProgressColor:(UIColor *)backProgressColor; + + + +//设置最终进度(0.0~1.0)和动画时间，动画时间默认1.0s +- (void)StartAnimationToProgress:(CGFloat)progress durationTime:(CGFloat)durationTime sImgName:(NSString *)sImgName; + + + + + + +@end + diff --git a/FireBoltt/FB_Modules/FB_Health/ProgressBar/XFGradientProgressView.m b/FireBoltt/FB_Modules/FB_Health/ProgressBar/XFGradientProgressView.m new file mode 100644 index 0000000..0dd54ae --- /dev/null +++ b/FireBoltt/FB_Modules/FB_Health/ProgressBar/XFGradientProgressView.m @@ -0,0 +1,167 @@ +// +// XFGradientProgressView.m +// XFGradientProgressView +// +// Created by XFCoding on 2020/5/12. +// Copyright © 2020 XFCoding. All rights reserved. +// + +#import "XFGradientProgressView.h" +#import "UIColor+Extension.h" + +#define COLOR_HEX(c) [UIColor colorWithRed:((c>>16)&0xFF)/255.0 green:((c>>8)&0xFF)/255.0 blue:(c&0xFF)/255.0 alpha:1.0] +#define COLOR_RGB(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1.0] + +#define kArcWidth (10.0f) +#define kArcCenter (CGPointMake(self.bounds.size.width / 2, self.bounds.size.height / 2 + kArcWidth)) +#define kArcRadius (self.bounds.size.width/2.0) +#define kStartAngle (3*M_PI_4) +#define kEndAngle (M_PI_4) + + + +@interface XFGradientProgressView () + +@property (nonatomic, strong) CAShapeLayer *progressLayer; +@property (nonatomic, strong) CAShapeLayer *progressBackLayer; +//渐变的起始颜色和结束颜色 +@property (nonatomic, copy) UIColor *startColor; +@property (nonatomic, copy) UIColor *endColor; +//进度条背景颜色 +@property (nonatomic, copy) UIColor *backProgressColor; + + +@property (nonatomic ,strong) UIImageView *scheduleImg; + +@end + +@implementation XFGradientProgressView + +- (instancetype)initWithFrame:(CGRect)frame startColor:(UIColor *)startColor endColor:(UIColor *)endColor backProgressColor:(UIColor *)backProgressColor{ + if (self = [super initWithFrame:frame]) { + self.startColor = startColor; + self.endColor = endColor; + self.backProgressColor = backProgressColor; + [self createProgressBar]; + } + return self; +} + +/** + 生成贝塞尔曲线并设置为shapeLayer的路径 + */ +- (void)createProgressBar { + [self.layer addSublayer:self.progressBackLayer]; + [self.layer addSublayer:self.progressLayer]; + + UIBezierPath *bPath = [UIBezierPath bezierPathWithArcCenter:kArcCenter radius:kArcRadius startAngle:kStartAngle endAngle:kEndAngle clockwise:YES]; + self.progressLayer.path = bPath.CGPath; + self.progressBackLayer.path = bPath.CGPath; + + [self createGradientLayer]; + [self addSubview:self.scheduleImg]; + + +} + +/** + 设置色彩渐变图层 + */ +- (void)createGradientLayer { + CALayer *layer = [CALayer layer]; + layer.frame = self.bounds; + + if (!self.startColor || !self.endColor) { + self.startColor = COLOR_HEX(0xfb6400); + self.endColor = COLOR_HEX(0xfc9c00); + + } + UIColor *mediumColor = [UIColor transitionColorWithStartColor:self.startColor endColor:self.endColor position:0.5]; + + CAGradientLayer *leftLayer = [CAGradientLayer layer]; + leftLayer.frame = CGRectMake(-kArcWidth/2, -kArcWidth/2, self.bounds.size.width/2+kArcWidth/2, self.bounds.size.height+kArcWidth/2); + leftLayer.colors = @[ (id)_startColor.CGColor,(id)mediumColor.CGColor]; + leftLayer.locations = @[@0,@1]; + leftLayer.startPoint = CGPointMake(0, 1); + leftLayer.endPoint = CGPointMake(1, 0); + + CAGradientLayer *rightLayer = [CAGradientLayer layer]; + rightLayer.frame = CGRectMake(self.bounds.size.width/2, -kArcWidth/2, self.bounds.size.width/2+kArcWidth/2, self.bounds.size.height+kArcWidth/2); + rightLayer.colors = @[ (id)mediumColor.CGColor,(id)_endColor.CGColor]; + rightLayer.locations = @[@0,@1]; + rightLayer.startPoint = CGPointMake(0, 0); + rightLayer.endPoint = CGPointMake(1, 1); + + //设置蒙层 + layer.mask = self.progressLayer; + [layer addSublayer:leftLayer]; + [layer addSublayer:rightLayer]; + [self.layer addSublayer:layer]; +} + +- (void)StartAnimationToProgress:(CGFloat)progress durationTime:(CGFloat)durationTime sImgName:(NSString *)sImgName +{ + CGFloat endAngle = kStartAngle + progress*M_PI*3/2; + UIBezierPath *bPath = [UIBezierPath bezierPathWithArcCenter:kArcCenter radius:kArcRadius startAngle:kStartAngle endAngle:endAngle clockwise:YES]; + self.progressLayer.path = bPath.CGPath; + self.scheduleImg.image = [UIImage imageNamed:sImgName]; + self.scheduleImg.frame = CGRectMake(bPath.currentPoint.x-5, bPath.currentPoint.y-5, 10, 10); + self.scheduleImg.center = bPath.currentPoint; + NSLog(@"%f--%f",bPath.currentPoint.x,bPath.currentPoint.y); + + CAKeyframeAnimation *keyAnimation = [CAKeyframeAnimation animationWithKeyPath:@"strokeEnd"]; + keyAnimation.values = @[@0.0,@1.0]; + keyAnimation.duration = durationTime; + [self.progressLayer addAnimation:keyAnimation forKey:nil]; + +} + +- (CAShapeLayer *)progressLayer { + if (!_progressLayer) { + _progressLayer = [CAShapeLayer layer]; + _progressLayer.fillColor = [UIColor clearColor].CGColor; + _progressLayer.strokeColor = [UIColor whiteColor].CGColor; + _progressLayer.lineWidth = kArcWidth; + _progressLayer.lineCap = kCALineCapRound; + } + return _progressLayer; +} + +- (CAShapeLayer *)progressBackLayer { + if (!_progressBackLayer) { + _progressBackLayer = [CAShapeLayer layer]; + _progressBackLayer.fillColor = [UIColor clearColor].CGColor; + _progressBackLayer.lineWidth = kArcWidth; + _progressBackLayer.lineCap = kCALineCapRound; + _progressBackLayer.strokeColor = _backProgressColor?_backProgressColor.CGColor : [UIColor grayColor].CGColor; + + } + return _progressBackLayer; +} + + +- (UIImageView *)scheduleImg +{ + if (!_scheduleImg) + { + _scheduleImg = [UIImageView new]; +// _scheduleImg.layer.cornerRadius = 5; +// _scheduleImg.layer.masksToBounds = YES; +// _scheduleImg.backgroundColor = UIColor.redColor; + + } + return _scheduleImg; +} + + + + + + + + + + + + +@end diff --git a/FireBoltt/FB_Modules/FB_Health/View/HealthStepItemCell.swift b/FireBoltt/FB_Modules/FB_Health/View/HealthStepItemCell.swift index af3e7d5..5c4a44f 100644 --- a/FireBoltt/FB_Modules/FB_Health/View/HealthStepItemCell.swift +++ b/FireBoltt/FB_Modules/FB_Health/View/HealthStepItemCell.swift @@ -26,62 +26,157 @@ class HealthStepItemCell: CollectionViewCell { }() lazy var fb_bgView: UIView = { let view = UIView() - view.gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], locations: nil, autoLaoutFrame: CGRect(x: 0, y: 0, width: kScaleWidth(335), height: kScaleWidth(160))) +// view.gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], locations: nil, autoLaoutFrame: CGRect(x: 0, y: 0, width: kScaleWidth(335), height: kScaleWidth(160))) + view.gradient(colors: [.white, .white], locations: nil, autoLaoutFrame: CGRect(x: 0, y: 0, width: kScaleWidth(335), height: kScaleWidth(160))) view.layer.cornerRadius = 10 view.layer.masksToBounds = true return view }() - lazy var fb_stepCircleView: CircleView = { - let view = CircleView(lineWidth: 8, bottomColor: kHexColor(0xFFFFFF, 0.3), progressColor: kHexColor(0xFFFFFF), type: .doubleLine) - return view + + /// 步数 + lazy var stepProgress:XFGradientProgressView = { + let view = XFGradientProgressView(frame: CGRect(x: 18, y: 30, width: 115, height: 115), start: kRGBA(35, 128, 255, 1), end: kRGBA(35, 128, 255, 1), backProgressColor: kRGBA(35, 128, 255, 0.4)) + view!.startAnimation(toProgress: 0, durationTime: 0, sImgName: "icon_step") + return view! }() + + /// 热量 + lazy var distanceProgress:XFGradientProgressView = { + let view = XFGradientProgressView(frame: CGRect(x: stepProgress.left+12.5, y: stepProgress.top+10, width: stepProgress.width-25, height: stepProgress.height-20), start: kRGBA(253, 161, 40, 1), end: kRGBA(253, 161, 40, 1), backProgressColor: kRGBA(253, 161, 40, 0.4)) + view!.startAnimation(toProgress: 0, durationTime: 0, sImgName: "icon_distance") + return view! + }() + + /// 总里程 + lazy var calorieProgress:XFGradientProgressView = { + let view = XFGradientProgressView(frame: CGRect(x: distanceProgress.left+12.5, y: distanceProgress.top+10, width: distanceProgress.width-25, height: distanceProgress.height-19), start: kRGBA(255, 0, 96, 1), end: kRGBA(255, 0, 96, 1), backProgressColor: kRGBA(255, 0, 96, 0.4)) + view!.startAnimation(toProgress: 0, durationTime: 0, sImgName: "icon_calories") + return view! + }() + + +// lazy var fb_stepCircleView: CircleView = { +// let view = CircleView(lineWidth: 8, bottomColor: kHexColor(0xFFFFFF, 0.3), progressColor: kHexColor(0xFFFFFF), type: .doubleLine) +// return view +// }() + + /// 步数 lazy var fb_stepValue: UILabel = { let label = UILabel() - label.font = DigitalFont(32) - label.textColor = kHexColor(0xffffff) + label.font = DigitalFont(25) + label.textColor = kRGBA(42, 42, 42, 1) label.text = "0" return label }() + + /// 步数单位 lazy var fb_stepUnit: UILabel = { let label = UILabel() label.font = SystemRegularFont(12) - label.textColor = kHexColor(0xffffff) + label.textColor = kRGBA(133, 133, 133, 1) label.text = MultiLanguageKey_FB.stepTipFB.localized return label }() - lazy var fb_dataCircleView: CircleView = { - let view = CircleView(lineWidth: 2, bottomColor: kHexColor(0xfffff, 0.3), type: .dottedLine) - return view - }() +// lazy var fb_dataCircleView: CircleView = { +// let view = CircleView(lineWidth: 2, bottomColor: kHexColor(0xfffff, 0.3), type: .dottedLine) +// return view +// }() + + /// 千卡数据 lazy var fb_stepCaloriesValue: UILabel = { let label = UILabel() - label.font = SystemMediumFont(21) - label.textColor = kHexColor(0xffffff) + label.font = DigitalFont(25) + label.textColor = kRGBA(42, 42, 42, 1) label.text = "0" return label }() + /// 公里数据 lazy var fb_stepDistanceValue: UILabel = { let label = UILabel() - label.font = SystemMediumFont(21) - label.textColor = kHexColor(0xffffff) + label.font = DigitalFont(25) + label.textColor = kRGBA(42, 42, 42, 1) label.text = "0" return label }() + + /// 千卡单位 lazy var fb_stepCalories: UILabel = { let label = UILabel() label.font = SystemRegularFont(12) - label.textColor = kHexColor(0x004EFF) + label.textColor = kRGBA(133, 133, 133, 1) label.text = MultiLanguageKey_FB.kcalFB.localized return label }() + + /// 公里单位 lazy var fb_stepDistance: UILabel = { let label = UILabel() label.font = SystemRegularFont(12) - label.textColor = kHexColor(0x004EFF) + label.textColor = kRGBA(133, 133, 133, 1) label.text = MultiLanguageKey_FB.kmFB.localized return label }() + /// 线条 + lazy var line: UILabel = { + let label = UILabel() + label.backgroundColor = kRGBA(235, 235, 235, 1) + return label + }() + lazy var line1: UILabel = { + let label = UILabel() + label.backgroundColor = kRGBA(235, 235, 235, 1) + return label + }() + + /// 圆点 + lazy var point: UILabel = { + let label = UILabel() + label.backgroundColor = kRGBA(88, 157, 245, 1) + label.layer.cornerRadius = 2.5 + label.layer.masksToBounds = true + return label + }() + lazy var point1: UILabel = { + let label = UILabel() + label.backgroundColor = kRGBA(255, 0, 96, 1) + label.layer.cornerRadius = 2.5 + label.layer.masksToBounds = true + return label + }() + lazy var point2: UILabel = { + let label = UILabel() + label.backgroundColor = kRGBA(253, 161, 40, 1) + label.layer.cornerRadius = 2.5 + label.layer.masksToBounds = true + return label + }() + + /// 问题提示 + lazy var tlabel: UILabel = { + let label = UILabel() + label.font = SystemRegularFont(13) + label.textColor = kRGBA(42, 42, 42, 1) + label.text = MultiLanguageKey_FB.stepNumberFB.localized + return label + }() + lazy var tlabel1: UILabel = { + let label = UILabel() + label.font = SystemRegularFont(13) + label.textColor = kRGBA(42, 42, 42, 1) + label.text = MultiLanguageKey_FB.heatFB.localized + return label + }() + lazy var tlabel2: UILabel = { + let label = UILabel() + label.font = SystemRegularFont(13) + label.textColor = kRGBA(42, 42, 42, 1) + label.text = MultiLanguageKey_FB.totalDistanceFB.localized + return label + }() + + + // override init(frame: CGRect) { // super.init(frame: frame) // selectionStyle = .none @@ -108,14 +203,27 @@ class HealthStepItemCell: CollectionViewCell { containerView.addSubview(fb_titleLabel) containerView.addSubview(fb_dateLabel) containerView.addSubview(fb_bgView) - fb_bgView.addSubview(fb_stepCircleView) - fb_bgView.addSubview(fb_dataCircleView) - fb_stepCircleView.addSubview(fb_stepValue) - fb_stepCircleView.addSubview(fb_stepUnit) - fb_dataCircleView.addSubview(fb_stepCaloriesValue) - fb_dataCircleView.addSubview(fb_stepDistanceValue) - fb_dataCircleView.addSubview(fb_stepCalories) - fb_dataCircleView.addSubview(fb_stepDistance) +// fb_bgView.addSubview(fb_stepCircleView) +// fb_bgView.addSubview(fb_dataCircleView) + fb_bgView.addSubview(stepProgress) + fb_bgView.addSubview(distanceProgress) + fb_bgView.addSubview(calorieProgress) + + fb_bgView.addSubview(fb_stepValue) + fb_bgView.addSubview(fb_stepUnit) + fb_bgView.addSubview(fb_stepCaloriesValue) + fb_bgView.addSubview(fb_stepDistanceValue) + fb_bgView.addSubview(fb_stepCalories) + fb_bgView.addSubview(fb_stepDistance) + + fb_bgView.addSubview(line) + fb_bgView.addSubview(line1) + fb_bgView.addSubview(point) + fb_bgView.addSubview(point1) + fb_bgView.addSubview(point2) + fb_bgView.addSubview(tlabel) + fb_bgView.addSubview(tlabel1) + fb_bgView.addSubview(tlabel2) } override func layoutUI() { @@ -133,40 +241,94 @@ class HealthStepItemCell: CollectionViewCell { make.right.equalTo(-20) make.height.equalTo(kScaleWidth(160)) } - fb_stepCircleView.snp.makeConstraints { (make) in - make.centerY.equalToSuperview() - make.width.height.equalTo(kScaleWidth(130)) - make.left.equalTo(kScaleWidth(28)) +// fb_stepCircleView.snp.makeConstraints { (make) in +// make.centerY.equalToSuperview() +// make.width.height.equalTo(kScaleWidth(130)) +// make.left.equalTo(kScaleWidth(28)) +// } + fb_stepUnit.snp.makeConstraints { (make) in + make.top.equalTo(fb_bgView) + make.right.equalTo(fb_bgView.snp_right).inset(18.5) + make.height.equalTo(kScaleWidth(160)/3) } + fb_stepValue.snp.makeConstraints { (make) in - make.top.equalTo(kScaleWidth(39)) - make.centerX.equalToSuperview() - } - fb_stepUnit.snp.makeConstraints { (make) in - make.top.equalTo(fb_stepValue.snp.bottom) - make.centerX.equalToSuperview() + make.centerY.equalTo(fb_stepUnit) + make.right.equalTo(fb_bgView.snp_right).inset(52.5) } - fb_dataCircleView.snp.makeConstraints { (make) in - make.centerY.equalToSuperview() - make.width.height.equalTo(kScaleWidth(130)) - make.right.equalTo(-kScaleWidth(28)) + +// fb_dataCircleView.snp.makeConstraints { (make) in +// make.centerY.equalToSuperview() +// make.width.height.equalTo(kScaleWidth(130)) +// make.right.equalTo(-kScaleWidth(28)) +// } + + fb_stepCalories.snp.makeConstraints { (make) in + make.right.equalTo(fb_bgView.snp_right).inset(18.5) + make.height.equalTo(kScaleWidth(160)/3) + make.top.equalTo(fb_stepUnit.snp_bottom) } + fb_stepCaloriesValue.snp.makeConstraints { (make) in - make.top.equalTo(kScaleWidth(34)) - make.centerX.equalToSuperview() + make.centerY.equalTo(fb_stepCalories) + make.right.equalTo(fb_bgView.snp_right).inset(52.5) + } + + + fb_stepDistance.snp.makeConstraints { (make) in + make.right.equalTo(fb_bgView.snp_right).inset(18.5) + make.height.equalTo(kScaleWidth(160)/3) + make.top.equalTo(fb_stepCalories.snp_bottom) } fb_stepDistanceValue.snp.makeConstraints { (make) in - make.top.equalTo(fb_stepCaloriesValue.snp.bottom).offset(kScaleWidth(4)) - make.centerX.equalToSuperview() + make.centerY.equalTo(fb_stepDistance) + make.right.equalTo(fb_bgView.snp_right).inset(52.5) } - fb_stepCalories.snp.makeConstraints { (make) in - make.lastBaseline.equalTo(fb_stepCaloriesValue.snp.lastBaseline) - make.left.equalTo(fb_stepCaloriesValue.snp.right).offset(5) + + line.snp.makeConstraints { make in + make.right.equalTo(fb_bgView.snp_right).inset(12) + make.left.equalTo(fb_bgView).offset(160) + make.top.equalTo(fb_stepUnit.snp_bottom) + make.height.equalTo(0.5) } - fb_stepDistance.snp.makeConstraints { (make) in - make.lastBaseline.equalTo(fb_stepDistanceValue.snp.lastBaseline) - make.left.equalTo(fb_stepDistanceValue.snp.right).offset(5) + line1.snp.makeConstraints { make in + make.right.equalTo(fb_bgView.snp_right).inset(12) + make.left.equalTo(fb_bgView).offset(160) + make.top.equalTo(fb_stepCalories.snp_bottom) + make.height.equalTo(0.5) + } + + point.snp.makeConstraints { make in + make.left.equalTo(line.snp_left); + make.centerY.equalTo(fb_stepUnit); + make.size.equalTo(CGSize(width: 5, height: 5)) } + point1.snp.makeConstraints { make in + make.left.equalTo(line.snp_left); + make.centerY.equalTo(fb_stepCalories); + make.size.equalTo(CGSize(width: 5, height: 5)) + } + point2.snp.makeConstraints { make in + make.left.equalTo(line.snp_left); + make.centerY.equalTo(fb_stepDistance); + make.size.equalTo(CGSize(width: 5, height: 5)) + } + + tlabel.snp.makeConstraints { make in + make.left.equalTo(point.snp_right).offset(10) + make.centerY.equalTo(point); + } + + tlabel1.snp.makeConstraints { make in + make.left.equalTo(point1.snp_right).offset(10) + make.centerY.equalTo(point1); + } + + tlabel2.snp.makeConstraints { make in + make.left.equalTo(point2.snp_right).offset(10) + make.centerY.equalTo(point2); + } + } override func bind(model: ViewModel) { @@ -183,7 +345,10 @@ class HealthStepItemCell: CollectionViewCell { .disposed(by: cellDisposeBag) viewModel.progress .subscribe(onNext: { [weak self] (progress) in - self?.fb_stepCircleView.updateProcess(process: Float(progress)) +// self?.fb_stepCircleView.updateProcess(process: Float(progress)) + self?.stepProgress .startAnimation(toProgress: CGFloat(Float(progress)), durationTime: 0, sImgName: "icon_step") + self?.distanceProgress .startAnimation(toProgress: CGFloat(Float(progress)), durationTime: 0, sImgName: "icon_distance") + self?.calorieProgress .startAnimation(toProgress: CGFloat(Float(progress)), durationTime: 0, sImgName: "icon_calories") }) .disposed(by: cellDisposeBag) viewModel.dateStr diff --git a/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift b/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift index 02e08bd..9c7a178 100644 --- a/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift +++ b/FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift @@ -15,7 +15,7 @@ fileprivate enum Resuable { class MineViewController: TableViewController { lazy var headerView: MineHeaderView = { - let view = MineHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180))) + let view = MineHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180)+10)) return view }() @@ -27,8 +27,15 @@ class MineViewController: TableViewController { super.makeUI() isTitleCenter = true navigationTitle = MultiLanguageKey_FB.mineFB.localized - tableViewStyle = .grouped + if #available(iOS 13.0, *) { + tableViewStyle = .insetGrouped + } else { + // Fallback on earlier versions + tableViewStyle = .grouped + } tableView.backgroundColor = kHexColor(0xFAFAFA) + tableView.rowHeight = kScaleWidth(52) + tableView.separatorStyle = UITableViewCell.SeparatorStyle.singleLine tableView.register(Resuable.tableViewCell) var top = kBatteryH; diff --git a/FireBoltt/FB_Modules/FB_My/Controller/TargetVC.swift b/FireBoltt/FB_Modules/FB_My/Controller/TargetVC.swift index 79b9bf2..269dc02 100644 --- a/FireBoltt/FB_Modules/FB_My/Controller/TargetVC.swift +++ b/FireBoltt/FB_Modules/FB_My/Controller/TargetVC.swift @@ -74,7 +74,12 @@ class TargetVC: TableViewController { override func makeUI() { super.makeUI() // tableView - tableViewStyle = .grouped + if #available(iOS 13.0, *) { + tableViewStyle = .insetGrouped + } else { + // Fallback on earlier versions + // tableViewStyle = .grouped + } tableView.register(Resuable.tableViewCell) tableView.rx.setDelegate(self).disposed(by: rx.disposeBag) tableView.backgroundColor = kHexColor(0xFAFAFA) diff --git a/FireBoltt/FB_Modules/FB_My/Controller/UnitSetVC.swift b/FireBoltt/FB_Modules/FB_My/Controller/UnitSetVC.swift index 29f5586..b69405f 100644 --- a/FireBoltt/FB_Modules/FB_My/Controller/UnitSetVC.swift +++ b/FireBoltt/FB_Modules/FB_My/Controller/UnitSetVC.swift @@ -32,7 +32,12 @@ class UnitSetVC: TableViewController { private func setupTableView() { view.addSubview(tableView) - tableViewStyle = .grouped + if #available(iOS 13.0, *) { + tableViewStyle = .insetGrouped + } else { + // Fallback on earlier versions + // tableViewStyle = .grouped + } tableView.register(Resuable.tableViewCell) // tableView.sectionHeaderHeight = 0 tableView.snp.makeConstraints { (make) in diff --git a/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift b/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift index 3dffa55..41a1233 100644 --- a/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift +++ b/FireBoltt/FB_Modules/FB_My/MineHeaderView.swift @@ -35,24 +35,38 @@ 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 + }() + override init(frame: CGRect) { super.init(frame: frame) - gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5), locations: nil) + //gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5), locations: nil) + self.backgroundColor = .clear setUpUI() initHeaderView() } private func setUpUI() { + addSubview(bgView) addSubview(userIconImg) addSubview(userNameLabel) addSubview(rightArrow) } private func initHeaderView() { + bgView.snp.makeConstraints { make in + make.left.right.equalTo(self) + make.top.equalTo(self) + make.bottom.equalTo(self.snp_bottom).inset(10); + } + // 头像 userIconImg.snp.makeConstraints { (make) in make.left.equalTo(30) - make.bottom.equalTo(-20) + make.bottom.equalTo(-30) make.width.height.equalTo(Metric.userIconWH) } // 用户名 diff --git a/FireBoltt/FB_Modules/FB_Sport/Controller/SportViewControllers.swift b/FireBoltt/FB_Modules/FB_Sport/Controller/SportViewControllers.swift index dee98aa..5c240a6 100644 --- a/FireBoltt/FB_Modules/FB_Sport/Controller/SportViewControllers.swift +++ b/FireBoltt/FB_Modules/FB_Sport/Controller/SportViewControllers.swift @@ -21,7 +21,7 @@ class SportViewControllers: TableViewController { let btn = UIButton().then { $0.setTitleColor(kHexColor(0x2A2A2A), for: .normal) $0.setTitle(MultiLanguageKey_FB.allSportFB.localized, for: .normal) - $0.setImage(R.image.fb_sport_history_up_icon(), for: .normal) + $0.setImage(R.image.fb_sport_history_up(), for: .normal) $0.setImage(R.image.fb_sport_history_down(), for: .selected) $0.titleLabel?.font = SystemMediumFont(20) $0.changgeImageAndTitleEdgeInsets(type: 1, spacing: 5.0) @@ -36,7 +36,7 @@ class SportViewControllers: TableViewController { }() /// 日期选择 private lazy var dateHeaderView: DateSwitchHeaderView = { - let view = DateSwitchHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleHeight(103))) + let view = DateSwitchHeaderView(frame: CGRect(x: 20, y: 15, width: kScreenW-40, height: kScaleHeight(103))) view.segControlValueChangeClosure = { [weak self] (type) in guard let `self` = self else { return } guard let viewModel = self.viewModel as? SportViewModels else { return } @@ -121,12 +121,19 @@ class SportViewControllers: TableViewController { tableView.rowHeight = kScaleHeight(80) tableView.backgroundColor = .white + dateHeaderView.layer.cornerRadius = 10 + dateHeaderView.layer.shadowOffset = CGSize(width: 0, height: 1.5) + dateHeaderView.layer.shadowOpacity = 1 + dateHeaderView.layer.shadowRadius = 7 + dateHeaderView.layer.shadowColor = UIColor(red: 0.15, green: 0.54, blue: 0.82, alpha: 0.2).cgColor + + layoutUI() } func layoutUI() { tableView.snp.makeConstraints { (make) in - make.top.equalTo(dateHeaderView.snp.bottom) + make.top.equalTo(dateHeaderView.snp.bottom).offset(15) make.left.right.bottom.equalToSuperview() } nodataView.snp.makeConstraints { (make) in diff --git a/FireBoltt/FB_Modules/FB_Sport/View/SportDetailHeaderView.swift b/FireBoltt/FB_Modules/FB_Sport/View/SportDetailHeaderView.swift index 5d9533a..feee69b 100644 --- a/FireBoltt/FB_Modules/FB_Sport/View/SportDetailHeaderView.swift +++ b/FireBoltt/FB_Modules/FB_Sport/View/SportDetailHeaderView.swift @@ -18,7 +18,7 @@ class SportDetailHeaderView: UIView { /// 视图 lazy var sportUserView: SportUserView = { let view = SportUserView() - view.backgroundColor = .orange + view.backgroundColor = kHexColor(0x2B75FF) view.fbuserIconImg.image = R.image.user_Icon_header() if let userInfo = UserDefaultsManagerFrieBoltt.getUserInfo() { view.fbuserNameLabel.text = userInfo.nickname diff --git a/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.swift b/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.swift index 50a52bf..264eadb 100644 --- a/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.swift +++ b/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.swift @@ -38,10 +38,11 @@ class SportHeaderView: UIView { dataBgView.layer.shadowOpacity = 1 dataBgView.layer.shadowRadius = 7 dataBgView.layer.shadowColor = UIColor(red: 0.15, green: 0.54, blue: 0.82, alpha: 0.2).cgColor - bgViewStyle(view: distanceBgView, color: kHexColor(0xFFCC9C)) - bgViewStyle(view: countBgView, color: kHexColor(0x80D0FF)) - bgViewStyle(view: durationBgView, color: kHexColor(0x9CAFFF)) - bgViewStyle(view: caloriesBgView, color: kHexColor(0xFFCC9C)) + + bgViewStyle(view: distanceBgView, color: kHexColor(0x85C1FF)) + bgViewStyle(view: countBgView, color: kHexColor(0x58CEC4)) + bgViewStyle(view: durationBgView, color: kHexColor(0x9DBD60)) + bgViewStyle(view: caloriesBgView, color: kHexColor(0xF56698)) distanceTipLabel.text = MultiLanguageKey_FB.totalDistanceFB.localized countTipLabel.text = MultiLanguageKey_FB.totalCountFB.localized durationTipLabel.text = MultiLanguageKey_FB.totalDurationFB.localized @@ -63,7 +64,7 @@ class SportHeaderView: UIView { let metric = UserDefaultsManagerFrieBoltt.getUserInfo()?.metricUnit ?? 0 let distanceStr = metric == 0 ? String(format: "%0.2lf",CGFloat(distance) / 1000.0) : String(format: "%0.2lf", CGFloat(distance) / 1000.0 * 0.62137) distanceValueLabel.text = distanceStr - distanceUnitLabel.text = metric == 0 ? "km" : "miles" + distanceUnitLabel.text = metric == 0 ? "公里" : "miles" caloriesValueLabel.text = String(calories) durationValueLabel.text = String(format: "%.1lf", Double(duration) / 3600) countValueLabel.text = String(sports.count) diff --git a/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.xib b/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.xib index a24d9d4..c08c709 100644 --- a/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.xib +++ b/FireBoltt/FB_Modules/FB_Sport/View/SportHeaderView.xib @@ -1,15 +1,16 @@ - + - + + - + @@ -19,141 +20,172 @@ - - - - + - - - + + + + + + - - - + - + - - - + + + + + - - - - + - - + + + + - + - - - - + + - - - + + + + + - + @@ -200,7 +232,12 @@ - + + + + + + diff --git a/FireBoltt/FB_Modules/FB_Sport/View/SportHistoryCategoryView.swift b/FireBoltt/FB_Modules/FB_Sport/View/SportHistoryCategoryView.swift index 68625da..ac58839 100644 --- a/FireBoltt/FB_Modules/FB_Sport/View/SportHistoryCategoryView.swift +++ b/FireBoltt/FB_Modules/FB_Sport/View/SportHistoryCategoryView.swift @@ -42,7 +42,7 @@ class SportHistoryCategoryView: UIView { $0.showsVerticalScrollIndicator = false } lazy var bottomImg: UIImageView = { - let img = UIImageView(image: R.image.fb_sport_history_up_icon()) + let img = UIImageView(image: R.image.fb_sport_history_up()) img.frame = CGRect(x: 0, y: 0, width: kScaleWidth(105), height: 10) img.contentMode = .scaleAspectFit // img.backgroundColor = .white diff --git a/FireBoltt/FB_Modules/FB_Sport/View/SportTrackView.swift b/FireBoltt/FB_Modules/FB_Sport/View/SportTrackView.swift index 3b6f8d6..ad45549 100644 --- a/FireBoltt/FB_Modules/FB_Sport/View/SportTrackView.swift +++ b/FireBoltt/FB_Modules/FB_Sport/View/SportTrackView.swift @@ -26,12 +26,12 @@ class SportTrackView: UIView { private var tempCoordinateRegion: MKCoordinateRegion? lazy var scaleAdd: UIButton = { let view = UIButton() - view.setImage(R.image.fb_sport_icon_add_icon(), for: .normal) + view.setImage(R.image.fb_sport_icon_add(), for: .normal) return view }() lazy var fbscaleReduce: UIButton = { let view = UIButton() - view.setImage(R.image.fb_sport_icon_reduce_icon(), for: .normal) + view.setImage(R.image.fb_sport_icon_reduce(), for: .normal) return view }() var coordinateArr: [CLLocationCoordinate2D] = [] diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/Contents.json similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/meunImg/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/Contents.json diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/Contents.json similarity index 75% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/Contents.json index c1c0411..aa3e85d 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_homework@2x.png", + "filename" : "button_unbind@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_homework@3x.png", + "filename" : "button_unbind@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/button_unbind@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/button_unbind@2x.png new file mode 100644 index 0000000..6bbb4aa Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/button_unbind@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/button_unbind@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/button_unbind@3x.png new file mode 100644 index 0000000..6fc7695 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/button_unbind.imageset/button_unbind@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/Contents.json similarity index 78% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/Contents.json index cb4d2bb..b5a0f3f 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_sos@2x.png", + "filename" : "icon_DND@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_sos@3x.png", + "filename" : "icon_DND@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/icon_DND@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/icon_DND@2x.png new file mode 100644 index 0000000..82bbb65 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/icon_DND@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/icon_DND@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/icon_DND@3x.png new file mode 100644 index 0000000..82c9cb7 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_DND.imageset/icon_DND@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/Contents.json new file mode 100644 index 0000000..c37d66b --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_app_notification@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_app_notification@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/icon_app_notification@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/icon_app_notification@2x.png new file mode 100644 index 0000000..eb6d088 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/icon_app_notification@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/icon_app_notification@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/icon_app_notification@3x.png new file mode 100644 index 0000000..ea519e2 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_app_notification.imageset/icon_app_notification@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/Contents.json new file mode 100644 index 0000000..29893de --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_bright_screen@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_bright_screen@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/icon_bright_screen@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/icon_bright_screen@2x.png new file mode 100644 index 0000000..b9d95f0 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/icon_bright_screen@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/icon_bright_screen@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/icon_bright_screen@3x.png new file mode 100644 index 0000000..3693335 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_bright_screen.imageset/icon_bright_screen@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/Contents.json new file mode 100644 index 0000000..18712a1 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_call_notification@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_call_notification@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/icon_call_notification@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/icon_call_notification@2x.png new file mode 100644 index 0000000..3c7717f Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/icon_call_notification@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/icon_call_notification@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/icon_call_notification@3x.png new file mode 100644 index 0000000..fbd43ee Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_call_notification.imageset/icon_call_notification@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/Contents.json similarity index 76% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/Contents.json index 761b3ac..a09b13e 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_on_off@2x.png", + "filename" : "icon_camera@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_on_off@3x.png", + "filename" : "icon_camera@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/icon_camera@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/icon_camera@2x.png new file mode 100644 index 0000000..9b82a65 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/icon_camera@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/icon_camera@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/icon_camera@3x.png new file mode 100644 index 0000000..a3d5f33 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_camera.imageset/icon_camera@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/Contents.json similarity index 77% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/Contents.json index f605c34..90f9d04 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_alarm@2x.png", + "filename" : "icon_card@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_alarm@3x.png", + "filename" : "icon_card@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/icon_card@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/icon_card@2x.png new file mode 100644 index 0000000..7357dde Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/icon_card@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/icon_card@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/icon_card@3x.png new file mode 100644 index 0000000..2dd7fa4 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_card.imageset/icon_card@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/Contents.json similarity index 74% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/Contents.json index 4381a10..354f1b6 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "sport_icon_start@2x.png", + "filename" : "icon_devide_dial@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "sport_icon_start@3x.png", + "filename" : "icon_devide_dial@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/icon_devide_dial@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/icon_devide_dial@2x.png new file mode 100644 index 0000000..0a0394b Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/icon_devide_dial@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/icon_devide_dial@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/icon_devide_dial@3x.png new file mode 100644 index 0000000..a1f8ad0 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_devide_dial.imageset/icon_devide_dial@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/Contents.json similarity index 76% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/Contents.json index 0bc3d18..945c20c 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_member@2x.png", + "filename" : "icon_drink@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_member@3x.png", + "filename" : "icon_drink@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/icon_drink@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/icon_drink@2x.png new file mode 100644 index 0000000..ec89755 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/icon_drink@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/icon_drink@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/icon_drink@3x.png new file mode 100644 index 0000000..6cefde1 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_drink.imageset/icon_drink@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/Contents.json new file mode 100644 index 0000000..7790fb0 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_find@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_find@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/icon_find@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/icon_find@2x.png new file mode 100644 index 0000000..380e263 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/icon_find@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/icon_find@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/icon_find@3x.png new file mode 100644 index 0000000..6cfe5c6 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_find.imageset/icon_find@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/Contents.json new file mode 100644 index 0000000..31d9e4c --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_hr@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_hr@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/icon_hr@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/icon_hr@2x.png new file mode 100644 index 0000000..c33f30f Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/icon_hr@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/icon_hr@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/icon_hr@3x.png new file mode 100644 index 0000000..b7f1d53 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_hr.imageset/icon_hr@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/Contents.json new file mode 100644 index 0000000..bad1792 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_message_notification@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_message_notification@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/icon_message_notification@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/icon_message_notification@2x.png new file mode 100644 index 0000000..2ac2dc8 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/icon_message_notification@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/icon_message_notification@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/icon_message_notification@3x.png new file mode 100644 index 0000000..89a235d Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_message_notification.imageset/icon_message_notification@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/Contents.json new file mode 100644 index 0000000..c30bcd3 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_music@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_music@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/icon_music@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/icon_music@2x.png new file mode 100644 index 0000000..c20759e Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/icon_music@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/icon_music@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/icon_music@3x.png new file mode 100644 index 0000000..747f257 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_music.imageset/icon_music@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/Contents.json similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/Contents.json diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/icon_phonebook@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/icon_phonebook@2x.png new file mode 100644 index 0000000..b59dc5b Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/icon_phonebook@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/icon_phonebook@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/icon_phonebook@3x.png new file mode 100644 index 0000000..b1fd130 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_phonebook.imageset/icon_phonebook@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/Contents.json similarity index 76% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/Contents.json index c0ceef8..ae08545 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_family@2x.png", + "filename" : "icon_remind@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_family@3x.png", + "filename" : "icon_remind@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/icon_remind@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/icon_remind@2x.png new file mode 100644 index 0000000..ce061dd Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/icon_remind@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/icon_remind@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/icon_remind@3x.png new file mode 100644 index 0000000..d42fd3a Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_remind.imageset/icon_remind@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/Contents.json similarity index 75% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/Contents.json index eb5ccda..beb1208 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_anti_lost@2x.png", + "filename" : "icon_sedentary@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_anti_lost@3x.png", + "filename" : "icon_sedentary@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/icon_sedentary@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/icon_sedentary@2x.png new file mode 100644 index 0000000..c10a703 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/icon_sedentary@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/icon_sedentary@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/icon_sedentary@3x.png new file mode 100644 index 0000000..81ee283 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_sedentary.imageset/icon_sedentary@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/Contents.json similarity index 74% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/Contents.json index 9cb3022..11ff859 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "sport_icon_add@2x.png", + "filename" : "icon_temperature@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "sport_icon_add@3x.png", + "filename" : "icon_temperature@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/icon_temperature@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/icon_temperature@2x.png new file mode 100644 index 0000000..8f61982 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/icon_temperature@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/icon_temperature@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/icon_temperature@3x.png new file mode 100644 index 0000000..4d6fe82 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_temperature.imageset/icon_temperature@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/Contents.json similarity index 76% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/Contents.json index 7f15214..309323b 100644 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_call_up@2x.png", + "filename" : "icon_version@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_call_up@3x.png", + "filename" : "icon_version@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/icon_version@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/icon_version@2x.png new file mode 100644 index 0000000..4dad328 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/icon_version@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/icon_version@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/icon_version@3x.png new file mode 100644 index 0000000..b96da88 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_version.imageset/icon_version@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/Contents.json new file mode 100644 index 0000000..cba6d91 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_wallet@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_wallet@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/icon_wallet@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/icon_wallet@2x.png new file mode 100644 index 0000000..81db2f0 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/icon_wallet@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/icon_wallet@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/icon_wallet@3x.png new file mode 100644 index 0000000..e84303d Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/icon_wallet.imageset/icon_wallet@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/Contents.json new file mode 100644 index 0000000..8411723 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "picture_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "picture_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/picture_bg@2x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/picture_bg@2x.png new file mode 100644 index 0000000..2823aa9 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/picture_bg@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/picture_bg@3x.png b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/picture_bg@3x.png new file mode 100644 index 0000000..42f2d91 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/DeviceMenuIcon/picture_bg.imageset/picture_bg@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/Contents.json new file mode 100644 index 0000000..cc881b6 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_calories@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_calories@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/icon_calories@2x.png b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/icon_calories@2x.png new file mode 100644 index 0000000..a442894 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/icon_calories@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/icon_calories@3x.png b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/icon_calories@3x.png new file mode 100644 index 0000000..676b6ad Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_calories.imageset/icon_calories@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/Contents.json new file mode 100644 index 0000000..ac511d4 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_distance@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_distance@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/icon_distance@2x.png b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/icon_distance@2x.png new file mode 100644 index 0000000..5de9e51 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/icon_distance@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/icon_distance@3x.png b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/icon_distance@3x.png new file mode 100644 index 0000000..53e2aea Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_distance.imageset/icon_distance@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/Contents.json similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/Contents.json diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/icon_step@2x.png b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/icon_step@2x.png new file mode 100644 index 0000000..d6593a4 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/icon_step@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/icon_step@3x.png b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/icon_step@3x.png new file mode 100644 index 0000000..f21aa41 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/HealthImg/icon_step.imageset/icon_step@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/Contents.json index d0edc69..0371751 100644 --- a/FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "icon_1024@2x.jpg", + "filename" : "fb_icon_1024@2x.jpg", "idiom" : "universal", "scale" : "2x" }, diff --git a/FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/icon_1024@2x.jpg b/FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/fb_icon_1024@2x.jpg similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/icon_1024@2x.jpg rename to FireBoltt/Resource/Assets.xcassets/MineImg/fb_icon_1024.imageset/fb_icon_1024@2x.jpg diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/Contents.json index 2f0b83c..5b62881 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_badminton@2x.png", + "filename" : "fb_icon_badminton@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_badminton@3x.png", + "filename" : "fb_icon_badminton@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..ca5f2e1 Binary files /dev/null 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 new file mode 100644 index 0000000..4afe69b Binary files /dev/null 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_badminton.imageset/icon_badminton@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/icon_badminton@2x.png deleted file mode 100644 index d8b4c1d..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/icon_badminton@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/icon_badminton@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/icon_badminton@3x.png deleted file mode 100644 index 32619ec..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/icon_badminton@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/Contents.json index defd8ba..1507508 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_basketball@2x.png", + "filename" : "fb_icon_basketball@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_basketball@3x.png", + "filename" : "fb_icon_basketball@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..b0dc3af Binary files /dev/null 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 new file mode 100644 index 0000000..ade6e70 Binary files /dev/null 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_basketball.imageset/icon_basketball@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/icon_basketball@2x.png deleted file mode 100644 index 0cc3c60..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/icon_basketball@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/icon_basketball@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/icon_basketball@3x.png deleted file mode 100644 index 1815b27..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/icon_basketball@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/Contents.json index 17fa440..e593e6a 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_bike@2x.png", + "filename" : "fb_icon_bike@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_bike@3x.png", + "filename" : "fb_icon_bike@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/icon_bike@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/icon_bike@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/icon_bike@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/icon_bike@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/Contents.json index 39d5519..163da31 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_bm@2x.png", + "filename" : "fb_icon_bm@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_bm@3x.png", + "filename" : "fb_icon_bm@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..307d21f Binary files /dev/null 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 new file mode 100644 index 0000000..901b9b8 Binary files /dev/null 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_bm.imageset/icon_bm@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/icon_bm@2x.png deleted file mode 100644 index 1abee71..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/icon_bm@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/icon_bm@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/icon_bm@3x.png deleted file mode 100644 index 6a779a7..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/icon_bm@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/Contents.json index cea6646..9411507 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_Average cadence@2x.png", + "filename" : "fb_icon_cadence@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_Average cadence@3x.png", + "filename" : "fb_icon_cadence@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/icon_Average cadence@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/icon_Average cadence@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/icon_Average cadence@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/icon_Average cadence@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/Contents.json index f2826e2..40294bf 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_climb@2x.png", + "filename" : "fb_icon_climb@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_climb@3x.png", + "filename" : "fb_icon_climb@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/icon_climb@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/icon_climb@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/icon_climb@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/icon_climb@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/Contents.json index 21643d0..807fd5b 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_football@2x.png", + "filename" : "fb_icon_football@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_football@3x.png", + "filename" : "fb_icon_football@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..96f419a Binary files /dev/null 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 new file mode 100644 index 0000000..a8e4e85 Binary files /dev/null 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_football.imageset/icon_football@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/icon_football@2x.png deleted file mode 100644 index 1381bcd..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/icon_football@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/icon_football@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/icon_football@3x.png deleted file mode 100644 index 99b652d..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/icon_football@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/Contents.json index b0fc1fa..ab4e1bc 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_free@2x.png", + "filename" : "fb_icon_free@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_free@3x.png", + "filename" : "fb_icon_free@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..d0b7411 Binary files /dev/null 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 new file mode 100644 index 0000000..02dae0e Binary files /dev/null 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_free.imageset/icon_free@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/icon_free@2x.png deleted file mode 100644 index 627ac26..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/icon_free@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/icon_free@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/icon_free@3x.png deleted file mode 100644 index 1bc98d4..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/icon_free@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/Contents.json index d516f16..dfaedf4 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_gym@2x.png", + "filename" : "fb_icon_gym@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_gym@3x.png", + "filename" : "fb_icon_gym@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..9fb22d9 Binary files /dev/null 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 new file mode 100644 index 0000000..618f92f Binary files /dev/null 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_gym.imageset/icon_gym@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/icon_gym@2x.png deleted file mode 100644 index f6c7826..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/icon_gym@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/icon_gym@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/icon_gym@3x.png deleted file mode 100644 index 0407c0f..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/icon_gym@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/Contents.json index 9ba7c4f..b073e05 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_indoor_cycling@2x.png", + "filename" : "fb_icon_indoor_cycling@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_indoor_cycling@3x.png", + "filename" : "fb_icon_indoor_cycling@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..88ea5b9 Binary files /dev/null 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 new file mode 100644 index 0000000..3a74e45 Binary files /dev/null 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_cycling.imageset/icon_indoor_cycling@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/icon_indoor_cycling@2x.png deleted file mode 100644 index 06ff847..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/icon_indoor_cycling@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/icon_indoor_cycling@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/icon_indoor_cycling@3x.png deleted file mode 100644 index afec959..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/icon_indoor_cycling@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/Contents.json index dabef9f..7f3bf44 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_indoor_walking@2x.png", + "filename" : "fb_icon_indoor_walking@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_indoor_walking@3x.png", + "filename" : "fb_icon_indoor_walking@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..b9174a0 Binary files /dev/null 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 new file mode 100644 index 0000000..d0f8dae Binary files /dev/null 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_indoor_walking.imageset/icon_indoor_walking@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/icon_indoor_walking@2x.png deleted file mode 100644 index 914f914..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/icon_indoor_walking@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/icon_indoor_walking@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/icon_indoor_walking@3x.png deleted file mode 100644 index 34c7822..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/icon_indoor_walking@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/Contents.json index f306df3..d8c164c 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_pingpong@2x.png", + "filename" : "fb_icon_pingpong@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_pingpong@3x.png", + "filename" : "fb_icon_pingpong@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..69d8c11 Binary files /dev/null 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 new file mode 100644 index 0000000..74468d0 Binary files /dev/null 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_pingpong.imageset/icon_pingpong@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/icon_pingpong@2x.png deleted file mode 100644 index 998ea3e..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/icon_pingpong@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/icon_pingpong@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/icon_pingpong@3x.png deleted file mode 100644 index 89ea451..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/icon_pingpong@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/Contents.json index af8550e..6402c3a 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_qm@2x.png", + "filename" : "fb_icon_qm@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_qm@3x.png", + "filename" : "fb_icon_qm@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/fb_icon_qm@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/fb_icon_qm@2x.png new file mode 100644 index 0000000..ff24444 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/fb_icon_qm@2x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/fb_icon_qm@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/fb_icon_qm@3x.png new file mode 100644 index 0000000..9a16370 Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/fb_icon_qm@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/icon_qm@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/icon_qm@2x.png deleted file mode 100644 index d4a04df..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/icon_qm@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/icon_qm@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/icon_qm@3x.png deleted file mode 100644 index 9955d4c..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_qm.imageset/icon_qm@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/Contents.json index 5a38647..9b5cec3 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_run@2x.png", + "filename" : "fb_icon_run@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_run@3x.png", + "filename" : "fb_icon_run@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/icon_run@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/icon_run@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/icon_run@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/icon_run@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/Contents.json index 778ea2c..c0c3a28 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_runindoor@2x.png", + "filename" : "fb_icon_runindoor@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_runindoor@3x.png", + "filename" : "fb_icon_runindoor@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/icon_runindoor@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/icon_runindoor@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/icon_runindoor@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/icon_runindoor@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/Contents.json index 3fcf1af..424a5fe 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_sex@2x.png", + "filename" : "fb_icon_sex@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_sex@3x.png", + "filename" : "fb_icon_sex@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..ac03810 Binary files /dev/null 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 new file mode 100644 index 0000000..5825202 Binary files /dev/null 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_sex.imageset/icon_sex@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/icon_sex@2x.png deleted file mode 100644 index 745f910..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/icon_sex@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/icon_sex@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/icon_sex@3x.png deleted file mode 100644 index a3697e4..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/icon_sex@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/Contents.json index 2ba58f1..f3e7c4e 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_skating@2x.png", + "filename" : "fb_icon_skating@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_skating@3x.png", + "filename" : "fb_icon_skating@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..1956190 Binary files /dev/null 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 new file mode 100644 index 0000000..e25e521 Binary files /dev/null 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_skating.imageset/icon_skating@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/icon_skating@2x.png deleted file mode 100644 index 802ddc8..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/icon_skating@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/icon_skating@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/icon_skating@3x.png deleted file mode 100644 index c556375..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/icon_skating@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/Contents.json index d10acda..604fd06 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_skipping@2x.png", + "filename" : "fb_icon_skipping@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_skipping@3x.png", + "filename" : "fb_icon_skipping@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..b23eb06 Binary files /dev/null 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 new file mode 100644 index 0000000..8097cbe Binary files /dev/null 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_skipping.imageset/icon_skipping@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/icon_skipping@2x.png deleted file mode 100644 index e4c0076..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/icon_skipping@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/icon_skipping@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/icon_skipping@3x.png deleted file mode 100644 index 857a84e..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/icon_skipping@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/Contents.json index 7fb3af1..38cee17 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_Average speed@2x.png", + "filename" : "fb_icon_speed@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_Average speed@3x.png", + "filename" : "fb_icon_speed@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/icon_Average speed@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/icon_Average speed@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/icon_Average speed@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/icon_Average speed@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/Contents.json index 25db740..77d3fbd 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_sporttime copy@2x.png", + "filename" : "fb_icon_sporttime@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_sporttime copy@3x.png", + "filename" : "fb_icon_sporttime@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/icon_sporttime copy@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/icon_sporttime copy@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/icon_sporttime copy@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/icon_sporttime copy@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/Contents.json index 8c0fd4e..f568a7d 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_Step count@2x.png", + "filename" : "fb_icon_stepNumber@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_Step count@3x.png", + "filename" : "fb_icon_stepNumber@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/icon_Step count@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/icon_Step count@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/icon_Step count@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/icon_Step count@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/Contents.json index 97c6906..6a46dec 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_Average stride@2x.png", + "filename" : "fb_icon_stride@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_Average stride@3x.png", + "filename" : "fb_icon_stride@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/icon_Average stride@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/icon_Average stride@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/icon_Average stride@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/icon_Average stride@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/Contents.json index bf1c3f7..0f4cdac 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_swim@2x.png", + "filename" : "fb_icon_swim@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_swim@3x.png", + "filename" : "fb_icon_swim@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/icon_swim@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/icon_swim@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/icon_swim@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/icon_swim@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/Contents.json index 1f3b16c..84530c8 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_tennis@2x.png", + "filename" : "fb_icon_tennis@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_tennis@3x.png", + "filename" : "fb_icon_tennis@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..e59c5ba Binary files /dev/null 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 new file mode 100644 index 0000000..0470929 Binary files /dev/null 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_tennis.imageset/icon_tennis@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/icon_tennis@2x.png deleted file mode 100644 index e698c63..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/icon_tennis@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/icon_tennis@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/icon_tennis@3x.png deleted file mode 100644 index 209e4bd..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/icon_tennis@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/Contents.json index 0854930..c36c0b9 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_volleyball@2x.png", + "filename" : "fb_icon_volleyball@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_volleyball@3x.png", + "filename" : "fb_icon_volleyball@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..b4c3ba4 Binary files /dev/null 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 new file mode 100644 index 0000000..5fc93d7 Binary files /dev/null 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_volleyball.imageset/icon_volleyball@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/icon_volleyball@2x.png deleted file mode 100644 index d0cf345..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/icon_volleyball@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/icon_volleyball@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/icon_volleyball@3x.png deleted file mode 100644 index 3ccc920..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/icon_volleyball@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/Contents.json index e59dac9..9212e10 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_walk@2x.png", + "filename" : "fb_icon_walk@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_walk@3x.png", + "filename" : "fb_icon_walk@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/icon_walk@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/icon_walk@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/icon_walk@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/icon_walk@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/Contents.json index 5b03062..1128423 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_yoga@2x.png", + "filename" : "fb_icon_yoga@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_yoga@3x.png", + "filename" : "fb_icon_yoga@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..d9a6941 Binary files /dev/null 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 new file mode 100644 index 0000000..68ef4cb Binary files /dev/null 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_icon_yoga.imageset/icon_yoga@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/icon_yoga@2x.png deleted file mode 100644 index f3d006d..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/icon_yoga@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/icon_yoga@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/icon_yoga@3x.png deleted file mode 100644 index 999eb99..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/icon_yoga@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/Contents.json index 8ac0db2..887944d 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "sport_default@2x.png", + "filename" : "fb_sport_default@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "sport_default@3x.png", + "filename" : "fb_sport_default@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/sport_default@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/sport_default@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/sport_default@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/sport_default@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/Contents.json index 2871847..ce27f7c 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "sport_history_icon_arrow@2x.png", + "filename" : "fb_sport_history_down@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "sport_history_icon_arrow@3x.png", + "filename" : "fb_sport_history_down@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/sport_history_icon_arrow@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/fb_sport_history_down@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/sport_history_icon_arrow@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/fb_sport_history_down@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/sport_history_icon_arrow@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/fb_sport_history_down@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/sport_history_icon_arrow@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_down.imageset/fb_sport_history_down@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/Contents.json new file mode 100644 index 0000000..7607025 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_sport_history_up@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_sport_history_up@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/sport_history_icon_arrow_2@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/fb_sport_history_up@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/sport_history_icon_arrow_2@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/fb_sport_history_up@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/sport_history_icon_arrow_2@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/fb_sport_history_up@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/sport_history_icon_arrow_2@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up.imageset/fb_sport_history_up@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/Contents.json deleted file mode 100644 index 88ad05b..0000000 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_history_up_icon.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "sport_history_icon_arrow_2@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "sport_history_icon_arrow_2@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/Contents.json similarity index 74% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/Contents.json index b88e365..cb356a4 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "sport_icon_end@2x.png", + "filename" : "fb_sport_icon_add@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "sport_icon_end@3x.png", + "filename" : "fb_sport_icon_add@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/sport_icon_add@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/fb_sport_icon_add@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/sport_icon_add@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/fb_sport_icon_add@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/sport_icon_add@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/fb_sport_icon_add@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add_icon.imageset/sport_icon_add@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_add.imageset/fb_sport_icon_add@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/Contents.json similarity index 74% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/Contents.json rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/Contents.json index 383ced8..e51014c 100644 --- a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/Contents.json +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "sport_icon_reduce@2x.png", + "filename" : "fb_sport_icon_end@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "sport_icon_reduce@3x.png", + "filename" : "fb_sport_icon_end@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/sport_icon_end@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/fb_sport_icon_end@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/sport_icon_end@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/fb_sport_icon_end@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/sport_icon_end@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/fb_sport_icon_end@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end_icon.imageset/sport_icon_end@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_end.imageset/fb_sport_icon_end@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/Contents.json new file mode 100644 index 0000000..611b8b1 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_sport_icon_reduce@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_sport_icon_reduce@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/sport_icon_reduce@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/fb_sport_icon_reduce@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/sport_icon_reduce@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/fb_sport_icon_reduce@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/sport_icon_reduce@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/fb_sport_icon_reduce@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce_icon.imageset/sport_icon_reduce@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_reduce.imageset/fb_sport_icon_reduce@3x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/Contents.json new file mode 100644 index 0000000..aee7245 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_sport_icon_start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_sport_icon_start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/sport_icon_start@2x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/fb_sport_icon_start@2x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/sport_icon_start@2x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/fb_sport_icon_start@2x.png diff --git a/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/sport_icon_start@3x.png b/FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/fb_sport_icon_start@3x.png similarity index 100% rename from FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start_icon.imageset/sport_icon_start@3x.png rename to FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_icon_start.imageset/fb_sport_icon_start@3x.png 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 new file mode 100644 index 0000000..9bec148 --- /dev/null +++ b/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..9fec57e Binary files /dev/null and b/FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/rb_icon_Step count@3x.png differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/icon_alarm@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/icon_alarm@2x.png deleted file mode 100644 index f4fa5fc..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/icon_alarm@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/icon_alarm@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/icon_alarm@3x.png deleted file mode 100644 index bde0f7e..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_alarm.imageset/icon_alarm@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/icon_anti_lost@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/icon_anti_lost@2x.png deleted file mode 100644 index 7124e5d..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/icon_anti_lost@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/icon_anti_lost@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/icon_anti_lost@3x.png deleted file mode 100644 index f0dd225..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_anti_lost.imageset/icon_anti_lost@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/icon_call_up@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/icon_call_up@2x.png deleted file mode 100644 index d9f2c03..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/icon_call_up@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/icon_call_up@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/icon_call_up@3x.png deleted file mode 100644 index 5dc619d..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_call_up.imageset/icon_call_up@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/Contents.json deleted file mode 100644 index dc45230..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_class_disable@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_class_disable@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/icon_class_disable@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/icon_class_disable@2x.png deleted file mode 100644 index 47dc4ed..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/icon_class_disable@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/icon_class_disable@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/icon_class_disable@3x.png deleted file mode 100644 index 8766c3b..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_class_disable.imageset/icon_class_disable@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/Contents.json deleted file mode 100644 index 511851e..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_dial_center@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_dial_center@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/icon_dial_center@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/icon_dial_center@2x.png deleted file mode 100644 index c1fc9f5..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/icon_dial_center@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/icon_dial_center@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/icon_dial_center@3x.png deleted file mode 100644 index 6c83faa..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_dial_center.imageset/icon_dial_center@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/icon_family@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/icon_family@2x.png deleted file mode 100644 index 499d096..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/icon_family@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/icon_family@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/icon_family@3x.png deleted file mode 100644 index d521806..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_family.imageset/icon_family@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/Contents.json deleted file mode 100644 index 9cbbdec..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_find_devices@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_find_devices@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/icon_find_devices@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/icon_find_devices@2x.png deleted file mode 100644 index 541dbee..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/icon_find_devices@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/icon_find_devices@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/icon_find_devices@3x.png deleted file mode 100644 index 61148bd..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_find_devices.imageset/icon_find_devices@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/Contents.json deleted file mode 100644 index 189cb19..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_healthcode@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_healthcode@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/icon_healthcode@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/icon_healthcode@2x.png deleted file mode 100644 index b56ffd1..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/icon_healthcode@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/icon_healthcode@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/icon_healthcode@3x.png deleted file mode 100644 index e83f82e..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_healthcode.imageset/icon_healthcode@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/icon_homework@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/icon_homework@2x.png deleted file mode 100644 index 089340c..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/icon_homework@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/icon_homework@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/icon_homework@3x.png deleted file mode 100644 index 04c6179..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_homework.imageset/icon_homework@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/icon_member@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/icon_member@2x.png deleted file mode 100644 index 8caeea0..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/icon_member@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/icon_member@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/icon_member@3x.png deleted file mode 100644 index b24dc45..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_member.imageset/icon_member@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/Contents.json deleted file mode 100644 index 7d082c5..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_message@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_message@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/icon_message@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/icon_message@2x.png deleted file mode 100644 index af25438..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/icon_message@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/icon_message@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/icon_message@3x.png deleted file mode 100644 index 77259ff..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_message.imageset/icon_message@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/Contents.json deleted file mode 100644 index 297fcfd..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_more_video_call@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_more_video_call@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/icon_more_video_call@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/icon_more_video_call@2x.png deleted file mode 100644 index 7c015a6..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/icon_more_video_call@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/icon_more_video_call@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/icon_more_video_call@3x.png deleted file mode 100644 index ad1c07d..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_more_video_call.imageset/icon_more_video_call@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/Contents.json deleted file mode 100644 index 85cca0f..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_nucleicacid@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_nucleicacid@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/icon_nucleicacid@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/icon_nucleicacid@2x.png deleted file mode 100644 index 1c32d24..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/icon_nucleicacid@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/icon_nucleicacid@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/icon_nucleicacid@3x.png deleted file mode 100644 index 280bce0..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_nucleicacid.imageset/icon_nucleicacid@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/icon_on_off@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/icon_on_off@2x.png deleted file mode 100644 index c0ed8ac..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/icon_on_off@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/icon_on_off@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/icon_on_off@3x.png deleted file mode 100644 index 8a024dc..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_on_off.imageset/icon_on_off@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/icon_phonebook@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/icon_phonebook@2x.png deleted file mode 100644 index 937212b..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/icon_phonebook@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/icon_phonebook@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/icon_phonebook@3x.png deleted file mode 100644 index bea4375..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_phonebook.imageset/icon_phonebook@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/Contents.json deleted file mode 100644 index ca9b69d..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_red_flower@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_red_flower@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/icon_red_flower@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/icon_red_flower@2x.png deleted file mode 100644 index 18a665c..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/icon_red_flower@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/icon_red_flower@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/icon_red_flower@3x.png deleted file mode 100644 index 58a13c2..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_red_flower.imageset/icon_red_flower@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/Contents.json deleted file mode 100644 index 0dc70bd..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_schedule@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_schedule@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/icon_schedule@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/icon_schedule@2x.png deleted file mode 100644 index b5f5d9c..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/icon_schedule@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/icon_schedule@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/icon_schedule@3x.png deleted file mode 100644 index 20ce3b2..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_schedule.imageset/icon_schedule@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/icon_sos@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/icon_sos@2x.png deleted file mode 100644 index 4d99188..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/icon_sos@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/icon_sos@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/icon_sos@3x.png deleted file mode 100644 index b4689e2..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_sos.imageset/icon_sos@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/icon_step@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/icon_step@2x.png deleted file mode 100644 index 3d8264c..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/icon_step@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/icon_step@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/icon_step@3x.png deleted file mode 100644 index 2d3f0e5..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_step.imageset/icon_step@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/Contents.json deleted file mode 100644 index 0622d25..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_studentinfo@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_studentinfo@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/icon_studentinfo@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/icon_studentinfo@2x.png deleted file mode 100644 index df65b55..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/icon_studentinfo@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/icon_studentinfo@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/icon_studentinfo@3x.png deleted file mode 100644 index 6ec8938..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_studentinfo.imageset/icon_studentinfo@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/Contents.json deleted file mode 100644 index c2e2a86..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_watch_data@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_watch_data@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/icon_watch_data@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/icon_watch_data@2x.png deleted file mode 100644 index 04d5bbe..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/icon_watch_data@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/icon_watch_data@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/icon_watch_data@3x.png deleted file mode 100644 index 8b88333..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_data.imageset/icon_watch_data@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/Contents.json b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/Contents.json deleted file mode 100644 index e466447..0000000 --- a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon_watch_wifi@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon_watch_wifi@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/icon_watch_wifi@2x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/icon_watch_wifi@2x.png deleted file mode 100644 index 4e3492f..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/icon_watch_wifi@2x.png and /dev/null differ diff --git a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/icon_watch_wifi@3x.png b/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/icon_watch_wifi@3x.png deleted file mode 100644 index 55611bd..0000000 Binary files a/FireBoltt/Resource/Assets.xcassets/meunImg/icon_watch_wifi.imageset/icon_watch_wifi@3x.png and /dev/null differ diff --git a/FireBoltt/Resource/FireBoltt-Bridging-Header.h b/FireBoltt/Resource/FireBoltt-Bridging-Header.h index 9c46fec..212fe19 100644 --- a/FireBoltt/Resource/FireBoltt-Bridging-Header.h +++ b/FireBoltt/Resource/FireBoltt-Bridging-Header.h @@ -32,6 +32,6 @@ #import "User_Http.h" #import "MusicManageViewControllers.h" #import "commWebViewController.h" - +#import "XFGradientProgressView.h" #endif /* FireBoltt_Bridging_Header_h */ diff --git a/R.generated.swift b/R.generated.swift index 06d2f03..31132e0 100644 --- a/R.generated.swift +++ b/R.generated.swift @@ -158,12 +158,14 @@ struct R: Rswift.Validatable { fileprivate init() {} } - /// This `R.image` struct is generated, and contains static references to 165 images. + /// This `R.image` struct is generated, and contains static references to 167 images. struct image { /// Image `LaunchImage`. static let launchImage = Rswift.ImageResource(bundle: R.hostingBundle, name: "LaunchImage") /// Image `LocationMode_icon`. static let locationMode_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "LocationMode_icon") + /// Image `button_unbind`. + static let button_unbind = Rswift.ImageResource(bundle: R.hostingBundle, name: "button_unbind") /// Image `cell_select_No`. static let cell_select_No = Rswift.ImageResource(bundle: R.hostingBundle, name: "cell_select_No") /// Image `cell_select_Yes`. @@ -324,38 +326,44 @@ struct R: Rswift.Validatable { static let fb_sport_default = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_default") /// Image `fb_sport_history_down`. static let fb_sport_history_down = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_history_down") - /// Image `fb_sport_history_up_icon`. - static let fb_sport_history_up_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_history_up_icon") - /// Image `fb_sport_icon_add_icon`. - static let fb_sport_icon_add_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_add_icon") - /// Image `fb_sport_icon_end_icon`. - static let fb_sport_icon_end_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_end_icon") - /// Image `fb_sport_icon_reduce_icon`. - static let fb_sport_icon_reduce_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_reduce_icon") - /// Image `fb_sport_icon_start_icon`. - static let fb_sport_icon_start_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_start_icon") + /// Image `fb_sport_history_up`. + static let fb_sport_history_up = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_history_up") + /// Image `fb_sport_icon_add`. + static let fb_sport_icon_add = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_add") + /// Image `fb_sport_icon_end`. + static let fb_sport_icon_end = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_end") + /// Image `fb_sport_icon_reduce`. + static let fb_sport_icon_reduce = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_reduce") + /// Image `fb_sport_icon_start`. + static let fb_sport_icon_start = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_sport_icon_start") /// Image `fb_tabbar_bg`. static let fb_tabbar_bg = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_tabbar_bg") /// Image `fb_temperature_bg`. static let fb_temperature_bg = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_temperature_bg") /// Image `fb_update_icon`. static let fb_update_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "fb_update_icon") + /// Image `icon_DND`. + static let icon_DND = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_DND") /// Image `icon_add_members`. static let icon_add_members = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_add_members") - /// Image `icon_alarm`. - static let icon_alarm = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_alarm") - /// Image `icon_anti_lost`. - static let icon_anti_lost = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_anti_lost") + /// Image `icon_app_notification`. + static let icon_app_notification = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_app_notification") /// Image `icon_arrow_down`. static let icon_arrow_down = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_arrow_down") /// Image `icon_arrow_up`. static let icon_arrow_up = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_arrow_up") /// Image `icon_boy_head_portrait`. static let icon_boy_head_portrait = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_boy_head_portrait") - /// Image `icon_call_up`. - static let icon_call_up = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_call_up") - /// Image `icon_class_disable`. - static let icon_class_disable = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_class_disable") + /// Image `icon_bright_screen`. + static let icon_bright_screen = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_bright_screen") + /// Image `icon_call_notification`. + static let icon_call_notification = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_call_notification") + /// Image `icon_calories`. + static let icon_calories = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_calories") + /// Image `icon_camera`. + static let icon_camera = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_camera") + /// Image `icon_card`. + static let icon_card = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_card") /// Image `icon_click_aunt_head_portrait`. static let icon_click_aunt_head_portrait = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_click_aunt_head_portrait") /// Image `icon_click_father_head_portrait`. @@ -384,64 +392,56 @@ struct R: Rswift.Validatable { static let icon_delect_members = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_delect_members") /// Image `icon_device_connected`. static let icon_device_connected = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_device_connected") - /// Image `icon_dial_center`. - static let icon_dial_center = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_dial_center") + /// Image `icon_devide_dial`. + static let icon_devide_dial = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_devide_dial") + /// Image `icon_distance`. + static let icon_distance = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_distance") + /// Image `icon_drink`. + static let icon_drink = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_drink") /// Image `icon_editor_black`. static let icon_editor_black = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_editor_black") /// Image `icon_enter_gray`. static let icon_enter_gray = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_enter_gray") /// Image `icon_equipment_information_save`. static let icon_equipment_information_save = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_equipment_information_save") - /// Image `icon_family`. - static let icon_family = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_family") - /// Image `icon_find_devices`. - static let icon_find_devices = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_find_devices") + /// Image `icon_find`. + static let icon_find = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_find") /// Image `icon_girl_head_portrait`. static let icon_girl_head_portrait = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_girl_head_portrait") /// Image `icon_head_boy`. static let icon_head_boy = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_head_boy") /// Image `icon_head_girl`. static let icon_head_girl = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_head_girl") - /// Image `icon_healthcode`. - static let icon_healthcode = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_healthcode") - /// Image `icon_homework`. - static let icon_homework = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_homework") - /// Image `icon_member`. - static let icon_member = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_member") - /// Image `icon_message`. - static let icon_message = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_message") - /// Image `icon_more_video_call`. - static let icon_more_video_call = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_more_video_call") - /// Image `icon_nucleicacid`. - static let icon_nucleicacid = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_nucleicacid") - /// Image `icon_on_off`. - static let icon_on_off = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_on_off") + /// Image `icon_hr`. + static let icon_hr = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_hr") + /// Image `icon_message_notification`. + static let icon_message_notification = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_message_notification") + /// Image `icon_music`. + static let icon_music = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_music") /// Image `icon_or_code`. static let icon_or_code = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_or_code") /// Image `icon_phonebook`. static let icon_phonebook = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_phonebook") /// Image `icon_positioning_search`. static let icon_positioning_search = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_positioning_search") - /// Image `icon_red_flower`. - static let icon_red_flower = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_red_flower") - /// Image `icon_schedule`. - static let icon_schedule = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_schedule") + /// Image `icon_remind`. + static let icon_remind = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_remind") + /// Image `icon_sedentary`. + static let icon_sedentary = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_sedentary") /// Image `icon_selectImg_No`. static let icon_selectImg_No = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_selectImg_No") /// Image `icon_selectImg_Yes`. static let icon_selectImg_Yes = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_selectImg_Yes") - /// Image `icon_sos`. - static let icon_sos = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_sos") /// Image `icon_step`. static let icon_step = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_step") - /// Image `icon_studentinfo`. - static let icon_studentinfo = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_studentinfo") /// Image `icon_switch_devices`. static let icon_switch_devices = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_switch_devices") - /// Image `icon_watch_data`. - static let icon_watch_data = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_watch_data") - /// Image `icon_watch_wifi`. - static let icon_watch_wifi = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_watch_wifi") + /// Image `icon_temperature`. + static let icon_temperature = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_temperature") + /// Image `icon_version`. + static let icon_version = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_version") + /// Image `icon_wallet`. + static let icon_wallet = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_wallet") /// Image `icon_white_return`. static let icon_white_return = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_white_return") /// Image `img_class_disable_bg`. @@ -456,6 +456,8 @@ struct R: Rswift.Validatable { static let map_button_gps = Rswift.ImageResource(bundle: R.hostingBundle, name: "map_button_gps") /// Image `photograph_btn_icon`. static let photograph_btn_icon = Rswift.ImageResource(bundle: R.hostingBundle, name: "photograph_btn_icon") + /// Image `picture_bg`. + static let picture_bg = Rswift.ImageResource(bundle: R.hostingBundle, name: "picture_bg") /// Image `power_0`. static let power_0 = Rswift.ImageResource(bundle: R.hostingBundle, name: "power_0") /// Image `power_1`. @@ -466,6 +468,8 @@ 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`. @@ -506,6 +510,13 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) + /// `UIImage(named: "button_unbind", bundle: ..., traitCollection: ...)` + static func button_unbind(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.button_unbind, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) /// `UIImage(named: "cell_select_No", bundle: ..., traitCollection: ...)` static func cell_select_No(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { return UIKit.UIImage(resource: R.image.cell_select_No, compatibleWith: traitCollection) @@ -1066,37 +1077,37 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "fb_sport_history_up_icon", bundle: ..., traitCollection: ...)` - static func fb_sport_history_up_icon(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.fb_sport_history_up_icon, compatibleWith: traitCollection) + /// `UIImage(named: "fb_sport_history_up", bundle: ..., traitCollection: ...)` + static func fb_sport_history_up(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.fb_sport_history_up, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "fb_sport_icon_add_icon", bundle: ..., traitCollection: ...)` - static func fb_sport_icon_add_icon(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.fb_sport_icon_add_icon, compatibleWith: traitCollection) + /// `UIImage(named: "fb_sport_icon_add", bundle: ..., traitCollection: ...)` + static func fb_sport_icon_add(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.fb_sport_icon_add, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "fb_sport_icon_end_icon", bundle: ..., traitCollection: ...)` - static func fb_sport_icon_end_icon(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.fb_sport_icon_end_icon, compatibleWith: traitCollection) + /// `UIImage(named: "fb_sport_icon_end", bundle: ..., traitCollection: ...)` + static func fb_sport_icon_end(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.fb_sport_icon_end, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "fb_sport_icon_reduce_icon", bundle: ..., traitCollection: ...)` - static func fb_sport_icon_reduce_icon(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.fb_sport_icon_reduce_icon, compatibleWith: traitCollection) + /// `UIImage(named: "fb_sport_icon_reduce", bundle: ..., traitCollection: ...)` + static func fb_sport_icon_reduce(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.fb_sport_icon_reduce, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "fb_sport_icon_start_icon", bundle: ..., traitCollection: ...)` - static func fb_sport_icon_start_icon(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.fb_sport_icon_start_icon, compatibleWith: traitCollection) + /// `UIImage(named: "fb_sport_icon_start", bundle: ..., traitCollection: ...)` + static func fb_sport_icon_start(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.fb_sport_icon_start, compatibleWith: traitCollection) } #endif @@ -1122,23 +1133,23 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_add_members", bundle: ..., traitCollection: ...)` - static func icon_add_members(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_add_members, compatibleWith: traitCollection) + /// `UIImage(named: "icon_DND", bundle: ..., traitCollection: ...)` + static func icon_DND(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_DND, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_alarm", bundle: ..., traitCollection: ...)` - static func icon_alarm(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_alarm, compatibleWith: traitCollection) + /// `UIImage(named: "icon_add_members", bundle: ..., traitCollection: ...)` + static func icon_add_members(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_add_members, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_anti_lost", bundle: ..., traitCollection: ...)` - static func icon_anti_lost(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_anti_lost, compatibleWith: traitCollection) + /// `UIImage(named: "icon_app_notification", bundle: ..., traitCollection: ...)` + static func icon_app_notification(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_app_notification, compatibleWith: traitCollection) } #endif @@ -1164,16 +1175,37 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_call_up", bundle: ..., traitCollection: ...)` - static func icon_call_up(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_call_up, compatibleWith: traitCollection) + /// `UIImage(named: "icon_bright_screen", bundle: ..., traitCollection: ...)` + static func icon_bright_screen(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_bright_screen, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_call_notification", bundle: ..., traitCollection: ...)` + static func icon_call_notification(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_call_notification, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_calories", bundle: ..., traitCollection: ...)` + static func icon_calories(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_calories, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_camera", bundle: ..., traitCollection: ...)` + static func icon_camera(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_camera, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_class_disable", bundle: ..., traitCollection: ...)` - static func icon_class_disable(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_class_disable, compatibleWith: traitCollection) + /// `UIImage(named: "icon_card", bundle: ..., traitCollection: ...)` + static func icon_card(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_card, compatibleWith: traitCollection) } #endif @@ -1276,9 +1308,23 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_dial_center", bundle: ..., traitCollection: ...)` - static func icon_dial_center(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_dial_center, compatibleWith: traitCollection) + /// `UIImage(named: "icon_devide_dial", bundle: ..., traitCollection: ...)` + static func icon_devide_dial(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_devide_dial, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_distance", bundle: ..., traitCollection: ...)` + static func icon_distance(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_distance, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_drink", bundle: ..., traitCollection: ...)` + static func icon_drink(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_drink, compatibleWith: traitCollection) } #endif @@ -1304,16 +1350,9 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_family", bundle: ..., traitCollection: ...)` - static func icon_family(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_family, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_find_devices", bundle: ..., traitCollection: ...)` - static func icon_find_devices(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_find_devices, compatibleWith: traitCollection) + /// `UIImage(named: "icon_find", bundle: ..., traitCollection: ...)` + static func icon_find(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_find, compatibleWith: traitCollection) } #endif @@ -1339,51 +1378,23 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_healthcode", bundle: ..., traitCollection: ...)` - static func icon_healthcode(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_healthcode, compatibleWith: traitCollection) + /// `UIImage(named: "icon_hr", bundle: ..., traitCollection: ...)` + static func icon_hr(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_hr, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_homework", bundle: ..., traitCollection: ...)` - static func icon_homework(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_homework, compatibleWith: traitCollection) + /// `UIImage(named: "icon_message_notification", bundle: ..., traitCollection: ...)` + static func icon_message_notification(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_message_notification, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_member", bundle: ..., traitCollection: ...)` - static func icon_member(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_member, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_message", bundle: ..., traitCollection: ...)` - static func icon_message(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_message, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_more_video_call", bundle: ..., traitCollection: ...)` - static func icon_more_video_call(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_more_video_call, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_nucleicacid", bundle: ..., traitCollection: ...)` - static func icon_nucleicacid(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_nucleicacid, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_on_off", bundle: ..., traitCollection: ...)` - static func icon_on_off(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_on_off, compatibleWith: traitCollection) + /// `UIImage(named: "icon_music", bundle: ..., traitCollection: ...)` + static func icon_music(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_music, compatibleWith: traitCollection) } #endif @@ -1409,16 +1420,16 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_red_flower", bundle: ..., traitCollection: ...)` - static func icon_red_flower(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_red_flower, compatibleWith: traitCollection) + /// `UIImage(named: "icon_remind", bundle: ..., traitCollection: ...)` + static func icon_remind(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_remind, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_schedule", bundle: ..., traitCollection: ...)` - static func icon_schedule(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_schedule, compatibleWith: traitCollection) + /// `UIImage(named: "icon_sedentary", bundle: ..., traitCollection: ...)` + static func icon_sedentary(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_sedentary, compatibleWith: traitCollection) } #endif @@ -1437,13 +1448,6 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_sos", bundle: ..., traitCollection: ...)` - static func icon_sos(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_sos, compatibleWith: traitCollection) - } - #endif - - #if os(iOS) || os(tvOS) /// `UIImage(named: "icon_step", bundle: ..., traitCollection: ...)` static func icon_step(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { return UIKit.UIImage(resource: R.image.icon_step, compatibleWith: traitCollection) @@ -1451,30 +1455,30 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_studentinfo", bundle: ..., traitCollection: ...)` - static func icon_studentinfo(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_studentinfo, compatibleWith: traitCollection) + /// `UIImage(named: "icon_switch_devices", bundle: ..., traitCollection: ...)` + static func icon_switch_devices(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_switch_devices, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_switch_devices", bundle: ..., traitCollection: ...)` - static func icon_switch_devices(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_switch_devices, compatibleWith: traitCollection) + /// `UIImage(named: "icon_temperature", bundle: ..., traitCollection: ...)` + static func icon_temperature(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_temperature, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_watch_data", bundle: ..., traitCollection: ...)` - static func icon_watch_data(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_watch_data, compatibleWith: traitCollection) + /// `UIImage(named: "icon_version", bundle: ..., traitCollection: ...)` + static func icon_version(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_version, compatibleWith: traitCollection) } #endif #if os(iOS) || os(tvOS) - /// `UIImage(named: "icon_watch_wifi", bundle: ..., traitCollection: ...)` - static func icon_watch_wifi(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { - return UIKit.UIImage(resource: R.image.icon_watch_wifi, compatibleWith: traitCollection) + /// `UIImage(named: "icon_wallet", bundle: ..., traitCollection: ...)` + static func icon_wallet(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_wallet, compatibleWith: traitCollection) } #endif @@ -1528,6 +1532,13 @@ struct R: Rswift.Validatable { #endif #if os(iOS) || os(tvOS) + /// `UIImage(named: "picture_bg", bundle: ..., traitCollection: ...)` + static func picture_bg(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.picture_bg, compatibleWith: traitCollection) + } + #endif + + #if os(iOS) || os(tvOS) /// `UIImage(named: "power_0", bundle: ..., traitCollection: ...)` static func power_0(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { return UIKit.UIImage(resource: R.image.power_0, compatibleWith: traitCollection) @@ -1563,6 +1574,13 @@ 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)