properly update appearance for badge elements

LinusGeffarth · Jan 1, 2019 · f6e1a9f · f6e1a9f
1 parent 722f517
commit f6e1a9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/LGSegmentedControl.podspec b/LGSegmentedControl.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'LGSegmentedControl'
-  s.version          = '1.2'
+  s.version          = '1.2.1'
   s.summary          = 'A prettier and highly customizable UISegmentedControl'
 
 # This description is used to generate tags and improve search results.

diff --git a/LGSegmentedControl/Classes/LGSegment.swift b/LGSegmentedControl/Classes/LGSegment.swift
@@ -111,7 +111,7 @@ class LGSegment {
         badgeLabel.topAnchor     .constraint(equalTo: badgeView.topAnchor,      constant: 0.5).isActive = true
         badgeLabel.bottomAnchor  .constraint(equalTo: badgeView.bottomAnchor,   constant:-0.5).isActive = true
 
-        badgeView.leadingAnchor  .constraint(equalTo: titleLabel.trailingAnchor, constant: 0).isActive = true
+        badgeView.leadingAnchor  .constraint(equalTo: titleLabel.trailingAnchor, constant: -2).isActive = true
         badgeView.bottomAnchor   .constraint(equalTo: titleLabel.topAnchor     , constant:  6).isActive = true
         let badgeViewSize: CGFloat = 16
         badgeView.heightAnchor   .constraint(greaterThanOrEqualToConstant: badgeViewSize).isActive = true
@@ -129,13 +129,16 @@ class LGSegment {
     func updateAppearance(with options: LGSegmentOptions, animated: Bool? = nil) {
         self.options = options
         UIView.animate(withDuration: animated ?? options.animateStateChange ? 0.1 : 0) {
-            // status-related
+            // status
             self.titleLabel.textColor = self.textColor
             self.backgroundView.backgroundColor = self.backgroundColor
+            // badge view
+            self.badgeView.isHidden = self.badgeCount == nil
+            self.badgeView.backgroundColor = options.badgeColor.background
+            self.badgeLabel.textColor = options.badgeColor.text
             // others
             self.backgroundView.layer.cornerRadius = options.cornerRadius
             self.titleLabel.font = options.font
-            self.badgeView.isHidden = self.badgeCount == nil
         }
         badgeLabel.text = badgeCount?.string ?? ""
     }