Digital PCT265 story ONEAPP-7592 - Updates to tile container to allow custom colors.
This commit is contained in:
parent
5bfd2ed85c
commit
895f0181ec
@ -8,6 +8,7 @@
|
||||
|
||||
import Foundation
|
||||
import VDS
|
||||
import MVMCore
|
||||
|
||||
open class TileContainerModel: TileContainerBaseModel<TileContainer.Padding, TileContainer>, ParentMoleculeModelProtocol, MoleculeModelProtocol {
|
||||
|
||||
@ -36,7 +37,7 @@ open class TileContainerModel: TileContainerBaseModel<TileContainer.Padding, Til
|
||||
required public init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString
|
||||
molecule = try container.decodeModelIfPresent(codingKey: .molecule)
|
||||
molecule = try container.decodeMoleculeIfPresent(codingKey: .molecule)
|
||||
try super.init(from: decoder)
|
||||
}
|
||||
|
||||
|
||||
@ -95,7 +95,11 @@ extension VDS.TileContainerBase.BackgroundColor: Codable {
|
||||
case "black":
|
||||
self = .black
|
||||
default:
|
||||
self = .custom(type)
|
||||
if let color = try? Color(from: decoder) {
|
||||
self = .custom(color.hex)
|
||||
} else {
|
||||
self = .custom(type)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ public struct DeprecatedHeadlineBodyHelper {
|
||||
|
||||
public func createTitleLockupModel(defaultStyle: HeadlineBodyModel.Style = .header, headlineBody: HeadlineBodyModel) throws -> TitleLockupModel {
|
||||
guard let headline = headlineBody.headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") }
|
||||
var body = headlineBody.body
|
||||
let body = headlineBody.body
|
||||
switch headlineBody.style ?? defaultStyle {
|
||||
case .landingHeader:
|
||||
headline.fontStyle = Styler.Font.RegularTitle2XLarge
|
||||
@ -103,13 +103,13 @@ public struct DeprecatedHeadlineBodyHelper {
|
||||
headline.fontStyle = Styler.Font.RegularTitleXLarge
|
||||
body?.fontStyle = Styler.Font.RegularTitleMedium
|
||||
}
|
||||
let model = try TitleLockupModel(title: headline, subTitle: body)
|
||||
let model = TitleLockupModel(title: headline, subTitle: body)
|
||||
model.id = headlineBody.id
|
||||
return model
|
||||
}
|
||||
|
||||
public func createHeadlineBodyModel(titleLockup: TitleLockupModel) -> HeadlineBodyModel {
|
||||
var headlineBody = HeadlineBodyModel(headline: titleLockup.title)
|
||||
let headlineBody = HeadlineBodyModel(headline: titleLockup.title)
|
||||
headlineBody.body = titleLockup.subTitle
|
||||
headlineBody.id = titleLockup.id
|
||||
return headlineBody
|
||||
|
||||
@ -230,6 +230,12 @@ extension UIColor {
|
||||
return UIColor(named: name, in: MVMCoreUIUtility.bundleForMVMCoreUI(), compatibleWith: nil)!
|
||||
}
|
||||
|
||||
/// Returns a color corresponding to the passed in color name.
|
||||
@objc
|
||||
public static func mvmCoreUIColor(with name: String) -> UIColor? {
|
||||
return UIColor.names[name]?.uiColor
|
||||
}
|
||||
|
||||
/// Convenience to get a grayscale UIColor where the same value is used for red, green, and blue.
|
||||
public class func grayscale(rgb: Int, alpha: CGFloat = 1.0) -> UIColor {
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
//
|
||||
|
||||
#import "UIColor+MFConvenience.h"
|
||||
#import <MVMCoreUI/MVMCoreUI-Swift.h>
|
||||
@import MVMCore.MVMCoreDispatchUtility;
|
||||
|
||||
@implementation UIColor (MFConvenience)
|
||||
@ -298,6 +299,10 @@
|
||||
}
|
||||
|
||||
+ (nullable UIColor *)mfGetColorForString:(nullable NSString *)string {
|
||||
if ([string hasPrefix:@"#"]) {
|
||||
return [self mfGetColorForHex:string];
|
||||
}
|
||||
|
||||
static NSDictionary *stringColorMapping;
|
||||
static dispatch_once_t once;
|
||||
dispatch_once(&once, ^{
|
||||
@ -327,14 +332,9 @@
|
||||
|
||||
UIColor *color = nil;
|
||||
if (string && string.length > 0) {
|
||||
color = [stringColorMapping objectForKey:string];
|
||||
if (!color){
|
||||
color = [UIColor blackColor];
|
||||
}
|
||||
} else {
|
||||
color = [UIColor blackColor];
|
||||
color = [stringColorMapping objectForKey:string] ?: [UIColor mvmCoreUIColorWith:string];
|
||||
}
|
||||
return color;
|
||||
return color ?: [UIColor blackColor];
|
||||
}
|
||||
|
||||
+ (nonnull UIColor *)mfGetColorForHex:(nonnull NSString *) hexString {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user