Skip to content

G
galaxy-iOS
Commit 52089f8d authored by David黄金龙's avatar David黄金龙
Browse files
Options

颜色值统一

parent cf0bc714
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 18 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 52089f8d
......@@ -451,6 +451,7 @@
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
A5EE41EF2C21387C005BBA5D /* YHAiRadarAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */; };
A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
A5EF21332BA6E030005027E6 /* YHFileListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */; };
A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */; };
......@@ -952,6 +953,7 @@
A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAiRadarAreaView.swift; sourceTree = "<group>"; };
A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListViewController.swift; sourceTree = "<group>"; };
A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQuestionAndAnswerViewController.swift; sourceTree = "<group>"; };
......@@ -2205,6 +2207,7 @@
A567E5902BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift */,
049AB5ED2C0EF68700155DDF /* YHOrderTipsView.swift */,
A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */,
A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -3086,6 +3089,7 @@
A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
045EEEC92B9F171A0022A143 /* YHOtherInfoSessionView.swift in Sources */,
A567E59B2BD7643D00D5D5A0 /* YHWebModel.swift in Sources */,
A5EE41EF2C21387C005BBA5D /* YHAiRadarAreaView.swift in Sources */,
045EEEE22B9F171A0022A143 /* YHMySignatureDetailViewModel.swift in Sources */,
045EEE7D2B9F171A0022A143 /* YHWorkExpDataModel.swift in Sources */,
045EEE832B9F171A0022A143 /* YHMainInfoPreviewModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginManager.swift
View file @ 52089f8d
......@@ -264,7 +264,7 @@ extension YHOneKeyLoginManager {
}
// 登录按钮自定义UI
model.loginBtnText = NSAttributedString(string: "本机号码一键登录", attributes: [NSAttributedString.Key.foregroundColor : UIColor.init(hex: 0x121A26), NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
model.loginBtnText = NSAttributedString(string: "本机号码一键登录", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
let enableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
let disableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHAiRadarAreaView.swift 0 → 100644
View file @ 52089f8d
//
// YHAiRadarAreaView.swift
// galaxy
//
// Created by davidhuangA on 2024/6/18.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHAiRadarAreaView: UIView {
static let viewH = 88.0
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
lazy var bkgImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
return imgV
}()
lazy var lable1: UILabel = {
let lable : UILabel = UILabel()
lable.text = "AI人脉雷达"
lable.font = UIFont.PFSC_B(ofSize: 16)
lable.textColor = UIColor.brandMainColor
return lable
}()
lazy var lable2: UILabel = {
let lable : UILabel = UILabel()
lable.text = "为您找到更多同行"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor.yhGreyColor
return lable
}()
lazy var lable3: UILabel = {
let lable : UILabel = UILabel()
lable.text = "前往查看"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor.white
lable.backgroundColor = UIColor.brandMainColor
return lable
}()
}
extension YHAiRadarAreaView {
@objc func didLookOrderBtnClicked() {
goTabBarBy(tabType: .service)
}
func setupUI() {
// self.backgroundColor = UIColor(hex: 0xF8FAFB)
//
// let imgView = UIImageView(image: UIImage(named: "home_tips_order"))
// addSubview(imgView)
// imgView.snp.makeConstraints { make in
// make.width.height.equalTo(31)
// make.centerY.equalToSuperview()
// make.left.equalTo(14)
// }
//
// let label = UILabel()
// label.textAlignment = .left
// let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
// let bb: ASAttributedString = .init("1", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor))
// let cc: ASAttributedString = .init("个服务中的优才订单", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
// label.attributed.text = aa+bb+cc
// addSubview(label)
// label.snp.makeConstraints { make in
// make.centerY.equalToSuperview()
// make.left.equalTo(imgView.snp.right).offset(6)
// }
//
// let btn = UIButton()
// btn.setTitle("查看进度", for: .normal)
// btn.setTitleColor(.white, for: .normal)
// btn.backgroundColor = UIColor.brandMainColor
// btn.titleLabel?.font = .PFSC_R(ofSize: 12)
// btn.addTarget(self, action: #selector(didLookOrderBtnClicked), for: .touchUpInside)
// addSubview(btn)
// btn.snp.makeConstraints { make in
// make.width.equalTo(72)
// make.height.equalTo(33)
// make.centerY.equalToSuperview()
// make.left.equalTo(label.snp.right).offset(16)
// make.right.equalTo(-16)
// }
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHkLifeAndIdItemView.swift
View file @ 52089f8d
......@@ -50,7 +50,7 @@ class YHHkLifeAndIdItemView: UIView {
lazy var subtitleLable:UILabel = {
let label = UILabel()
label.text = "去香港"
label.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
label.textColor = UIColor.yhGreyColor
label.font = UIFont.PFSC_R(ofSize: 11)
label.lineBreakMode = .byTruncatingMiddle
return label
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeHeadView.swift
View file @ 52089f8d
......@@ -30,20 +30,31 @@ class YHHomeHeadView: UIView {
return view
}()
// 优才订单提示视图
//2.优才订单提示视图 - 未登录态不
lazy var orderTipsView: YHOrderTipsView = {
let view = YHOrderTipsView(frame: .zero)
view.isHidden = true
return view
}()
//2.香港身份 香港生活
//3. ai人脉雷达
lazy var aiRadarArea: YHOrderTipsView = {
let view = YHOrderTipsView(frame: .zero)
view.isHidden = true
return view
}()
//4.银河线下沙龙
//5.香港身份 香港生活
lazy var homeHkLife : YHHkLifeAndIdView = {
let view = YHHkLifeAndIdView()
return view
}()
//3. 四大金刚区
//6. 四大金刚区
lazy var homeKingKongBlock : YHHomeKingKongBlockView = {
let view = YHHomeKingKongBlockView()
return view
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockItem.swift
View file @ 52089f8d
......@@ -27,7 +27,7 @@ class YHHomeKingKongBlockItem: UIView {
lazy var subtitleLable:UILabel = {
let label = UILabel()
label.text = "去香港"
label.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
label.textColor = UIColor.yhGreyColor
label.font = UIFont.PFSC_M(ofSize: 12)
label.lineBreakMode = .byTruncatingMiddle
label.textAlignment = .center
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeSearchView.swift
View file @ 52089f8d
......@@ -13,7 +13,7 @@ class YHHomeSearchView: UIView {
let lable = UILabel()
lable.text = "香港身份"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
lable.textColor = UIColor.yhGreyColor
return lable
}()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHSearchInfoBar.swift
View file @ 52089f8d
......@@ -37,7 +37,7 @@ class YHSearchInfoBar: UIView {
lazy var textField:UITextField = {
let textField = UITextField()
textField.backgroundColor = .clear
textField.attributedPlaceholder = NSAttributedString(string: "香港身份".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor(hex: 0x94A3B8)])
textField.attributedPlaceholder = NSAttributedString(string: "香港身份".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.yhGreyColor])
textField.font = UIFont.PFSC_M(ofSize: 12)
textField.tintColor = UIColor.brandMainColor
textField.textColor = UIColor.mainTextColor
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHSearchInfoHistoryView.swift
View file @ 52089f8d
......@@ -22,7 +22,7 @@ class YHSearchInfoHistoryView: UIView {
lazy var titleLabel: UILabel = {
let label = UILabel()
label.font = .PFSC_R(ofSize: 14)
label.textColor = UIColor(hex: 0x94A3B8)
label.textColor = UIColor.yhGreyColor
label.text = "历史搜索"
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @ 52089f8d
......@@ -196,7 +196,7 @@ extension YHServiceCenterMainViewController {
let button = UIButton(type: .custom)
button.setTitle("我的订单", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.setTitleColor(UIColor(hex: 0x94a3b8), for: .normal)
button.setTitleColor(UIColor.yhGreyColor, for: .normal)
button.addTarget(self, action: #selector(pushOrderView), for: .touchUpInside)
return button
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift
View file @ 52089f8d
......@@ -86,7 +86,7 @@ private extension YHFileListItemsView {
let lable = UILabel()
lable.text = "暂无待完善清单"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
lable.textColor = UIColor.yhGreyColor
holdView.addSubview(lable)
lable.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceNoOrderView.swift
View file @ 52089f8d
......@@ -30,7 +30,7 @@ class YHServiceNoOrderView: UIView {
private lazy var noFindLab : UILabel = {
let lable = UILabel()
lable.textColor = UIColor.init(hex: 0x94A3B8)
lable.textColor = UIColor.yhGreyColor
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textAlignment = .center
lable.text = "找不到订单"
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPhoneMessageView.swift
View file @ 52089f8d
......@@ -29,7 +29,7 @@ class YHPhoneMessageView: UIView {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont(name: "DINAlternate-Bold", size: 18)
button.setTitle("+86", for: .normal)
button.setTitleColor( UIColor(hex:0x121a26), for: .normal)
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(messageClick), for: .touchUpInside)
button.titleLabel?.textAlignment = .left
return button
......@@ -46,7 +46,7 @@ class YHPhoneMessageView: UIView {
let text = UITextField()
text.placeholder = "请输入您的手机号"
text.font = UIFont(name: "DINAlternate-Bold", size: 18)
text.textColor = UIColor(hex:0x121a26)
text.textColor = UIColor.mainTextColor
text.textAlignment = .left
text.keyboardType = .phonePad
text.clearButtonMode = .always
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHVideoPlaySettingVC.swift
View file @ 52089f8d
......@@ -26,7 +26,7 @@ class YHVideoPlaySettingVC: YHBaseViewController {
lazy var titleLabel:UILabel = {
let label = UILabel()
label.textColor = UIColor(hexString:"#121A26")
label.textColor = UIColor.mainTextColor
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize:15)
label.text = "播放视频时默认静音"
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift
View file @ 52089f8d
......@@ -57,7 +57,7 @@ class YHUserInfoHeaderView: UIView {
private lazy var likeLabel:UILabel = {
let label = UILabel()
label.text = "点赞 0".local
label.textColor = UIColor(hex: 0x121A26, transparency: 0.5)
label.textColor = UIColor.mainTextColor50
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize: 13)
label.isUserInteractionEnabled = true
......@@ -70,7 +70,7 @@ class YHUserInfoHeaderView: UIView {
private lazy var collectLabel:UILabel = {
let label = UILabel()
label.text = "收藏 0".local
label.textColor = UIColor(hex: 0x121A26, transparency: 0.5)
label.textColor = UIColor.mainTextColor50
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize: 13)
label.isUserInteractionEnabled = true
......@@ -83,7 +83,7 @@ class YHUserInfoHeaderView: UIView {
private lazy var scanLabel:UILabel = {
let label = UILabel()
label.text = "最近浏览 0".local
label.textColor = UIColor(hex: 0x121A26, transparency: 0.5)
label.textColor = UIColor.mainTextColor50
label.textAlignment = NSTextAlignment.left
label.font = UIFont.PFSC_R(ofSize: 13)
label.isUserInteractionEnabled = true
......
galaxy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift
View file @ 52089f8d
......@@ -80,6 +80,14 @@ extension UIColor {
// alertView 底部蒙层颜色
static let alertMaskColor: UIColor = UIColor.init(hex: 0x0F1214, alpha: 0.5)
//94a3b8
static let yhGreyColor: UIColor = UIColor(hexString: "#94A3B8")!
static let yhGreyColor50: UIColor = UIColor(hexString: "#94A3B8",transparency: 0.5)!
public convenience init(r : CGFloat, g : CGFloat, b : CGFloat,alpha:CGFloat = 1.0) {
self.init(red: r / 255.0, green: g / 255.0, blue: b / 255.0, alpha: alpha)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment