From 832e6848dba14a127f686788cee298615e1ab21f Mon Sep 17 00:00:00 2001 From: V1taS Date: Sat, 12 Aug 2023 16:36:04 +0200 Subject: [PATCH] New lib --- .../CoinScreenModule/View/CoinScreenView.swift | 2 +- .../View/ColorsScreenView.swift | 4 ++-- .../View/CongratulationsScreenView.swift | 4 ++-- .../View/ContactScreenView.swift | 2 +- .../DateTimeScreenModule/View/DateTimeView.swift | 2 +- .../View/FortuneWheelEditSectionView.swift | 4 ++-- .../FortuneWheelModel+TextPreferences.swift | 2 +- .../MainScreen/View/FortuneWheelView.swift | 2 +- .../View/FortuneWheelSelectedSectionView.swift | 2 +- .../GiftsScreenModule/View/GiftsScreenView.swift | 2 +- .../View/GoodDeedsScreenView.swift | 4 ++-- .../View/JokeGeneratorScreenView.swift | 4 ++-- .../View/LetterScreenView.swift | 2 +- .../View/ListAddItemsScreenView.swift | 6 +++--- .../ListScreenModule/View/ListScreenView.swift | 2 +- .../View/LotteryScreenView.swift | 8 ++++---- .../NamesScreenModule/View/NamesScreenView.swift | 2 +- .../NickNameModule/View/NickNameScreenView.swift | 2 +- .../View/NumberScreenView.swift | 6 +++--- .../View/PasswordGeneratorView.swift | 16 ++++++++-------- .../View/PasswordScreenView.swift | 2 +- .../View/QuotesScreenView.swift | 4 ++-- .../View/RiddlesScreenView.swift | 4 ++-- .../View/SlogansScreenView.swift | 4 ++-- .../View/ListPlayersScreenView.swift | 4 ++-- .../TeamsScreenModule/View/TeamsScreenView.swift | 6 +++--- .../View/TruthOrDareScreenView.swift | 4 ++-- .../YesNoScreenModule/View/YesNoScreenView.swift | 2 +- .../View/MainSettingsScreenView.swift | 4 ++-- .../View/ADVGoogleScreenView.swift | 10 +++++----- .../View/AppUnavailableView.swift | 4 ++-- .../View/ForceUpdateAppView.swift | 2 +- .../View/PremiumScreenView.swift | 2 +- .../View/PremiumWithFriendsView.swift | 2 +- Tuist/Dependencies.swift | 2 +- 35 files changed, 67 insertions(+), 67 deletions(-) diff --git a/Random/App/Sources/Modules/MainScreen/CoinScreenModule/View/CoinScreenView.swift b/Random/App/Sources/Modules/MainScreen/CoinScreenModule/View/CoinScreenView.swift index 5229cd28..270923e4 100644 --- a/Random/App/Sources/Modules/MainScreen/CoinScreenModule/View/CoinScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/CoinScreenModule/View/CoinScreenView.swift @@ -92,7 +92,7 @@ private extension CoinScreenView { scrollResult.backgroundColor = .clear backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold50 + resultLabel.font = fancyFont.primaryBold50 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray generateButton.setTitle(appearance.buttonTitle, for: .normal) diff --git a/Random/App/Sources/Modules/MainScreen/ColorsScreenModule/View/ColorsScreenView.swift b/Random/App/Sources/Modules/MainScreen/ColorsScreenModule/View/ColorsScreenView.swift index 714f0212..74c07dbc 100644 --- a/Random/App/Sources/Modules/MainScreen/ColorsScreenModule/View/ColorsScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/ColorsScreenModule/View/ColorsScreenView.swift @@ -111,7 +111,7 @@ private extension ColorsScreenView { backgroundColor = fancyColor.darkAndLightTheme.primaryWhite showPlugView() - resultLabel.font = RandomFont.primaryBold70 + resultLabel.font = fancyFont.primaryBold70 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = appearance.resultLabelNumberOfLines @@ -188,7 +188,7 @@ private extension ColorsScreenView { func updateResultText(text: String) { resultLabel.text = text - resultLabel.font = RandomFont.primaryBold50 + resultLabel.font = fancyFont.primaryBold50 resultLabel.textColor = fancyColor.only.primaryWhite } diff --git a/Random/App/Sources/Modules/MainScreen/CongratulationsScreenModule/View/CongratulationsScreenView.swift b/Random/App/Sources/Modules/MainScreen/CongratulationsScreenModule/View/CongratulationsScreenView.swift index b906e4fc..b4e2ed3f 100644 --- a/Random/App/Sources/Modules/MainScreen/CongratulationsScreenModule/View/CongratulationsScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/CongratulationsScreenModule/View/CongratulationsScreenView.swift @@ -75,7 +75,7 @@ final class CongratulationsScreenView: CongratulationsScreenViewProtocol { // MARK: - Internal func func set(result: String?, type: CongratulationsScreenModel.CongratulationsType) { - let fontSize = Appearance().result == result ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == result ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = result @@ -149,7 +149,7 @@ private extension CongratulationsScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/ContactScreenModule/View/ContactScreenView.swift b/Random/App/Sources/Modules/MainScreen/ContactScreenModule/View/ContactScreenView.swift index 7a43ac38..7bc31f8f 100644 --- a/Random/App/Sources/Modules/MainScreen/ContactScreenModule/View/ContactScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/ContactScreenModule/View/ContactScreenView.swift @@ -69,7 +69,7 @@ private extension ContactScreenView { backgroundColor = fancyColor.darkAndLightTheme.primaryWhite resultLabel.text = appearance.resultTitle - resultLabel.font = RandomFont.primaryMedium32 + resultLabel.font = fancyFont.primaryMedium32 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/DateTimeScreenModule/View/DateTimeView.swift b/Random/App/Sources/Modules/MainScreen/DateTimeScreenModule/View/DateTimeView.swift index 0491bac0..9cb71901 100644 --- a/Random/App/Sources/Modules/MainScreen/DateTimeScreenModule/View/DateTimeView.swift +++ b/Random/App/Sources/Modules/MainScreen/DateTimeScreenModule/View/DateTimeView.swift @@ -88,7 +88,7 @@ private extension DateTimeView { backgroundColor = fancyColor.darkAndLightTheme.primaryWhite isUserInteractionEnabled = true - resultLabel.font = RandomFont.primaryBold50 + resultLabel.font = fancyFont.primaryBold50 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center diff --git a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/EditSections/View/FortuneWheelEditSectionView.swift b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/EditSections/View/FortuneWheelEditSectionView.swift index cd5b351b..29c1c19d 100644 --- a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/EditSections/View/FortuneWheelEditSectionView.swift +++ b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/EditSections/View/FortuneWheelEditSectionView.swift @@ -211,7 +211,7 @@ extension FortuneWheelEditSectionView: UITableViewDataSource { cell.configureCellWith( titleText: text, textColor: fancyColor.darkAndLightTheme.secondaryGray, - textFont: RandomFont.primaryMedium14, + textFont: fancyFont.primaryMedium14, textAlignment: .left ) viewCell = cell @@ -225,7 +225,7 @@ extension FortuneWheelEditSectionView: UITableViewDataSource { cell.configureCellWith( titleText: object, textColor: fancyColor.darkAndLightTheme.primaryGray, - textFont: RandomFont.primaryMedium18, + textFont: fancyFont.primaryMedium18, textAlignment: .center ) viewCell = cell diff --git a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/Models/FortuneWheelModel+TextPreferences.swift b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/Models/FortuneWheelModel+TextPreferences.swift index 547d387b..10cf724d 100644 --- a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/Models/FortuneWheelModel+TextPreferences.swift +++ b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/Models/FortuneWheelModel+TextPreferences.swift @@ -24,7 +24,7 @@ extension FortuneWheelModel { colors: nil, defaultColor: fancyColor.only.primaryWhite ), - font: RandomFont.primaryBold16, + font: fancyFont.primaryBold16, verticalOffset: 4 ) textPreferences.orientation = .vertical diff --git a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/View/FortuneWheelView.swift b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/View/FortuneWheelView.swift index aa640f81..5679b537 100644 --- a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/View/FortuneWheelView.swift +++ b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/MainScreen/View/FortuneWheelView.swift @@ -179,7 +179,7 @@ private extension FortuneWheelView { fortuneWheel?.layer.shouldRasterize = true fortuneWheel?.layer.rasterizationScale = UIScreen.main.scale - resultLabel.font = RandomFont.primaryBold32 + resultLabel.font = fancyFont.primaryBold32 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.text = "?" } diff --git a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/SelectedSections/View/FortuneWheelSelectedSectionView.swift b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/SelectedSections/View/FortuneWheelSelectedSectionView.swift index eff49b90..421c6f5f 100644 --- a/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/SelectedSections/View/FortuneWheelSelectedSectionView.swift +++ b/Random/App/Sources/Modules/MainScreen/FortuneWheelModule/SelectedSections/View/FortuneWheelSelectedSectionView.swift @@ -161,7 +161,7 @@ extension FortuneWheelSelectedSectionView: UITableViewDataSource { cell.configureCellWith( titleText: text, textColor: fancyColor.darkAndLightTheme.secondaryGray, - textFont: RandomFont.primaryMedium14, + textFont: fancyFont.primaryMedium14, textAlignment: .left ) viewCell = cell diff --git a/Random/App/Sources/Modules/MainScreen/GiftsScreenModule/View/GiftsScreenView.swift b/Random/App/Sources/Modules/MainScreen/GiftsScreenModule/View/GiftsScreenView.swift index c5103bbb..cd0c5b58 100644 --- a/Random/App/Sources/Modules/MainScreen/GiftsScreenModule/View/GiftsScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/GiftsScreenModule/View/GiftsScreenView.swift @@ -150,7 +150,7 @@ private extension GiftsScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/GoodDeedsScreenModule/View/GoodDeedsScreenView.swift b/Random/App/Sources/Modules/MainScreen/GoodDeedsScreenModule/View/GoodDeedsScreenView.swift index e3ba7a25..05db7425 100644 --- a/Random/App/Sources/Modules/MainScreen/GoodDeedsScreenModule/View/GoodDeedsScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/GoodDeedsScreenModule/View/GoodDeedsScreenView.swift @@ -66,7 +66,7 @@ final class GoodDeedsScreenView: GoodDeedsScreenViewProtocol { // MARK: - Internal func func set(result: String?) { - let fontSize = Appearance().result == result ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == result ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = result @@ -122,7 +122,7 @@ private extension GoodDeedsScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/JokeGeneratorScreenModule/View/JokeGeneratorScreenView.swift b/Random/App/Sources/Modules/MainScreen/JokeGeneratorScreenModule/View/JokeGeneratorScreenView.swift index b7b4a6b9..01a9fe58 100644 --- a/Random/App/Sources/Modules/MainScreen/JokeGeneratorScreenModule/View/JokeGeneratorScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/JokeGeneratorScreenModule/View/JokeGeneratorScreenView.swift @@ -66,7 +66,7 @@ final class JokeGeneratorScreenView: JokeGeneratorScreenViewProtocol { // MARK: - Internal func func set(result: String?) { - let fontSize = Appearance().result == result ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == result ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = result @@ -122,7 +122,7 @@ private extension JokeGeneratorScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/LetterScreenModule/View/LetterScreenView.swift b/Random/App/Sources/Modules/MainScreen/LetterScreenModule/View/LetterScreenView.swift index 6f18242e..d2b7cbba 100644 --- a/Random/App/Sources/Modules/MainScreen/LetterScreenModule/View/LetterScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/LetterScreenModule/View/LetterScreenView.swift @@ -76,7 +76,7 @@ private extension LetterScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold70 + resultLabel.font = fancyFont.primaryBold70 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray generateButton.setTitle(appearance.buttonTitle, for: .normal) diff --git a/Random/App/Sources/Modules/MainScreen/ListModules/ListAddItemsScreenModule/View/ListAddItemsScreenView.swift b/Random/App/Sources/Modules/MainScreen/ListModules/ListAddItemsScreenModule/View/ListAddItemsScreenView.swift index 84d5def7..5cb71491 100644 --- a/Random/App/Sources/Modules/MainScreen/ListModules/ListAddItemsScreenModule/View/ListAddItemsScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/ListModules/ListAddItemsScreenModule/View/ListAddItemsScreenView.swift @@ -120,7 +120,7 @@ extension ListAddItemsScreenView: UITableViewDataSource { cell.configureCellWith( titleText: result.text, textColor: fancyColor.darkAndLightTheme.primaryGray, - textFont: RandomFont.primaryMedium18, + textFont: fancyFont.primaryMedium18, textAlignment: .left ) viewCell = cell @@ -167,10 +167,10 @@ extension ListAddItemsScreenView: UITableViewDataSource { cell.configureCellWith( primaryText: "\(appearance.allItemTitle): \(textCount)", primaryTextColor: fancyColor.darkAndLightTheme.primaryGray, - primaryTextFont: RandomFont.primaryMedium10, + primaryTextFont: fancyFont.primaryMedium10, secondaryText: nil, secondaryTextColor: fancyColor.darkAndLightTheme.primaryGray, - secondaryTextFont: RandomFont.primaryMedium10 + secondaryTextFont: fancyFont.primaryMedium10 ) viewCell = cell } diff --git a/Random/App/Sources/Modules/MainScreen/ListModules/ListScreenModule/View/ListScreenView.swift b/Random/App/Sources/Modules/MainScreen/ListModules/ListScreenModule/View/ListScreenView.swift index a260ca21..06eddcdd 100644 --- a/Random/App/Sources/Modules/MainScreen/ListModules/ListScreenModule/View/ListScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/ListModules/ListScreenModule/View/ListScreenView.swift @@ -78,7 +78,7 @@ private extension ListScreenView { backgroundColor = fancyColor.darkAndLightTheme.primaryWhite resultTextView.textColor = fancyColor.darkAndLightTheme.primaryGray - resultTextView.font = RandomFont.primaryMedium32 + resultTextView.font = fancyFont.primaryMedium32 resultTextView.textAlignment = .center resultTextView.isEditable = false resultTextView.isSelectable = false diff --git a/Random/App/Sources/Modules/MainScreen/LotteryScreenModule/View/LotteryScreenView.swift b/Random/App/Sources/Modules/MainScreen/LotteryScreenModule/View/LotteryScreenView.swift index 469a817c..53809d46 100644 --- a/Random/App/Sources/Modules/MainScreen/LotteryScreenModule/View/LotteryScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/LotteryScreenModule/View/LotteryScreenView.swift @@ -121,7 +121,7 @@ private extension LotteryScreenView { amountNumberTextField.layer.borderColor = fancyColor.darkAndLightTheme.secondaryGray.cgColor isUserInteractionEnabled = true - resultTextView.font = RandomFont.primaryBold50 + resultTextView.font = fancyFont.primaryBold50 resultTextView.textColor = fancyColor.darkAndLightTheme.primaryGray resultTextView.textAlignment = .center resultTextView.isEditable = false @@ -156,19 +156,19 @@ private extension LotteryScreenView { generateButton.addTarget(self, action: #selector(generateButtonAction), for: .touchUpInside) amountNumberLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - amountNumberLabel.font = RandomFont.primaryRegular18 + amountNumberLabel.font = fancyFont.primaryRegular18 amountNumberLabel.text = appearance.textAmountLabel + ":" amountNumberTextField.placeholder = appearance.startPlaceholder amountNumberTextField.keyboardType = .numberPad amountNumberTextField.delegate = self - rangeNumberLabel.font = RandomFont.primaryRegular18 + rangeNumberLabel.font = fancyFont.primaryRegular18 rangeNumberLabel.textColor = fancyColor.darkAndLightTheme.primaryGray rangeNumberLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal) rangeNumberLabel.text = appearance.textRangeLabel + ":" - betweenRangeLabel.font = RandomFont.primaryMedium18 + betweenRangeLabel.font = fancyFont.primaryMedium18 betweenRangeLabel.textColor = fancyColor.darkAndLightTheme.primaryGray betweenRangeLabel.text = appearance.separatorTitle diff --git a/Random/App/Sources/Modules/MainScreen/NamesScreenModule/View/NamesScreenView.swift b/Random/App/Sources/Modules/MainScreen/NamesScreenModule/View/NamesScreenView.swift index 2b4b753f..b94dfe92 100644 --- a/Random/App/Sources/Modules/MainScreen/NamesScreenModule/View/NamesScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/NamesScreenModule/View/NamesScreenView.swift @@ -150,7 +150,7 @@ private extension NamesScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold50 + resultLabel.font = fancyFont.primaryBold50 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/NickNameModule/View/NickNameScreenView.swift b/Random/App/Sources/Modules/MainScreen/NickNameModule/View/NickNameScreenView.swift index 429f7827..742e4d51 100644 --- a/Random/App/Sources/Modules/MainScreen/NickNameModule/View/NickNameScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/NickNameModule/View/NickNameScreenView.swift @@ -130,7 +130,7 @@ private extension NickNameScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold50 + resultLabel.font = fancyFont.primaryBold50 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = appearance.numberOfLines diff --git a/Random/App/Sources/Modules/MainScreen/NumberScreenModule/View/NumberScreenView.swift b/Random/App/Sources/Modules/MainScreen/NumberScreenModule/View/NumberScreenView.swift index 24890853..bece5bf4 100644 --- a/Random/App/Sources/Modules/MainScreen/NumberScreenModule/View/NumberScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/NumberScreenModule/View/NumberScreenView.swift @@ -144,7 +144,7 @@ private extension NumberScreenView { rangeEndTextField.layer.borderColor = fancyColor.darkAndLightTheme.secondaryGray.cgColor backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold70 + resultLabel.font = fancyFont.primaryBold70 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero @@ -166,11 +166,11 @@ private extension NumberScreenView { rangeStartLabel.text = appearance.min rangeStartLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - rangeStartLabel.font = RandomFont.primaryMedium18 + rangeStartLabel.font = fancyFont.primaryMedium18 rangeEndLabel.text = appearance.max rangeEndLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - rangeEndLabel.font = RandomFont.primaryMedium18 + rangeEndLabel.font = fancyFont.primaryMedium18 let tap = UITapGestureRecognizer(target: self, action: #selector(UIView.endEditing)) tap.cancelsTouchesInView = false diff --git a/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordGeneratorView.swift b/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordGeneratorView.swift index c4a0eed0..1f8f1c20 100644 --- a/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordGeneratorView.swift +++ b/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordGeneratorView.swift @@ -201,7 +201,7 @@ private extension PasswordGeneratorView { func applyDefaultBehavior() { let appearance = Appearance() - crackTimeLabel.font = RandomFont.primaryBold18 + crackTimeLabel.font = fancyFont.primaryBold18 crackTimeLabel.numberOfLines = 2 crackTimeLabel.textAlignment = .center crackTimeLabel.textColor = fancyColor.darkAndLightTheme.primaryGray @@ -212,7 +212,7 @@ private extension PasswordGeneratorView { settingOptionsLabel.text = appearance.parameters + ":" settingOptionsLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - settingOptionsLabel.font = RandomFont.primaryBold18 + settingOptionsLabel.font = fancyFont.primaryBold18 settingOptionsLabel.numberOfLines = 1 labelsStackView.axis = .vertical @@ -221,19 +221,19 @@ private extension PasswordGeneratorView { uppercaseLettersLabel.text = appearance.uppercase uppercaseLettersLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - uppercaseLettersLabel.font = RandomFont.primaryMedium18 + uppercaseLettersLabel.font = fancyFont.primaryMedium18 lowercaseLettersLabel.text = appearance.lovercase lowercaseLettersLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - lowercaseLettersLabel.font = RandomFont.primaryMedium18 + lowercaseLettersLabel.font = fancyFont.primaryMedium18 numbersLabel.text = appearance.numbers numbersLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - numbersLabel.font = RandomFont.primaryMedium18 + numbersLabel.font = fancyFont.primaryMedium18 symbolsLabel.text = appearance.symbols symbolsLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - symbolsLabel.font = RandomFont.primaryMedium18 + symbolsLabel.font = fancyFont.primaryMedium18 switchersStackView.axis = .vertical switchersStackView.alignment = .trailing @@ -261,7 +261,7 @@ private extension PasswordGeneratorView { passwordLengthLabel.text = appearance.longPassword + ":" passwordLengthLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - passwordLengthLabel.font = RandomFont.primaryBold18 + passwordLengthLabel.font = fancyFont.primaryBold18 textFieldStackView.axis = .horizontal textFieldStackView.spacing = appearance.defaultSpacing @@ -273,7 +273,7 @@ private extension PasswordGeneratorView { passwordLengthTextField.keyboardType = .numberPad resultTextView.backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultTextView.font = RandomFont.primaryMedium24 + resultTextView.font = fancyFont.primaryMedium24 resultTextView.textAlignment = .center resultTextView.isEditable = false resultTextView.isSelectable = false diff --git a/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordScreenView.swift b/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordScreenView.swift index 264d1843..c996ebad 100644 --- a/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/PasswordScreenModule/View/PasswordScreenView.swift @@ -159,7 +159,7 @@ private extension PasswordScreenView { DispatchQueue.main.async { let passwordAttributed = NSMutableAttributedString( string: password, - attributes: [NSAttributedString.Key.font: RandomFont.primaryMedium24]) + attributes: [NSAttributedString.Key.font: fancyFont.primaryMedium24]) let paragraphStyle = NSMutableParagraphStyle() paragraphStyle.alignment = .center passwordAttributed.addAttributes([.paragraphStyle: paragraphStyle], range: NSRange(location: .zero, diff --git a/Random/App/Sources/Modules/MainScreen/QuotesScreenModule/View/QuotesScreenView.swift b/Random/App/Sources/Modules/MainScreen/QuotesScreenModule/View/QuotesScreenView.swift index cf1320d3..78b40944 100644 --- a/Random/App/Sources/Modules/MainScreen/QuotesScreenModule/View/QuotesScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/QuotesScreenModule/View/QuotesScreenView.swift @@ -66,7 +66,7 @@ final class QuotesScreenView: QuotesScreenViewProtocol { // MARK: - Internal func func set(result: String?) { - let fontSize = Appearance().result == result ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == result ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = result @@ -122,7 +122,7 @@ private extension QuotesScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = appearance.numberOfLines diff --git a/Random/App/Sources/Modules/MainScreen/RiddlesScreenModule/View/RiddlesScreenView.swift b/Random/App/Sources/Modules/MainScreen/RiddlesScreenModule/View/RiddlesScreenView.swift index b6d75df6..6bdf0ae2 100644 --- a/Random/App/Sources/Modules/MainScreen/RiddlesScreenModule/View/RiddlesScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/RiddlesScreenModule/View/RiddlesScreenView.swift @@ -77,7 +77,7 @@ final class RiddlesScreenView: RiddlesScreenViewProtocol { func set(riddles: RiddlesScreenModel.Riddles, type: RiddlesScreenModel.DifficultType) { - let fontSize = Appearance().result == riddles.question ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == riddles.question ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = riddles.question @@ -151,7 +151,7 @@ private extension RiddlesScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/SlogansScreenModule/View/SlogansScreenView.swift b/Random/App/Sources/Modules/MainScreen/SlogansScreenModule/View/SlogansScreenView.swift index f7c8ebb4..0e7e8fc4 100644 --- a/Random/App/Sources/Modules/MainScreen/SlogansScreenModule/View/SlogansScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/SlogansScreenModule/View/SlogansScreenView.swift @@ -66,7 +66,7 @@ final class SlogansScreenView: SlogansScreenViewProtocol { // MARK: - Internal func func set(result: String?) { - let fontSize = Appearance().result == result ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == result ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = result @@ -122,7 +122,7 @@ private extension SlogansScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/TeamsModules/ListPlayersScreenModule/View/ListPlayersScreenView.swift b/Random/App/Sources/Modules/MainScreen/TeamsModules/ListPlayersScreenModule/View/ListPlayersScreenView.swift index bd5d4dde..9b9470aa 100644 --- a/Random/App/Sources/Modules/MainScreen/TeamsModules/ListPlayersScreenModule/View/ListPlayersScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/TeamsModules/ListPlayersScreenModule/View/ListPlayersScreenView.swift @@ -200,10 +200,10 @@ extension ListPlayersScreenView: UITableViewDataSource { cell.configureCellWith( primaryText: "\(appearance.allTitle): \(playersCount)", primaryTextColor: fancyColor.darkAndLightTheme.primaryGray, - primaryTextFont: RandomFont.primaryMedium10, + primaryTextFont: fancyFont.primaryMedium10, secondaryText: "\(appearance.forGameTitle): \(forGameCount)", secondaryTextColor: fancyColor.darkAndLightTheme.primaryGray, - secondaryTextFont: RandomFont.primaryMedium10 + secondaryTextFont: fancyFont.primaryMedium10 ) viewCell = cell } diff --git a/Random/App/Sources/Modules/MainScreen/TeamsModules/TeamsScreenModule/View/TeamsScreenView.swift b/Random/App/Sources/Modules/MainScreen/TeamsModules/TeamsScreenModule/View/TeamsScreenView.swift index 119d8e6b..b71dfcae 100644 --- a/Random/App/Sources/Modules/MainScreen/TeamsModules/TeamsScreenModule/View/TeamsScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/TeamsModules/TeamsScreenModule/View/TeamsScreenView.swift @@ -122,10 +122,10 @@ extension TeamsScreenView: UICollectionViewDelegate { headerView.configureCellWith( primaryText: model.name, primaryTextColor: fancyColor.darkAndLightTheme.primaryGray, - primaryTextFont: RandomFont.primaryBold18, + primaryTextFont: fancyFont.primaryBold18, secondaryText: "\(Appearance().countPlayersTitle) - \(model.players.count)", secondaryTextColor: fancyColor.darkAndLightTheme.secondaryGray, - secondaryTextFont: RandomFont.primaryRegular18, + secondaryTextFont: fancyFont.primaryRegular18, editImage: isShowEditImage ? Appearance().renameTeamButton : nil) { self.output?.showAlert(name: model.name, id: model.id) } @@ -216,7 +216,7 @@ private extension TeamsScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold70 + resultLabel.font = fancyFont.primaryBold70 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/TruthOrDareModule/View/TruthOrDareScreenView.swift b/Random/App/Sources/Modules/MainScreen/TruthOrDareModule/View/TruthOrDareScreenView.swift index 4f321327..9eafe851 100644 --- a/Random/App/Sources/Modules/MainScreen/TruthOrDareModule/View/TruthOrDareScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/TruthOrDareModule/View/TruthOrDareScreenView.swift @@ -74,7 +74,7 @@ final class TruthOrDareScreenView: TruthOrDareScreenViewProtocol { // MARK: - Internal func func set(result: String?, type: TruthOrDareScreenModel.TruthOrDareType) { - let fontSize = Appearance().result == result ? RandomFont.primaryBold50 : RandomFont.primaryBold24 + let fontSize = Appearance().result == result ? fancyFont.primaryBold50 : fancyFont.primaryBold24 resultLabel.font = fontSize resultLabel.text = result @@ -152,7 +152,7 @@ private extension TruthOrDareScreenView { let appearance = Appearance() backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold24 + resultLabel.font = fancyFont.primaryBold24 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center resultLabel.numberOfLines = .zero diff --git a/Random/App/Sources/Modules/MainScreen/YesNoScreenModule/View/YesNoScreenView.swift b/Random/App/Sources/Modules/MainScreen/YesNoScreenModule/View/YesNoScreenView.swift index 9dad14ea..4e408562 100644 --- a/Random/App/Sources/Modules/MainScreen/YesNoScreenModule/View/YesNoScreenView.swift +++ b/Random/App/Sources/Modules/MainScreen/YesNoScreenModule/View/YesNoScreenView.swift @@ -76,7 +76,7 @@ private extension YesNoScreenView { func setupDefaultSettings() { backgroundColor = fancyColor.darkAndLightTheme.primaryWhite - resultLabel.font = RandomFont.primaryBold70 + resultLabel.font = fancyFont.primaryBold70 resultLabel.textColor = fancyColor.darkAndLightTheme.primaryGray resultLabel.textAlignment = .center diff --git a/Random/App/Sources/Modules/SettingsScreen/MainSettingsScreenModule/View/MainSettingsScreenView.swift b/Random/App/Sources/Modules/SettingsScreen/MainSettingsScreenModule/View/MainSettingsScreenView.swift index 10e076c7..a3816def 100644 --- a/Random/App/Sources/Modules/SettingsScreen/MainSettingsScreenModule/View/MainSettingsScreenView.swift +++ b/Random/App/Sources/Modules/SettingsScreen/MainSettingsScreenModule/View/MainSettingsScreenView.swift @@ -270,12 +270,12 @@ private extension MainSettingsScreenView { stackFeedBack.spacing = appearance.minInset feedBackLabel.textColor = fancyColor.darkAndLightTheme.primaryGray - feedBackLabel.font = RandomFont.primaryRegular16 + feedBackLabel.font = fancyFont.primaryRegular16 feedBackLabel.text = "\(appearance.feedbackButtonTitle):" feedBackButton.setTitle(appearance.addressRecipients, for: .normal) feedBackButton.setTitleColor(fancyColor.only.primaryBlue, for: .normal) - feedBackButton.titleLabel?.font = RandomFont.primaryRegular16 + feedBackButton.titleLabel?.font = fancyFont.primaryRegular16 feedBackButton.addTarget(self, action: #selector(feedBackButtonAction), for: .touchUpInside) diff --git a/Random/App/Sources/Modules/SharedScreens/ADVGoogleScreenModule/View/ADVGoogleScreenView.swift b/Random/App/Sources/Modules/SharedScreens/ADVGoogleScreenModule/View/ADVGoogleScreenView.swift index 08f1bfda..8416afb3 100644 --- a/Random/App/Sources/Modules/SharedScreens/ADVGoogleScreenModule/View/ADVGoogleScreenView.swift +++ b/Random/App/Sources/Modules/SharedScreens/ADVGoogleScreenModule/View/ADVGoogleScreenView.swift @@ -189,20 +189,20 @@ private extension ADVGoogleScreenView { descriptionView.numberOfLines = .zero mediaView.contentMode = .scaleAspectFill - headlineView.font = RandomFont.primaryMedium24 + headlineView.font = fancyFont.primaryMedium24 headlineView.textColor = fancyColor.darkAndLightTheme.primaryGray - descriptionView.font = RandomFont.primaryMedium18 + descriptionView.font = fancyFont.primaryMedium18 descriptionView.textColor = fancyColor.darkAndLightTheme.primaryGray - starRatingView.font = RandomFont.primaryMedium18 + starRatingView.font = fancyFont.primaryMedium18 starRatingView.textColor = fancyColor.darkAndLightTheme.primaryGray - estimatedSecondsView.font = RandomFont.primaryMedium16 + estimatedSecondsView.font = fancyFont.primaryMedium16 estimatedSecondsView.textColor = fancyColor.only.primaryBlue estimatedSecondsView.isHidden = true - callToActionButton.titleLabel?.font = RandomFont.primaryMedium18 + callToActionButton.titleLabel?.font = fancyFont.primaryMedium18 callToActionButton.setTitleColor(fancyColor.only.primaryBlue, for: .normal) lottieAnimationView.isHidden = true diff --git a/Random/App/Sources/Modules/SharedScreens/AppUnavailableModule/View/AppUnavailableView.swift b/Random/App/Sources/Modules/SharedScreens/AppUnavailableModule/View/AppUnavailableView.swift index 8556ad18..52dec1e6 100644 --- a/Random/App/Sources/Modules/SharedScreens/AppUnavailableModule/View/AppUnavailableView.swift +++ b/Random/App/Sources/Modules/SharedScreens/AppUnavailableModule/View/AppUnavailableView.swift @@ -107,14 +107,14 @@ private extension AppUnavailableView { stubAnimationView.animationSpeed = Appearance().animationSpeed titleLabel.numberOfLines = .zero - titleLabel.font = RandomFont.primaryMedium18 + titleLabel.font = fancyFont.primaryMedium18 titleLabel.textColor = fancyColor.darkAndLightTheme.primaryBlack titleLabel.textAlignment = .center titleLabel.text = RandomStrings.Localizable.wowRandomProOnAShortTechBreak feedBackButton.setTitle(Appearance().addressRecipients, for: .normal) feedBackButton.setTitleColor(fancyColor.only.primaryBlue, for: .normal) - feedBackButton.titleLabel?.font = RandomFont.primaryRegular16 + feedBackButton.titleLabel?.font = fancyFont.primaryRegular16 feedBackButton.addTarget(self, action: #selector(feedBackButtonAction), for: .touchUpInside) diff --git a/Random/App/Sources/Modules/SharedScreens/ForceUpdateAppModule/View/ForceUpdateAppView.swift b/Random/App/Sources/Modules/SharedScreens/ForceUpdateAppModule/View/ForceUpdateAppView.swift index bd5e1ebf..10127596 100644 --- a/Random/App/Sources/Modules/SharedScreens/ForceUpdateAppModule/View/ForceUpdateAppView.swift +++ b/Random/App/Sources/Modules/SharedScreens/ForceUpdateAppModule/View/ForceUpdateAppView.swift @@ -105,7 +105,7 @@ private extension ForceUpdateAppView { stubAnimationView.animationSpeed = Appearance().animationSpeed titleLabel.numberOfLines = .zero - titleLabel.font = RandomFont.primaryMedium18 + titleLabel.font = fancyFont.primaryMedium18 titleLabel.textColor = fancyColor.darkAndLightTheme.primaryBlack titleLabel.textAlignment = .center titleLabel.text = RandomStrings.Localizable.oopsYourVersionOfRandomProIsOutOfDate diff --git a/Random/App/Sources/Modules/SharedScreens/PremiumScreenModule/View/PremiumScreenView.swift b/Random/App/Sources/Modules/SharedScreens/PremiumScreenModule/View/PremiumScreenView.swift index bdb9214c..02c0008e 100644 --- a/Random/App/Sources/Modules/SharedScreens/PremiumScreenModule/View/PremiumScreenView.swift +++ b/Random/App/Sources/Modules/SharedScreens/PremiumScreenModule/View/PremiumScreenView.swift @@ -226,7 +226,7 @@ private extension PremiumScreenView { restorePurchaseButton.addTarget(self, action: #selector(restorePurchaseButtonAction), for: .touchUpInside) loaderLabel.textAlignment = .center - loaderLabel.font = RandomFont.primaryMedium32 + loaderLabel.font = fancyFont.primaryMedium32 loaderLabel.textColor = fancyColor.darkAndLightTheme.primaryGray loaderLabel.text = "\(appearance.processingPaymentTitle)..." loaderLabel.numberOfLines = appearance.numberOfLines diff --git a/Random/App/Sources/Modules/SharedScreens/PremiumWithFriendsModule/View/PremiumWithFriendsView.swift b/Random/App/Sources/Modules/SharedScreens/PremiumWithFriendsModule/View/PremiumWithFriendsView.swift index 1fc3b8f3..fb161f41 100644 --- a/Random/App/Sources/Modules/SharedScreens/PremiumWithFriendsModule/View/PremiumWithFriendsView.swift +++ b/Random/App/Sources/Modules/SharedScreens/PremiumWithFriendsModule/View/PremiumWithFriendsView.swift @@ -196,7 +196,7 @@ extension PremiumWithFriendsView: UITableViewDataSource { cell.configureCellWith( titleText: text, textColor: fancyColor.only.lightGray, - textFont: RandomFont.primaryRegular14, + textFont: fancyFont.primaryRegular14, textAlignment: .left ) viewCell = cell diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift index 346ecb85..2471b6ee 100644 --- a/Tuist/Dependencies.swift +++ b/Tuist/Dependencies.swift @@ -4,7 +4,7 @@ let dependencies = Dependencies( swiftPackageManager: SwiftPackageManagerDependencies( [ .remote(url: "https://github.com/V1taS/FancyUIKit.git", - requirement: .exact("1.2")), + requirement: .exact("1.3")), // .local(path: "../RandomUIKit"), .remote(url: "https://github.com/V1taS/FancyNetwork.git", requirement: .exact("1.1")),