Darkmode

CardParts/Assets/icons.xcassets/arrowdown.imageset/Contents.json

@@ -12,7 +12,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

CardParts/src/Classes/Card Parts/CardPartAttributedTextView.swift

@@ -172,7 +172,8 @@ public class CardPartAttributedTextView: UIView, CardPartView {
         textView.translatesAutoresizingMaskIntoConstraints = false
         textView.textContainer.lineBreakMode = NSLineBreakMode.byWordWrapping
         textView.isScrollEnabled = false
-        textView.textColor = textColor
+        textView.text = text
+        textView.backgroundColor = CardParts.theme.attributedTextBackgroundColor
         textView.isEditable = false
         self.textView.isSelectable = textView.isSelectable
         self.isEditable = textView.isEditable
@@ -185,6 +186,7 @@ public class CardPartAttributedTextView: UIView, CardPartView {
 
         addSubview(textView)
         setDefaultsForType(type)
+        setNeedsUpdateConstraints()
     }
 
     required public init?(coder: NSCoder) {

CardParts/src/Classes/Card Parts/CardPartBarView.swift

@@ -22,14 +22,12 @@ public class CardPartBarView: UIView, CardPartView {
 
         backgroundLayer = CALayer()
         backgroundLayer.anchorPoint = .zero
-        backgroundLayer.backgroundColor = CardParts.theme.barBackgroundColor.cgColor
 
         barLayer = CALayer()
         barLayer.anchorPoint = .zero
 
         verticalLine = CALayer()
         verticalLine.anchorPoint = .zero
-        verticalLine.backgroundColor = CardParts.theme.todayLineColor.cgColor
 
         self.layer.addSublayer(backgroundLayer)
         self.layer.addSublayer(barLayer)
@@ -78,24 +76,29 @@ public class CardPartBarView: UIView, CardPartView {
     override public var intrinsicContentSize: CGSize {
         return CGSize(width: UIView.noIntrinsicMetric, height: 18.0)
     }
+    public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        updateBarLayer()
+    }
 
     fileprivate func updateBarLayer() {
 
         let desiredHeight = self.barHeight ?? CGFloat(0.75 * self.bounds.height)
 
         let bounds = CGRect(x: 0, y: 0, width: CGFloat(percent) * self.bounds.width , height: desiredHeight)
         barLayer.bounds = bounds
-        barLayer.backgroundColor = barColor.cgColor
+        barLayer.backgroundColor = barColor.cgColor(with: traitCollection)
         if CardParts.theme.roundedCorners {
             barLayer.cornerRadius = bounds.height / 2
         }
 
         let backgroundBounds = CGRect(x: 0, y: 0, width: self.bounds.width , height: desiredHeight)
         backgroundLayer.bounds = backgroundBounds
+        backgroundLayer.backgroundColor = CardParts.theme.barBackgroundColor.cgColor(with: traitCollection)
         if CardParts.theme.roundedCorners {
             backgroundLayer.cornerRadius = bounds.height / 2
         }
 
+        verticalLine.backgroundColor = CardParts.theme.todayLineColor.cgColor(with: traitCollection)
         if CardParts.theme.showTodayLine {
             let verticalLineBounds = CGRect(x: 0, y: 0, width: 1.0 , height: self.bounds.height)
             verticalLine.bounds = verticalLineBounds

CardParts/src/Classes/Card Parts/CardPartCollectionViewCardPartsCell.swift

@@ -12,6 +12,12 @@ open class CardPartCollectionViewCardPartsCell : UICollectionViewCell {
     private var rightTopConstraint: NSLayoutConstraint!
     private var leftTopConstraint: NSLayoutConstraint!
 
+    public var borderColor = UIColor.SystemGray6 {
+        didSet {
+            layer.borderColor = borderColor.cgColor
+        }
+    }
+
     private var cardParts:[CardPartView] = []
 
     override public init(frame: CGRect) {
@@ -28,6 +34,10 @@ open class CardPartCollectionViewCardPartsCell : UICollectionViewCell {
     public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        layer.borderColor = borderColor.cgColor(with: traitCollection)
+    }
 
     public func setupCardParts(_ cardParts:[CardPartView]) {
 

CardParts/src/Classes/Card Parts/CardPartConfettiView.swift

@@ -27,7 +27,7 @@ public enum ConfettiType {
 public class CardPartConfettiView: UIView, CardPartView {
 
     public var margins: UIEdgeInsets = CardParts.theme.cardPartMargins
-    public var colors:[UIColor] = [ UIColor.red, UIColor.green, UIColor.blue ]
+    public var colors:[UIColor] = [ UIColor.SystemRed, UIColor.SystemGreen, UIColor.SystemBlue ]
     public var type:ConfettiType = .star
     /// default : 0.5 value ranges from 0 - 1(being very slow)
     public var intensity:Float = 0.5

CardParts/src/Classes/Card Parts/CardPartPagedView.swift

@@ -52,8 +52,8 @@ public class CardPartPagedView: UIView, CardPartView {
 
 		pageControl = UIPageControl(frame: .zero)
 		pageControl.translatesAutoresizingMaskIntoConstraints = false
-		pageControl.pageIndicatorTintColor = UIColor.lightGray
-		pageControl.currentPageIndicatorTintColor = UIColor.darkGray
+		pageControl.pageIndicatorTintColor = UIColor.SystemFill
+		pageControl.currentPageIndicatorTintColor = UIColor.SystemGray
 
 		currentPage = 0
 

CardParts/src/Classes/Card Parts/CardPartProgressBarView.swift

@@ -170,18 +170,16 @@ public class CardPartProgressBarView: UIView, CardPartView {
         }
     }
 
-    public var bgColor: UIColor = UIColor.white {
+    public var bgColor: UIColor = .clear {
         didSet {
             addMarker(marker: customMarker)
             layoutSubviews()
         }
     }
 
-    public var markerColor: UIColor? = UIColor.Black {
+    public var markerColor: UIColor = UIColor.Label {
         didSet {
-            if markerColor != nil {
-                layout()
-            }
+            layout()
         }
     }
 
@@ -315,14 +313,12 @@ public class CardPartProgressBarView: UIView, CardPartView {
 
 
     fileprivate func addMarker(marker: UIView?) {
-        let color: UIColor = UIColor.black
-
         if let marker = marker {
             self.markerView.addSubview(marker)
         } else {
             let triangleView = CardPartTriangleView(frame: CGRect(x: 0, y: 0, width: markerHeight, height: markerHeight))
-            triangleView.fillColor = color
-            triangleView.backgroundColor = .white
+            triangleView.fillColor = markerColor
+            triangleView.backgroundColor = bgColor
             self.markerView.addSubview(triangleView)
         }
         layoutSubviews()

CardParts/src/Classes/Card Parts/CardPartRadioButton.swift

@@ -17,13 +17,13 @@ public class CardPartRadioButton: UIButton, CardPartView  {
     var outerCircleLayer = CAShapeLayer()
     var innerCircleLayer = CAShapeLayer()
 
-    public var outerCircleColor:UIColor = .blue {
+    public var outerCircleColor:UIColor = .SystemBlue {
         didSet{
-            outerCircleLayer.strokeColor = outerCircleColor.cgColor
+            outerCircleLayer.strokeColor = outerCircleColor.cgColor(with: traitCollection)
         }
     }
 
-    public var innerCircleColor:UIColor = .blue {
+    public var innerCircleColor:UIColor = .SystemBlue {
         didSet {
             setFillState()
         }
@@ -85,10 +85,15 @@ public class CardPartRadioButton: UIButton, CardPartView  {
         super.layoutSubviews()
         setCircleLayouts()
     }
+
+    public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        outerCircleLayer.strokeColor = outerCircleColor.cgColor(with: traitCollection)
+        setFillState()
+    }
 
     /// fills the color inside the button based the selected state.
     private func setFillState() {
-        innerCircleLayer.fillColor = self.isSelected ? outerCircleColor.cgColor : UIColor.clear.cgColor
+        innerCircleLayer.fillColor = self.isSelected ? outerCircleColor.cgColor(with: traitCollection) : UIColor.clear.cgColor
     }
 
     /// configures outer/inner circle frame,line widt and path

CardParts/src/Classes/Card Parts/CardPartTableView.swift

@@ -56,7 +56,7 @@ public class CardPartTableView : UIView, CardPartView, UITableViewDelegate {
 		tableView.translatesAutoresizingMaskIntoConstraints = false
 		tableView.register(CardPartTableViewCell.self, forCellReuseIdentifier: kDefaultCellId)
 		tableView.isScrollEnabled = false
-        tableView.separatorColor = UIColor.turboSeperatorColor
+        tableView.separatorColor = CardParts.theme.separatorColor
 		tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.size.width, height: 1))
 
 		super.init(frame: CGRect.zero)

CardParts/src/Classes/Card Parts/CardPartTableViewCell.swift

@@ -65,17 +65,17 @@ public class CardPartTableViewCell : UITableViewCell {
 
 	public var displayAsHidden: Bool = false {
 		didSet {
-			leftTitleLabel.textColor = displayAsHidden ? UIColor.Gray2 : leftTitleColor
-			rightTitleLabel.textColor = displayAsHidden ? UIColor.Gray2 : rightTitleColor
-			leftDescriptionLabel.textColor = displayAsHidden ? UIColor.Gray2 : leftDescriptionColor
-			rightDescriptionLabel.textColor = displayAsHidden ? UIColor.Gray2 : rightDescriptionColor
+			leftTitleLabel.textColor = displayAsHidden ? UIColor.SystemGray2 : leftTitleColor
+			rightTitleLabel.textColor = displayAsHidden ? UIColor.SystemGray2 : rightTitleColor
+			leftDescriptionLabel.textColor = displayAsHidden ? UIColor.SystemGray2 : leftDescriptionColor
+			rightDescriptionLabel.textColor = displayAsHidden ? UIColor.SystemGray2 : rightDescriptionColor
 
 			leftTitleLabel.alpha = displayAsHidden ? 0.6 : 1.0
 			rightTitleLabel.alpha = displayAsHidden ? 0.6 : 1.0
 			leftDescriptionLabel.alpha = displayAsHidden ? 0.6 : 1.0
 			rightDescriptionLabel.alpha = displayAsHidden ? 0.6 : 1.0
 
-			backgroundColor = displayAsHidden ? UIColor.Gray6 : UIColor.white
+            backgroundColor = displayAsHidden ? UIColor.SystemGray6 : CardParts.theme.cardBackgroundColor
 		}
 	}
 
@@ -121,6 +121,7 @@ public class CardPartTableViewCell : UITableViewCell {
 
 		separatorInset = UIEdgeInsets.init(top: 0, left: 0, bottom: 0, right: 0)
 
+        backgroundColor = CardParts.theme.cardBackgroundColor
 
 		for subview in contentView.subviews {
 			subview.removeFromSuperview()

CardParts/src/Classes/Card Parts/CardPartTriangleView.swift

@@ -11,7 +11,7 @@ class CardPartTriangleView: UIView,CardPartView {
 
     var margins: UIEdgeInsets = CardParts.theme.cardPartMargins
 
-    var fillColor: UIColor = UIColor.white
+    var fillColor: UIColor = .Label
 
     override init(frame: CGRect) {
         super.init(frame: frame)

CardParts/src/Classes/CardCell.swift

@@ -16,6 +16,17 @@ open class CardCell : UICollectionViewCell {
 
     private var currentSize = CGSize.zero
     private var gradientLayer = CAGradientLayer()
+
+    private var borderColor = CardParts.theme.cardBorderColor {
+        didSet {
+            contentView.layer.borderColor = borderColor.cgColor(with: traitCollection)
+        }
+    }
+    private var shadowColor = CardParts.theme.cardShadowColor {
+        didSet {
+            contentView.layer.shadowColor = shadowColor.cgColor(with: traitCollection)
+        }
+    }
 
     override init(frame: CGRect) {
 
@@ -26,18 +37,17 @@ open class CardCell : UICollectionViewCell {
 
         contentView.translatesAutoresizingMaskIntoConstraints = false
 
-        contentView.backgroundColor = UIColor.white
-        contentView.layer.borderColor = UIColor.Gray7.cgColor
+        contentView.backgroundColor = CardParts.theme.cardBackgroundColor
+        contentView.layer.borderColor = borderColor.cgColor(with: traitCollection)
         contentView.layer.borderWidth = 0.5
         if CardParts.theme.cardShadow {
-            contentView.layer.shadowColor = UIColor.Gray7.cgColor
+            contentView.layer.shadowColor = shadowColor.cgColor(with: traitCollection)
             contentView.layer.shadowOffset = CGSize(width: 0, height: 1)
             contentView.layer.shadowRadius = 1.0
             contentView.layer.shadowOpacity = 0.9
         }
 
         contentView.addSubview(cardContentView)
-        contentView.backgroundColor = UIColor.white
 
         contentView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[cardContentView]|",
                                                                   options: [],
@@ -111,6 +121,11 @@ open class CardCell : UICollectionViewCell {
         return layoutAttributes
     }
 
+    open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        contentView.layer.borderColor = borderColor.cgColor(with: traitCollection)
+        contentView.layer.shadowColor = shadowColor.cgColor(with: traitCollection)
+    }
+
     func requiresNoTopBottomMargins(_ noTopBottomMargins: Bool) {
 
         contentView.removeConstraints(topBottomMarginConstraints)
@@ -135,27 +150,27 @@ open class CardCell : UICollectionViewCell {
     func requiresTransparentCard(transparentCard: Bool) {
         if transparentCard {
             contentView.backgroundColor = UIColor.clear
-            contentView.layer.borderColor = UIColor.clear.cgColor
+            self.borderColor = UIColor.clear
             contentView.layer.borderWidth = 0.0
-            contentView.layer.shadowColor = UIColor.clear.cgColor
+            self.shadowColor = UIColor.clear
             contentView.layer.shadowOffset = CGSize.zero
             contentView.layer.shadowRadius = 0.0
             contentView.layer.shadowOpacity = 0.0
         } else {
-            contentView.backgroundColor = UIColor.white
-            contentView.layer.borderColor = UIColor.Gray7.cgColor
+            contentView.backgroundColor = CardParts.theme.cardBackgroundColor
+            contentView.layer.borderColor = borderColor.cgColor(with: traitCollection)
             contentView.layer.borderWidth = 0.5
             if CardParts.theme.cardShadow {
-                contentView.layer.shadowColor = UIColor.Gray7.cgColor
+                contentView.layer.shadowColor = shadowColor.cgColor(with: traitCollection)
                 contentView.layer.shadowOffset = CGSize(width: 0, height: 1)
                 contentView.layer.shadowRadius = 1.0
                 contentView.layer.shadowOpacity = 0.9
             }
         }
     }
 
-    func addShadowToCard(shadowRadius: CGFloat = 8.0, shadowOpacity: Float = 0.7, shadowColor: CGColor = UIColor.Gray2.cgColor, shadowOffset: CGSize = CGSize(width: 0, height: 5)) {
-        contentView.layer.shadowColor = shadowColor
+    func addShadowToCard(shadowRadius: CGFloat = 8.0, shadowOpacity: Float = 0.7, shadowColor: UIColor = UIColor.Gray2, shadowOffset: CGSize = CGSize(width: 0, height: 5)) {
+        self.shadowColor = shadowColor
         contentView.layer.shadowOffset = shadowOffset
         contentView.layer.shadowRadius = shadowRadius
         contentView.layer.shadowOpacity = shadowOpacity
@@ -166,9 +181,9 @@ open class CardCell : UICollectionViewCell {
         gradientLayer.cornerRadius = radius
     }
 
-    func addBorderToCard(borderWidth: CGFloat = 0.5, borderColor: CGColor = UIColor.Gray7.cgColor) {
+    func addBorderToCard(borderWidth: CGFloat = 0.5, borderColor: UIColor = UIColor.SystemGray6) {
+        self.borderColor = borderColor
         contentView.layer.borderWidth = borderWidth
-        contentView.layer.borderColor = borderColor
     }
 
     func addLongGestureRecognizer(minimumPressDuration: CFTimeInterval, delegate: CardPartsLongPressGestureRecognizerDelegate) {

CardParts/src/Classes/CardController.swift

@@ -62,15 +62,15 @@ public protocol HiddenCardTrait {
 }
 
 public protocol ShadowCardTrait {
-    func shadowColor() -> CGColor
+    func shadowColor() -> UIColor
     func shadowRadius() -> CGFloat
     func shadowOpacity() -> Float
     func shadowOffset() -> CGSize
 }
 
 extension ShadowCardTrait {
-    func shadowColor() -> CGColor {
-        return UIColor.Gray2.cgColor
+    func shadowColor() -> UIColor {
+        return UIColor.Gray2
     }
 
     func shadowRadius() -> CGFloat {
@@ -111,7 +111,7 @@ extension CardPartsLongPressGestureRecognizerDelegate {
 
 public protocol BorderCardTrait {
     func borderWidth() -> CGFloat
-    func borderColor() -> CGColor
+    func borderColor() -> UIColor
 }
 
 extension BorderCardTrait {
@@ -120,8 +120,8 @@ extension BorderCardTrait {
         return 0.5
     }
 
-    func borderColor() -> CGColor {
-        return UIColor.Gray7.cgColor
+    func borderColor() -> UIColor {
+        return UIColor.Gray7
     }
 }
 

CardParts/src/Classes/CardParts.swift

@@ -8,5 +8,5 @@
 import Foundation
 
 public class CardParts {
-    public static var theme: CardPartsTheme = CardPartsTurboTheme()
+    public static var theme: CardPartsTheme = CardPartsSystemTheme()
 }

CardParts/src/Classes/CardPartsFullScreenViewController.swift

@@ -13,7 +13,7 @@ open class CardPartsFullScreenViewController: CardPartsViewController {
 	open override func viewDidLoad() {
 		super.viewDidLoad()
 
-		view.backgroundColor = UIColor.white
+        view.backgroundColor = CardParts.theme.backgroundColor
 	}
 
 }