From d039a0a64ab1aaab8084b148b4c2d4dd11d2835e Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 2 Apr 2020 10:09:32 -0400 Subject: [PATCH] matching --- .../Atoms/Views/CarouselIndicator/BarsIndicatorView.swift | 2 -- .../Atoms/Views/CarouselIndicator/CarouselIndicator.swift | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift index 8625bfb1..0435e84d 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift @@ -22,7 +22,6 @@ open class BarsIndicatorView: CarouselIndicator { stackView.alignment = .bottom stackView.distribution = .equalSpacing stackView.spacing = 6 - stackView.heightAnchor.constraint(lessThanOrEqualToConstant: BarsIndicatorView.indicatorBarHeight.selected).isActive = true return stackView }() @@ -89,7 +88,6 @@ open class BarsIndicatorView: CarouselIndicator { NSLayoutConstraint.activate([ stackView.heightAnchor.constraint(equalToConstant: 4), heightAnchor.constraint(equalTo: stackView.heightAnchor), - stackView.centerXAnchor.constraint(equalTo: centerXAnchor), stackView.leadingAnchor.constraint(equalTo: leadingAnchor), stackView.topAnchor.constraint(equalTo: topAnchor), bottomAnchor.constraint(equalTo: stackView.bottomAnchor), diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift index df00c998..ccce0266 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift @@ -49,13 +49,14 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol { carouselIndicatorModel?.currentIndex = newIndex previousIndex = _currentIndex _currentIndex = newIndex - performAction() + if previousIndex != newIndex { updateUI(previousIndex: previousIndex, newIndex: newIndex, totalCount: numberOfPages, isAnimated: carouselIndicatorModel?.isAnimated ?? true) + performAction() } } } @@ -72,7 +73,7 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol { carouselIndicatorModel?.numberOfPages = newTotal _numberOfPages = newTotal - isHidden = carouselIndicatorModel?.hidesForSinglePage ?? false && newTotal <= 1 + isHidden = (carouselIndicatorModel?.hidesForSinglePage ?? false) && newTotal <= 1 updateUI(previousIndex: previousIndex, newIndex: currentIndex, totalCount: newTotal,