From 635d5abe9ffec24fc4c0c58a9657937ae41d0c21 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 2 Aug 2023 11:05:21 -0500 Subject: [PATCH] updated titleLockup logic for janet Signed-off-by: Matt Bruce --- VDS/Components/TitleLockup/TitleLockup.swift | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/VDS/Components/TitleLockup/TitleLockup.swift b/VDS/Components/TitleLockup/TitleLockup.swift index 1c197470..ab745a33 100644 --- a/VDS/Components/TitleLockup/TitleLockup.swift +++ b/VDS/Components/TitleLockup/TitleLockup.swift @@ -309,15 +309,27 @@ open class TitleLockup: View { if let eyebrowModel, !eyebrowModel.text.isEmpty { eyebrowTextIsEmpty = false eyebrowLabel.textPosition = allLabelsTextPosition - eyebrowLabel.textStyle = eyebrowModel.isBold ? otherStandardStyle.value.bold : otherStandardStyle.value.regular eyebrowLabel.text = eyebrowModel.text eyebrowLabel.attributes = eyebrowModel.textAttributes eyebrowLabel.numberOfLines = eyebrowModel.numberOfLines eyebrowLabel.surface = surface - if let titleModel, isUniformSize && titleModel.isBold { - eyebrowLabel.textColorConfiguration = textColorSecondaryConfiguration + + //When uniform size is true + if let titleModel, isUniformSize { + if titleModel.isBold { + //When uniform size is true and the title is bold, + //the eyebrow is always regular weight and the secondary color. + eyebrowLabel.textStyle = otherStandardStyle.value.regular + eyebrowLabel.textColorConfiguration = textColorSecondaryConfiguration + } else { + //When uniform size is true and the title is regular weight + //the eyebrow is always bold and uses the primary color. + eyebrowLabel.textStyle = otherStandardStyle.value.bold + eyebrowLabel.textColorConfiguration = textColorPrimaryConfiguration + } } else { eyebrowLabel.textColorConfiguration = textColorPrimaryConfiguration + eyebrowLabel.textStyle = eyebrowModel.isBold ? otherStandardStyle.value.bold : otherStandardStyle.value.regular } } else { eyebrowLabel.reset()