Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/atomic_vds_button

This commit is contained in:
Scott Pfeil 2023-09-28 10:55:08 -04:00
commit d7ba335fdb
4 changed files with 15 additions and 1 deletions

View File

@ -21,7 +21,7 @@ import VDSColorTokens
else { return } else { return }
// Set line to the same color as the text // Set line to the same color as the text
if let color = titleLabel?.textColor?.cgColor { if let color = titleColor(for: state)?.cgColor {
context.setStrokeColor(color) context.setStrokeColor(color)
} }

View File

@ -183,8 +183,12 @@
// Returns a gradient lighter color; // Returns a gradient lighter color;
+ (nonnull UIColor *)mfGradientColor:(nullable UIColor *)color; + (nonnull UIColor *)mfGradientColor:(nullable UIColor *)color;
// Returns if the color is dark or not
- (BOOL)isDark;
#pragma mark - Hex String #pragma mark - Hex String
+ (nullable NSString *)hexStringForColor:(nonnull UIColor*)color; + (nullable NSString *)hexStringForColor:(nonnull UIColor*)color;
+ (nonnull UIColor *)mfGetColorForHexWithTransparency:(nonnull NSString *)hexString; + (nonnull UIColor *)mfGetColorForHexWithTransparency:(nonnull NSString *)hexString;
@end @end

View File

@ -389,6 +389,12 @@
return [UIColor whiteColor]; return [UIColor whiteColor];
} }
- (BOOL)isDark {
CGFloat greyScale = 0;
[self getWhite:&greyScale alpha:nil];
return greyScale < 0.5;
}
#pragma mark - Hex String #pragma mark - Hex String
+ (nullable NSString *)hexStringForColor:(nonnull UIColor*)color { + (nullable NSString *)hexStringForColor:(nonnull UIColor*)color {

View File

@ -12,6 +12,7 @@ import MVMCore
public extension UINavigationController { public extension UINavigationController {
/// Convenience function for setting the navigation item. /// Convenience function for setting the navigation item.
@MainActor
func setNavigationItem(with model: NavigationItemModelProtocol, for viewController: UIViewController, coordinatingWith pageBehaviorController: PageBehaviorHandlerProtocol? = nil) { func setNavigationItem(with model: NavigationItemModelProtocol, for viewController: UIViewController, coordinatingWith pageBehaviorController: PageBehaviorHandlerProtocol? = nil) {
let behaviorHandler = pageBehaviorController ?? viewController as? PageBehaviorHandlerProtocol; let behaviorHandler = pageBehaviorController ?? viewController as? PageBehaviorHandlerProtocol;
@ -33,6 +34,7 @@ public extension UINavigationController {
} }
/// Convenience function for setting the navigation buttons. /// Convenience function for setting the navigation buttons.
@MainActor
func setNavigationButtons(with model: NavigationItemModelProtocol, for viewController: UIViewController) { func setNavigationButtons(with model: NavigationItemModelProtocol, for viewController: UIViewController) {
let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
var leftItems: [UIBarButtonItem] = [] var leftItems: [UIBarButtonItem] = []
@ -60,6 +62,7 @@ public extension UINavigationController {
} }
/// Convenience function for setting the navigation titleView. /// Convenience function for setting the navigation titleView.
@MainActor
func setNavigationTitleView(with model: NavigationItemModelProtocol, for viewController: UIViewController, coordinatingWith pageBehaviorController: PageBehaviorHandlerProtocol? = nil) { func setNavigationTitleView(with model: NavigationItemModelProtocol, for viewController: UIViewController, coordinatingWith pageBehaviorController: PageBehaviorHandlerProtocol? = nil) {
guard let titleViewModel = model.titleView else { return } guard let titleViewModel = model.titleView else { return }
@ -87,6 +90,7 @@ public extension UINavigationController {
} }
/// Convenience function for setting the navigation bar ui /// Convenience function for setting the navigation bar ui
@MainActor
func setNavigationBarUI(with model: NavigationItemModelProtocol) { func setNavigationBarUI(with model: NavigationItemModelProtocol) {
let navigationBar = navigationBar let navigationBar = navigationBar
let font = Styler.Font.BoldTitleSmall.getFont(false) let font = Styler.Font.BoldTitleSmall.getFont(false)