diff --git a/ReaderHive.xcodeproj/project.pbxproj b/ReaderHive.xcodeproj/project.pbxproj index 54b826a..adb84ae 100644 --- a/ReaderHive.xcodeproj/project.pbxproj +++ b/ReaderHive.xcodeproj/project.pbxproj @@ -90,6 +90,16 @@ 85859E5C2EF3FC5F0020D282 /* NotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 85859E552EF3FC5F0020D282 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 85859E662EF3FC6E0020D282 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85859E632EF3FC6E0020D282 /* NotificationService.swift */; }; 85859E682EFCD1D80020D282 /* NRHomeMustReadTodayTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85859E672EFCD1D80020D282 /* NRHomeMustReadTodayTransformer.swift */; }; + 85C1786B2F050AA400A8A76E /* Poppins-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178682F050AA400A8A76E /* Poppins-Medium.ttf */; }; + 85C1786C2F050AA400A8A76E /* Poppins-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C1786A2F050AA400A8A76E /* Poppins-SemiBold.ttf */; }; + 85C1786D2F050AA400A8A76E /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178672F050AA400A8A76E /* Poppins-Bold.ttf */; }; + 85C1786E2F050AA400A8A76E /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178692F050AA400A8A76E /* Poppins-Regular.ttf */; }; + 85C178722F050EF800A8A76E /* Poppins-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C1786F2F050EF800A8A76E /* Poppins-BoldItalic.ttf */; }; + 85C178732F050EF800A8A76E /* Poppins-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178702F050EF800A8A76E /* Poppins-MediumItalic.ttf */; }; + 85C178742F050EF800A8A76E /* Poppins-SemiBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178712F050EF800A8A76E /* Poppins-SemiBoldItalic.ttf */; }; + 85C178772F050F1400A8A76E /* Poppins-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178762F050F1400A8A76E /* Poppins-BlackItalic.ttf */; }; + 85C178782F050F1400A8A76E /* Poppins-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178752F050F1400A8A76E /* Poppins-Black.ttf */; }; + 85C1787A2F05118D00A8A76E /* Poppins-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 85C178792F05118D00A8A76E /* Poppins-Italic.ttf */; }; 85CF941D2EEBFEA6006467E3 /* NRCoinsPackModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CF941C2EEBFEA6006467E3 /* NRCoinsPackModel.swift */; }; 85CF941F2EEBFECF006467E3 /* NRCoinsPackReceiveModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CF941E2EEBFECF006467E3 /* NRCoinsPackReceiveModel.swift */; }; 85CF94212EEC050D006467E3 /* NRCoinsPackBuyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CF94202EEC050D006467E3 /* NRCoinsPackBuyView.swift */; }; @@ -590,6 +600,16 @@ 85859E622EF3FC6E0020D282 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 85859E632EF3FC6E0020D282 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; 85859E672EFCD1D80020D282 /* NRHomeMustReadTodayTransformer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NRHomeMustReadTodayTransformer.swift; sourceTree = ""; }; + 85C178672F050AA400A8A76E /* Poppins-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Bold.ttf"; sourceTree = ""; }; + 85C178682F050AA400A8A76E /* Poppins-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Medium.ttf"; sourceTree = ""; }; + 85C178692F050AA400A8A76E /* Poppins-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Regular.ttf"; sourceTree = ""; }; + 85C1786A2F050AA400A8A76E /* Poppins-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-SemiBold.ttf"; sourceTree = ""; }; + 85C1786F2F050EF800A8A76E /* Poppins-BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-BoldItalic.ttf"; sourceTree = ""; }; + 85C178702F050EF800A8A76E /* Poppins-MediumItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-MediumItalic.ttf"; sourceTree = ""; }; + 85C178712F050EF800A8A76E /* Poppins-SemiBoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-SemiBoldItalic.ttf"; sourceTree = ""; }; + 85C178752F050F1400A8A76E /* Poppins-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Black.ttf"; sourceTree = ""; }; + 85C178762F050F1400A8A76E /* Poppins-BlackItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-BlackItalic.ttf"; sourceTree = ""; }; + 85C178792F05118D00A8A76E /* Poppins-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Italic.ttf"; sourceTree = ""; }; 85CF941C2EEBFEA6006467E3 /* NRCoinsPackModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NRCoinsPackModel.swift; sourceTree = ""; }; 85CF941E2EEBFECF006467E3 /* NRCoinsPackReceiveModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NRCoinsPackReceiveModel.swift; sourceTree = ""; }; 85CF94202EEC050D006467E3 /* NRCoinsPackBuyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NRCoinsPackBuyView.swift; sourceTree = ""; }; @@ -1127,6 +1147,7 @@ 03980F8E2ED00ABC0006E317 /* Source */ = { isa = PBXGroup; children = ( + 85C178662F050A5A00A8A76E /* Font */, 03980F7E2ED009EB0006E317 /* Assets.xcassets */, 03980F7F2ED009EB0006E317 /* Info.plist */, 85CF94662EF2A81D006467E3 /* GoogleService-Info.plist */, @@ -1393,6 +1414,23 @@ path = NotificationService; sourceTree = ""; }; + 85C178662F050A5A00A8A76E /* Font */ = { + isa = PBXGroup; + children = ( + 85C178672F050AA400A8A76E /* Poppins-Bold.ttf */, + 85C178682F050AA400A8A76E /* Poppins-Medium.ttf */, + 85C178692F050AA400A8A76E /* Poppins-Regular.ttf */, + 85C1786A2F050AA400A8A76E /* Poppins-SemiBold.ttf */, + 85C178752F050F1400A8A76E /* Poppins-Black.ttf */, + 85C178792F05118D00A8A76E /* Poppins-Italic.ttf */, + 85C1786F2F050EF800A8A76E /* Poppins-BoldItalic.ttf */, + 85C178762F050F1400A8A76E /* Poppins-BlackItalic.ttf */, + 85C178702F050EF800A8A76E /* Poppins-MediumItalic.ttf */, + 85C178712F050EF800A8A76E /* Poppins-SemiBoldItalic.ttf */, + ); + path = Font; + sourceTree = ""; + }; 85CF94682EF3CC12006467E3 /* Other */ = { isa = PBXGroup; children = ( @@ -2449,8 +2487,18 @@ 85CF94462EF001AD006467E3 /* NRMyUnlocksViewController.xib in Resources */, 03980F8A2ED009EB0006E317 /* Assets.xcassets in Resources */, 85CF964B2EF3CC93006467E3 /* MParserCell.xib in Resources */, + 85C1786B2F050AA400A8A76E /* Poppins-Medium.ttf in Resources */, + 85C1786C2F050AA400A8A76E /* Poppins-SemiBold.ttf in Resources */, + 85C178722F050EF800A8A76E /* Poppins-BoldItalic.ttf in Resources */, + 85C178732F050EF800A8A76E /* Poppins-MediumItalic.ttf in Resources */, + 85C178742F050EF800A8A76E /* Poppins-SemiBoldItalic.ttf in Resources */, + 85C1786D2F050AA400A8A76E /* Poppins-Bold.ttf in Resources */, + 85C1786E2F050AA400A8A76E /* Poppins-Regular.ttf in Resources */, 039810732ED053BE0006E317 /* Localizable.strings in Resources */, F3B859872EE972F70095A9CC /* NRConsumptionRecordsCell.xib in Resources */, + 85C1787A2F05118D00A8A76E /* Poppins-Italic.ttf in Resources */, + 85C178772F050F1400A8A76E /* Poppins-BlackItalic.ttf in Resources */, + 85C178782F050F1400A8A76E /* Poppins-Black.ttf in Resources */, 03980F8C2ED009EB0006E317 /* LaunchScreen.storyboard in Resources */, 85CF944A2EF004D3006467E3 /* NRMyUnlocksCell.xib in Resources */, 85CF94672EF2A81D006467E3 /* GoogleService-Info.plist in Resources */, diff --git a/ReaderHive/Base/Extension/UIFont+NRAdd.swift b/ReaderHive/Base/Extension/UIFont+NRAdd.swift index 9fcd69a..fc8b8af 100644 --- a/ReaderHive/Base/Extension/UIFont+NRAdd.swift +++ b/ReaderHive/Base/Extension/UIFont+NRAdd.swift @@ -6,10 +6,60 @@ // import UIKit +import YYCategories extension UIFont { static func font(ofSize: CGFloat, weight: Weight) -> UIFont { + var font: UIFont? = nil + switch weight { + case .regular: + font = UIFont(name: "Poppins-Regular", size: ofSize) + + case .medium: + font = UIFont(name: "Poppins-Medium", size: ofSize) + + case .semibold: + font = UIFont(name: "Poppins-SemiBold", size: ofSize) + + case .bold: + font = UIFont(name: "Poppins-Bold", size: ofSize) + + case .black: + font = UIFont(name: "Poppins-Black", size: ofSize) + + default: + break + } + if let font = font { + return font + } return .systemFont(ofSize: ofSize, weight: weight) } + + func nr_withBoldItalic() -> UIFont? { + let size = self.pointSize + let name = self.fontName + + switch name { + case "Poppins-Regular": + return UIFont(name: "Poppins-Italic", size: size) + + case "Poppins-Medium": + return UIFont(name: "Poppins-MediumItalic", size: size) + + case "Poppins-SemiBold": + return UIFont(name: "Poppins-SemiBoldItalic", size: size) + + case "Poppins-Bold": + return UIFont(name: "Poppins-BoldItalic", size: size) + + case "Poppins-Black": + return UIFont(name: "Poppins-BoldItalic", size: size) + + default: + return self.withBoldItalic() + } + + } } diff --git a/ReaderHive/Class/Home/V/NRHomeCoinsPackButton.swift b/ReaderHive/Class/Home/V/NRHomeCoinsPackButton.swift index a2787e1..e1ca310 100644 --- a/ReaderHive/Class/Home/V/NRHomeCoinsPackButton.swift +++ b/ReaderHive/Class/Home/V/NRHomeCoinsPackButton.swift @@ -30,7 +30,7 @@ class NRHomeCoinsPackButton: UIControl { private lazy var textLabel: UILabel = { let label = NRLabel() - label.font = .font(ofSize: 12, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 12, weight: .bold).nr_withBoldItalic() label.textColors = [UIColor.FFEECA.cgColor, UIColor.FECE_62.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Class/Home/V/NRHomeNovelNewArrivalsCell.swift b/ReaderHive/Class/Home/V/NRHomeNovelNewArrivalsCell.swift index d765220..693d19e 100644 --- a/ReaderHive/Class/Home/V/NRHomeNovelNewArrivalsCell.swift +++ b/ReaderHive/Class/Home/V/NRHomeNovelNewArrivalsCell.swift @@ -116,7 +116,8 @@ extension NRHomeNovelNewArrivalsCell { categoryView.snp.makeConstraints { make in make.left.equalToSuperview() make.right.lessThanOrEqualToSuperview() - make.top.equalTo(titleLabel.snp.bottom).offset(4) +// make.top.equalTo(titleLabel.snp.bottom).offset(3) + make.bottom.equalToSuperview() make.height.equalTo(20) } diff --git a/ReaderHive/Class/Novel/V/NRVipRetainAlert.swift b/ReaderHive/Class/Novel/V/NRVipRetainAlert.swift index 7408258..16d24c1 100644 --- a/ReaderHive/Class/Novel/V/NRVipRetainAlert.swift +++ b/ReaderHive/Class/Novel/V/NRVipRetainAlert.swift @@ -39,7 +39,7 @@ class NRVipRetainAlert: NRBaseAlert { private lazy var textLabel: UILabel = { let label = NRLabel() - label.font = .font(ofSize: 18, weight: .black).withBoldItalic() + label.font = .font(ofSize: 18, weight: .black).nr_withBoldItalic() label.textColors = [UIColor.FFEECA.cgColor, UIColor.FECE_62.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Class/Novel/V/NRVipRetainItemView.swift b/ReaderHive/Class/Novel/V/NRVipRetainItemView.swift index cc37d5f..3c72a3f 100644 --- a/ReaderHive/Class/Novel/V/NRVipRetainItemView.swift +++ b/ReaderHive/Class/Novel/V/NRVipRetainItemView.swift @@ -38,7 +38,7 @@ class NRVipRetainItemView: UIView { private lazy var nameLabel: UILabel = { let label = NRLabel() - label.font = .font(ofSize: 16, weight: .semibold).withBoldItalic() + label.font = .font(ofSize: 16, weight: .semibold).nr_withBoldItalic() label.textColors = [UIColor.BA_8_A_2_A.cgColor, UIColor._8_B_5801.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Class/Novel/V/Reader/NRNovelReadFinishHeaderView.swift b/ReaderHive/Class/Novel/V/Reader/NRNovelReadFinishHeaderView.swift index 232dbc7..b0b44bd 100644 --- a/ReaderHive/Class/Novel/V/Reader/NRNovelReadFinishHeaderView.swift +++ b/ReaderHive/Class/Novel/V/Reader/NRNovelReadFinishHeaderView.swift @@ -51,7 +51,7 @@ class NRNovelReadFinishHeaderView: UICollectionReusableView { private lazy var titleLabel: NRLabel = { let label = NRLabel() - label.font = .font(ofSize: 24, weight: .semibold).withBoldItalic() + label.font = .font(ofSize: 24, weight: .semibold).nr_withBoldItalic() label.textColors = [UIColor.F_3912_F.cgColor, UIColor.FF_4_A_4_A.cgColor, UIColor.FA_9_B_1_F.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Class/Novel/VC/NRNovelDetailViewController.swift b/ReaderHive/Class/Novel/VC/NRNovelDetailViewController.swift index fb5bd70..1ea6be3 100644 --- a/ReaderHive/Class/Novel/VC/NRNovelDetailViewController.swift +++ b/ReaderHive/Class/Novel/VC/NRNovelDetailViewController.swift @@ -281,7 +281,7 @@ extension NRNovelDetailViewController { private func updateNavigationStyle() { if self.navigationStyleScale > 0.9 { - configNavigationBack("arrow_left_icon_02") + configNavigationBack("arrow_left_icon_03") self.title = self.viewModel.novelModel?.name } else { configNavigationBack("arrow_left_icon_01") diff --git a/ReaderHive/Class/Store/V/NRStoreCoinsPackCell.swift b/ReaderHive/Class/Store/V/NRStoreCoinsPackCell.swift index 6b0dba6..a0b281f 100644 --- a/ReaderHive/Class/Store/V/NRStoreCoinsPackCell.swift +++ b/ReaderHive/Class/Store/V/NRStoreCoinsPackCell.swift @@ -43,7 +43,7 @@ class NRStoreCoinsPackCell: NRStoreCoinsCell { private lazy var titleLabel: UILabel = { let label = NRLabel() - label.font = .font(ofSize: 16, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 16, weight: .bold).nr_withBoldItalic() label.textColors = [UIColor.BA_8_A_2_A.cgColor, UIColor._8_B_5801.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Class/Store/V/NRStoreCoinsSmallCell.swift b/ReaderHive/Class/Store/V/NRStoreCoinsSmallCell.swift index dce4cc9..d170198 100644 --- a/ReaderHive/Class/Store/V/NRStoreCoinsSmallCell.swift +++ b/ReaderHive/Class/Store/V/NRStoreCoinsSmallCell.swift @@ -118,12 +118,12 @@ extension NRStoreCoinsSmallCell { coinsView.snp.makeConstraints { make in make.centerX.equalToSuperview() - make.top.equalToSuperview().offset(18) + make.top.equalToSuperview().offset(16) } sendCountLabel.snp.makeConstraints { make in make.centerX.equalToSuperview() - make.bottom.equalTo(priceLabel.snp.top).offset(-3) + make.bottom.equalTo(priceLabel.snp.top).offset(-2) } priceLabel.snp.makeConstraints { make in diff --git a/ReaderHive/Class/Store/V/NRStoreVipCell.swift b/ReaderHive/Class/Store/V/NRStoreVipCell.swift index 3b3e0d7..0f70463 100644 --- a/ReaderHive/Class/Store/V/NRStoreVipCell.swift +++ b/ReaderHive/Class/Store/V/NRStoreVipCell.swift @@ -52,7 +52,7 @@ class NRStoreVipCell: UICollectionViewCell { priceLabel.text = currency + oldPrice } - + extraBgView.colors = [UIColor.white.withAlphaComponent(0.75).cgColor, UIColor.white.withAlphaComponent(0.75).cgColor] switch model?.vip_type_key { case .week: bgView.image = UIImage(named: "vip_bg_image_week") @@ -81,6 +81,7 @@ class NRStoreVipCell: UICollectionViewCell { vipIconImageView.image = UIImage(named: "vip_icon_year") titleLabel.textColors = [UIColor.BA_8_A_2_A.cgColor, UIColor._8_B_5801.cgColor] priceLabel.textColor = ._8_B_5801 + extraBgView.colors = [UIColor.FFF_2_C_8.cgColor, UIColor.D_8_B_8_A_1.cgColor] default: break @@ -117,7 +118,7 @@ class NRStoreVipCell: UICollectionViewCell { private lazy var priceLabel: UILabel = { let label = UILabel() - label.font = .font(ofSize: 20, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 20, weight: .bold).nr_withBoldItalic() return label }() @@ -136,16 +137,18 @@ class NRStoreVipCell: UICollectionViewCell { return label }() - private lazy var extraBgView: UIView = { - let view = UIView() - view.backgroundColor = .white.withAlphaComponent(0.75) + private lazy var extraBgView: NRGradientView = { + let view = NRGradientView() + view.startPoint = .init(x: 0, y: 0.5) + view.endPoint = .init(x: 1, y: 0.5) +// view.backgroundColor = .white.withAlphaComponent(0.75) view.nr_setRoundedCorner(topLeft: 12, topRight: 0, bottomLeft: 0, bottomRight: 0) return view }() private lazy var extraLabel: UILabel = { let label = UILabel() - label.font = .font(ofSize: 14, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 14, weight: .medium).nr_withBoldItalic() label.textColor = ._9_C_6_A_45 label.setContentHuggingPriority(.required, for: .horizontal) label.setContentCompressionResistancePriority(.required, for: .horizontal) diff --git a/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/JToreVion.swift b/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/JToreVion.swift index 2c78180..fc775f0 100644 --- a/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/JToreVion.swift +++ b/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/JToreVion.swift @@ -42,7 +42,7 @@ var size_3yTipEsponse_map: [String: Any]? private lazy var textLabel: UILabel = { let label = ROllectionLabel() - label.font = .font(ofSize: 18, weight: .black).withBoldItalic() + label.font = .font(ofSize: 18, weight: .black).nr_withBoldItalic() label.textColors = [UIColor.FFEECA.cgColor, UIColor.FECE_62.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/QRLikeDataView.swift b/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/QRLikeDataView.swift index 71b991b..7deb613 100644 --- a/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/QRLikeDataView.swift +++ b/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/QRLikeDataView.swift @@ -39,7 +39,7 @@ var max_eiRectangleList: [Any]! private lazy var nameLabel: UILabel = { let label = ROllectionLabel() - label.font = .font(ofSize: 16, weight: .semibold).withBoldItalic() + label.font = .font(ofSize: 16, weight: .semibold).nr_withBoldItalic() label.textColors = [UIColor.BA_8_A_2_A.cgColor, UIColor._8_B_5801.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/expire/OQAshedView.swift b/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/expire/OQAshedView.swift index 95d6b33..27a4e92 100644 --- a/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/expire/OQAshedView.swift +++ b/ReaderHive/Other/funcs/containableMuted/polykeyPrintval/expire/OQAshedView.swift @@ -53,7 +53,7 @@ private var intrinsicSize: Float? = 0.0 private lazy var titleLabel: ROllectionLabel = { let label = ROllectionLabel() - label.font = .font(ofSize: 24, weight: .semibold).withBoldItalic() + label.font = .font(ofSize: 24, weight: .semibold).nr_withBoldItalic() label.textColors = [UIColor.F_3912_F.cgColor, UIColor.FF_4_A_4_A.cgColor, UIColor.FA_9_B_1_F.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Other/funcs/domainsTwinvq/polykeyPrintval/NVDModalTextButton.swift b/ReaderHive/Other/funcs/domainsTwinvq/polykeyPrintval/NVDModalTextButton.swift index 59d3e42..986a70c 100644 --- a/ReaderHive/Other/funcs/domainsTwinvq/polykeyPrintval/NVDModalTextButton.swift +++ b/ReaderHive/Other/funcs/domainsTwinvq/polykeyPrintval/NVDModalTextButton.swift @@ -32,7 +32,7 @@ var appMax: Double? = 0.0 private lazy var textLabel: UILabel = { let label = ROllectionLabel() - label.font = .font(ofSize: 12, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 12, weight: .bold).nr_withBoldItalic() label.textColors = [UIColor.FFEECA.cgColor, UIColor.FECE_62.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/NUAMustCell.swift b/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/NUAMustCell.swift index 163fb52..e6540ac 100644 --- a/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/NUAMustCell.swift +++ b/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/NUAMustCell.swift @@ -44,7 +44,7 @@ var rightPadding: Double? = 0.0 private lazy var titleLabel: UILabel = { let label = ROllectionLabel() - label.font = .font(ofSize: 16, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 16, weight: .bold).nr_withBoldItalic() label.textColors = [UIColor.BA_8_A_2_A.cgColor, UIColor._8_B_5801.cgColor] label.textStartPoint = .init(x: 0, y: 0.5) label.textEndPoint = .init(x: 1, y: 0.5) diff --git a/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/TBMReadCell.swift b/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/TBMReadCell.swift index 1838593..94a6110 100644 --- a/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/TBMReadCell.swift +++ b/ReaderHive/Other/funcs/dxgiCommon/polykeyPrintval/TBMReadCell.swift @@ -92,7 +92,7 @@ var isEarch: Bool? = false private lazy var priceLabel: UILabel = { let label = UILabel() - label.font = .font(ofSize: 20, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 20, weight: .bold).nr_withBoldItalic() return label }() @@ -112,7 +112,7 @@ var isEarch: Bool? = false private lazy var extraLabel: UILabel = { let label = UILabel() - label.font = .font(ofSize: 14, weight: .bold).withBoldItalic() + label.font = .font(ofSize: 14, weight: .bold).nr_withBoldItalic() label.textColor = ._9_C_6_A_45 return label }() diff --git a/ReaderHive/Source/Assets.xcassets/Color/#D8B8A1.colorset/Contents.json b/ReaderHive/Source/Assets.xcassets/Color/#D8B8A1.colorset/Contents.json new file mode 100644 index 0000000..6a21d67 --- /dev/null +++ b/ReaderHive/Source/Assets.xcassets/Color/#D8B8A1.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xA1", + "green" : "0xB8", + "red" : "0xD8" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ReaderHive/Source/Assets.xcassets/Color/#FFF2C8.colorset/Contents.json b/ReaderHive/Source/Assets.xcassets/Color/#FFF2C8.colorset/Contents.json new file mode 100644 index 0000000..09cd104 --- /dev/null +++ b/ReaderHive/Source/Assets.xcassets/Color/#FFF2C8.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xC8", + "green" : "0xF2", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@2x.png b/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@2x.png index 7c3352d..4caef68 100644 Binary files a/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@2x.png and b/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@2x.png differ diff --git a/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@3x.png b/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@3x.png index 887fdee..40369b6 100644 Binary files a/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@3x.png and b/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_01.imageset/return@3x.png differ diff --git a/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_03.imageset/Contents.json b/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_03.imageset/Contents.json index dff0e1f..b55f766 100644 --- a/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_03.imageset/Contents.json +++ b/ReaderHive/Source/Assets.xcassets/Image/arrow_left_icon_03.imageset/Contents.json @@ -18,5 +18,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" } } diff --git a/ReaderHive/Source/Font/Poppins-Black.ttf b/ReaderHive/Source/Font/Poppins-Black.ttf new file mode 100644 index 0000000..71c0f99 Binary files /dev/null and b/ReaderHive/Source/Font/Poppins-Black.ttf differ diff --git a/ReaderHive/Source/Font/Poppins-Bold.ttf b/ReaderHive/Source/Font/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/ReaderHive/Source/Font/Poppins-Bold.ttf differ diff --git a/ReaderHive/Source/Font/Poppins-Italic.ttf b/ReaderHive/Source/Font/Poppins-Italic.ttf new file mode 100644 index 0000000..12b7b3c Binary files /dev/null and b/ReaderHive/Source/Font/Poppins-Italic.ttf differ diff --git a/ReaderHive/Source/Font/Poppins-SemiBoldItalic.ttf b/ReaderHive/Source/Font/Poppins-SemiBoldItalic.ttf new file mode 100644 index 0000000..3e6c942 Binary files /dev/null and b/ReaderHive/Source/Font/Poppins-SemiBoldItalic.ttf differ diff --git a/ReaderHive/Source/Info.plist b/ReaderHive/Source/Info.plist index cb3b218..912b84e 100644 --- a/ReaderHive/Source/Info.plist +++ b/ReaderHive/Source/Info.plist @@ -2,6 +2,18 @@ + UIAppFonts + + Poppins-Bold.ttf + Poppins-Medium.ttf + Poppins-Regular.ttf + Poppins-SemiBold.ttf + Poppins-Black.ttf + Poppins-BoldItalic.ttf + Poppins-MediumItalic.ttf + Poppins-SemiBoldItalic.ttf + Poppins-Italic.ttf + CFBundleURLTypes