mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addressing layout issue

Browse Source
This commit is contained in:
Kevin G Christiano 2020-05-07 14:51:23 -04:00
parent 0501c2daae
commit ee107a25cf
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
View File

@ -98,18 +98,6 @@ open class BarsIndicatorView: CarouselIndicator {
]) ])
} }
open override func layoutSubviews() {
super.layoutSubviews()
if barReferences.isEmpty {
generateBars()
updateUI(previousIndex: previousIndex,
newIndex: currentIndex,
totalCount: numberOfPages,
isAnimated: false)
}
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Methods // MARK: - Methods
//-------------------------------------------------- //--------------------------------------------------
@ -154,6 +142,14 @@ open class BarsIndicatorView: CarouselIndicator {
guard let model = model as? BarsCarouselIndicatorModel else { return } guard let model = model as? BarsCarouselIndicatorModel else { return }
currentIndicatorColor = model.currentIndicatorColor.uiColor currentIndicatorColor = model.currentIndicatorColor.uiColor
if barReferences.isEmpty {
generateBars()
updateUI(previousIndex: previousIndex,
newIndex: currentIndex,
totalCount: numberOfPages,
isAnimated: false)
}
} }
//-------------------------------------------------- //--------------------------------------------------

22
MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
View File

@ -66,17 +66,6 @@ open class NumericIndicatorView: CarouselIndicator {
pageCount.updateView(size) pageCount.updateView(size)
} }
open override func layoutSubviews() {
super.layoutSubviews()
if pageCount.text?.isEmpty == nil {
updateUI(previousIndex: previousIndex,
newIndex: currentIndex,
totalCount: numberOfPages,
isAnimated: false)
}
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Setup // MARK: - Setup
//-------------------------------------------------- //--------------------------------------------------
@ -124,6 +113,17 @@ open class NumericIndicatorView: CarouselIndicator {
leftArrow.setNeedsDisplay() leftArrow.setNeedsDisplay()
} }
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
super.set(with: model, delegateObject, additionalData)
if pageCount.text?.isEmpty == nil {
updateUI(previousIndex: previousIndex,
newIndex: currentIndex,
totalCount: numberOfPages,
isAnimated: false)
}
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - IndicatorViewProtocol // MARK: - IndicatorViewProtocol
//-------------------------------------------------- //--------------------------------------------------