Update 1.2.1

- change enum name from buttonStyle to DayButtonStyle
- delete unused code in NormalCalendar.swift
- update README

Author: DevYeom

README.md

@@ -37,20 +37,22 @@ calendar.show()
 You can set calendar style properties (color, font, ...)
 
 ```swift
-calendar.dimmedBackgroundColor: UIColor = UIColor.black
-calendar.dimmedBackgroundAlpha: CGFloat = 0.5
-calendar.headerViewBackgroundColor: UIColor = Useful.getUIColor(245, 245, 245)
-calendar.bodyViewBackgroundColor: UIColor = Useful.getUIColor(255, 255, 255)
-calendar.sundayColor: UIColor = Useful.getUIColor(235, 61, 79)
-calendar.disabledSundayColor: UIColor = Useful.getUIColor(251, 197, 202)
-calendar.saturdayColor: UIColor = Useful.getUIColor(53, 113, 214)
-calendar.disabledSaturdayColor: UIColor = Useful.getUIColor(194, 212, 243)
-calendar.defaultDayColor: UIColor = Useful.getUIColor(51, 51, 51)
-calendar.disabledDefaultDayColor: UIColor = Useful.getUIColor(193, 193, 193)
-calendar.lineSeparatorColor: UIColor = Useful.getUIColor(233, 233, 233)
-calendar.headerLabelFont: UIFont = UIFont.systemFont(ofSize: 24)
-calendar.weekLabelFont: UIFont = UIFont.systemFont(ofSize: 16)
-calendar.dayLabelFont: UIFont = UIFont.systemFont(ofSize: 19)
+calendar.dayButtonStyle = DayButtonStyle (.roundishSquare, .square, .circle)
+calendar.dimmedBackgroundColor = UIColor
+calendar.dimmedBackgroundAlpha = CGFloat
+calendar.headerViewBackgroundColor = UIColor
+calendar.bodyViewBackgroundColor = UIColor
+calendar.sundayColor = UIColor
+calendar.disabledSundayColor = UIColor
+calendar.saturdayColor = UIColor
+calendar.disabledSaturdayColor = UIColor
+calendar.defaultDayColor = UIColor
+calendar.disabledDefaultDayColor = UIColor
+calendar.lineSeparatorColor = UIColor
+calendar.selectedDayColor = UIColor
+calendar.headerLabelFont = UIFont
+calendar.weekLabelFont = UIFont
+calendar.dayLabelFont = UIFont
 ```
 
 ## Calendar Type

YYCalendar.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
 	s.name             = 'YYCalendar'
-	s.version          = '1.2.0'
+	s.version          = '1.2.1'
 	s.swift_version    = '5.0'
 	s.summary          = 'Very Simple and Useful Calendar'
 

YYCalendar/Classes/Components/DayButton.swift

@@ -13,12 +13,12 @@ class DayButton: UIButton {
     var selectedDayColor: UIColor = Useful.getUIColor(55, 137, 220)
     var beforeTextColor: UIColor = Useful.getUIColor(51, 51, 51)
     var todayIconImageView: UIImageView!
-    var buttonStyle: ButtonStyle = .roundishSquare
+    var dayButtonStyle: DayButtonStyle = .roundishSquare
 
-    // To set the buttonStyle
+    // To set the dayButtonStyle
     override var bounds: CGRect {
         didSet {
-            switch buttonStyle {
+            switch dayButtonStyle {
             case .roundishSquare:
                 self.layer.cornerRadius = 10
             case .square:
@@ -29,13 +29,13 @@ class DayButton: UIButton {
         }
     }
 
-    init(style: ButtonStyle) {
+    init(style: DayButtonStyle) {
         super.init(frame: CGRect.zero)
 
         setupTodayIcon()
         setupAutoLayout()
 
-        self.buttonStyle = style
+        self.dayButtonStyle = style
         self.todayIconImageView.isHidden = true
     }
 

YYCalendar/Classes/Components/LimitedCalendar.swift

@@ -30,7 +30,7 @@ import UIKit
     var dayStackView: UIStackView!
 
     // MARK: - Calendar Style
-    var buttonStyle: ButtonStyle = .roundishSquare
+    var dayButtonStyle: DayButtonStyle = .roundishSquare
     var hideDuration: Double = 0.3
     var dimmedBackgroundColor: UIColor = UIColor.black
     var dimmedBackgroundAlpha: CGFloat = 0.5
@@ -310,7 +310,7 @@ import UIKit
             tempStackView.distribution = .fillEqually
 
             for column in 1...7 {
-                let tempButton = DayButton(style: buttonStyle)
+                let tempButton = DayButton(style: dayButtonStyle)
                 tempButton.translatesAutoresizingMaskIntoConstraints = false
                 tempButton.heightAnchor.constraint(equalTo: tempButton.widthAnchor).isActive = true
                 tempButton.titleLabel?.font = self.dayLabelFont

YYCalendar/Classes/Components/NormalCalendar.swift

@@ -30,7 +30,7 @@ import UIKit
     var dayStackView: UIStackView!
 
     // MARK: - Calendar Style
-    var buttonStyle: ButtonStyle = .roundishSquare
+    var dayButtonStyle: DayButtonStyle = .roundishSquare
     var hideDuration: Double = 0.3
     var dimmedBackgroundColor: UIColor = UIColor.black
     var dimmedBackgroundAlpha: CGFloat = 0.5
@@ -300,7 +300,7 @@ import UIKit
             tempStackView.distribution = .fillEqually
 
             for column in 1...7 {
-                let tempButton = DayButton(style: buttonStyle)
+                let tempButton = DayButton(style: dayButtonStyle)
                 tempButton.translatesAutoresizingMaskIntoConstraints = false
                 tempButton.heightAnchor.constraint(equalTo: tempButton.widthAnchor).isActive = true
                 tempButton.titleLabel?.font = self.dayLabelFont
@@ -482,29 +482,6 @@ import UIKit
         }
     }
 
-    // set dayButton's color
-    func setDayButtonStyle(button: DayButton, weekDay: Int, enabled: Bool) {
-        button.isEnabled = enabled
-
-        if enabled {
-            if weekDay == 1 { // Sunday
-                button.setTitleColor(self.sundayColor, for: .normal)
-            } else if weekDay == 7 { // Saturday
-                button.setTitleColor(self.saturdayColor, for: .normal)
-            } else { // Weekday
-                button.setTitleColor(self.defaultDayColor, for: .normal)
-            }
-        } else {
-            if weekDay == 1 { // Sunday
-                button.setTitleColor(self.disabledSundayColor, for: .normal)
-            } else if weekDay == 7 { // Saturday
-                button.setTitleColor(self.disabledSaturdayColor, for: .normal)
-            } else { // Weekday
-                button.setTitleColor(self.disabledDefaultDayColor, for: .normal)
-            }
-        }
-    }
-
     // MARK: - Click Event
     @objc func changeMonthOrYear(_ sender: UIButton) {
         switch sender.restorationIdentifier {

YYCalendar/Classes/Constants.swift

@@ -31,7 +31,7 @@ public enum LangType {
     case CHN
 }
 
-public enum ButtonStyle {
+public enum DayButtonStyle {
     case roundishSquare
     case square
     case circle

YYCalendar/Classes/YYCalendar.swift

@@ -36,15 +36,15 @@ import Foundation
     }
 
     // MARK: - Calendar Style Properties
-    public var buttonStyle: ButtonStyle = .roundishSquare {
+    public var dayButtonStyle: DayButtonStyle = .roundishSquare {
         didSet {
             weak var weakSelf = self
             if let weakSelf = weakSelf {
                 switch componentType {
                 case .normal:
-                    weakSelf.normalCalendar?.buttonStyle = buttonStyle
+                    weakSelf.normalCalendar?.dayButtonStyle = dayButtonStyle
                 case .limited:
-                    weakSelf.limitedCalendar?.buttonStyle = buttonStyle
+                    weakSelf.limitedCalendar?.dayButtonStyle = dayButtonStyle
                 }
             }
         }