Merge branch 'bugfix/tilelet' into 'develop'
fixed refactor bug ### Summary I had refactored the textWidth into use an enum to handle whether the value is a for a fixed value or a percentage. Co-authored-by: Matt Bruce <matt.bruce@verizon.com> See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/991
This commit is contained in:
commit
b1966a87ea
@ -37,8 +37,11 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{
|
|||||||
padding = viewModel.padding
|
padding = viewModel.padding
|
||||||
aspectRatio = viewModel.aspectRatio
|
aspectRatio = viewModel.aspectRatio
|
||||||
width = viewModel.width
|
width = viewModel.width
|
||||||
textWidth = viewModel.textWidth
|
if let value = viewModel.textWidth {
|
||||||
textPercentage = viewModel.textPercentage
|
textWidth = .value(value)
|
||||||
|
} else if let percentage = viewModel.textPercentage {
|
||||||
|
textWidth = .percentage(percentage)
|
||||||
|
}
|
||||||
titleModel = viewModel.titleModel(delegateObject: delegateObject, additionalData: additionalData)
|
titleModel = viewModel.titleModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||||
subTitleModel = viewModel.subTitleModel(delegateObject: delegateObject, additionalData: additionalData)
|
subTitleModel = viewModel.subTitleModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||||
badgeModel = viewModel.badge
|
badgeModel = viewModel.badge
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user