[CM-888] Updated catalogdisplayview model default values
This commit is contained in:
parent
c9c3b29afb
commit
3d03df511f
|
@ -16,10 +16,10 @@ final public class CatalogDisplayView<View: ContentView>: UIView {
|
|||
public let title: String?
|
||||
|
||||
/// Detail description
|
||||
public var detail: String?
|
||||
public let detail: String?
|
||||
|
||||
/// Primary axis for content view
|
||||
public var axis: NSLayoutConstraint.Axis = .horizontal
|
||||
public let axis: NSLayoutConstraint.Axis
|
||||
|
||||
/// Model to populate the content view
|
||||
public let model: View.Model
|
||||
|
@ -32,14 +32,14 @@ final public class CatalogDisplayView<View: ContentView>: UIView {
|
|||
/// - displayViewModel: model to populate the content view
|
||||
public init(
|
||||
title: String?,
|
||||
detail: String?,
|
||||
displayViewAxis: NSLayoutConstraint.Axis,
|
||||
displayViewModel: View.Model
|
||||
detail: String? = nil,
|
||||
axis: NSLayoutConstraint.Axis = .horizontal,
|
||||
model: View.Model
|
||||
) {
|
||||
self.title = title
|
||||
self.detail = detail
|
||||
self.axis = displayViewAxis
|
||||
self.model = displayViewModel
|
||||
self.axis = axis
|
||||
self.model = model
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,13 +47,11 @@ final class CatalogFactoryTest: XCTestCase {
|
|||
CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
), CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title2",
|
||||
detail: "detail2",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
)
|
||||
]
|
||||
|
||||
|
|
|
@ -13,8 +13,7 @@ final class CategoriesTest: XCTestCase {
|
|||
CatalogDisplayView<IconographyView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: UIImage(systemName: "person.fill") ?? UIImage()
|
||||
model: UIImage(systemName: "person.fill") ?? UIImage()
|
||||
)
|
||||
]
|
||||
let category = IconographyCategory(name: "Icons", models: model)
|
||||
|
@ -26,8 +25,7 @@ final class CategoriesTest: XCTestCase {
|
|||
CatalogDisplayView<ColorView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: UIColor.blue
|
||||
model: UIColor.blue
|
||||
)
|
||||
]
|
||||
let category = ColorCategory(name: "Colors", models: model)
|
||||
|
@ -39,8 +37,7 @@ final class CategoriesTest: XCTestCase {
|
|||
CatalogDisplayView<TypographyView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: TypographyView.Model(font: .boldSystemFont(ofSize: 25))
|
||||
model: TypographyView.Model(font: .boldSystemFont(ofSize: 25))
|
||||
)
|
||||
]
|
||||
let category = FontCategory(name: "Texts", models: model)
|
||||
|
@ -52,8 +49,7 @@ final class CategoriesTest: XCTestCase {
|
|||
CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
)
|
||||
]
|
||||
let category = ComponentCategory<CatalogDemoView>(name: "Catalog Component", models: model)
|
||||
|
|
|
@ -45,13 +45,11 @@ private extension GenericCollectionViewControllerTest {
|
|||
CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
), CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title2",
|
||||
detail: "detail2",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
)
|
||||
]
|
||||
|
||||
|
|
|
@ -42,13 +42,11 @@ private extension GenericTableViewControllerTest {
|
|||
CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title1",
|
||||
detail: "detail1",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
), CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: "title2",
|
||||
detail: "detail2",
|
||||
displayViewAxis: .horizontal,
|
||||
displayViewModel: CatalogDemoModel()
|
||||
model: CatalogDemoModel()
|
||||
)
|
||||
]
|
||||
|
||||
|
|
|
@ -13,9 +13,8 @@ final class CatalogDisplayViewTest: XCTestCase {
|
|||
let catalogDemoModel = CatalogDemoModel()
|
||||
let model = CatalogDisplayView<CatalogDemoView>.Model(
|
||||
title: nil,
|
||||
detail: nil,
|
||||
displayViewAxis: .vertical,
|
||||
displayViewModel: catalogDemoModel
|
||||
axis: .vertical,
|
||||
model: catalogDemoModel
|
||||
)
|
||||
|
||||
XCTAssertFalse(sut.displayView.isPopulated)
|
||||
|
|
Loading…
Reference in New Issue