Rename ConstantValues to DefaultValues

Marxon13 · Jul 30, 2017 · 65be638 · 65be638
1 parent 6ba8903
commit 65be638
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/M13Checkbox/ConstantValues.swift b/M13Checkbox/ConstantValues.swift
@@ -14,12 +14,12 @@
 import Foundation
 
 // A set of default values used to initialize the object
-struct ConstantValues {
+struct DefaultValues {
 
-    static let defaultAnimation: M13Checkbox.Animation = .stroke
-    static let defaultMarkType: M13Checkbox.MarkType = .checkmark
-    static let defaultBoxType: M13Checkbox.BoxType = .circle
-    static let defaultCheckState: M13Checkbox.CheckState = .unchecked
-    static let defaultController: M13CheckboxController = M13CheckboxStrokeController()
+    static let animation: M13Checkbox.Animation = .stroke
+    static let markType: M13Checkbox.MarkType = .checkmark
+    static let boxType: M13Checkbox.BoxType = .circle
+    static let checkState: M13Checkbox.CheckState = .unchecked
+    static let controller: M13CheckboxController = M13CheckboxStrokeController()
 
 }
diff --git a/Sources/M13Checkbox+IB.swift b/Sources/M13Checkbox+IB.swift
@@ -24,7 +24,7 @@ public extension M13Checkbox {
             if let type = Animation(rawValue: newValue) {
                 stateChangeAnimation = type
             } else {
-                stateChangeAnimation = ConstantValues.defaultAnimation
+                stateChangeAnimation = DefaultValues.animation
             }
         }
     }
@@ -38,7 +38,7 @@ public extension M13Checkbox {
             if let type = MarkType(rawValue: newValue) {
                 markType = type
             } else {
-                markType = ConstantValues.defaultMarkType
+                markType = DefaultValues.markType
             }
         }
     }
@@ -52,7 +52,7 @@ public extension M13Checkbox {
             if let type = BoxType(rawValue: newValue) {
                 boxType = type
             } else {
-                boxType = ConstantValues.defaultBoxType
+                boxType = DefaultValues.boxType
             }
         }
     }
@@ -66,7 +66,7 @@ public extension M13Checkbox {
             if let temp = CheckState(rawValue: newValue) {
                 checkState = temp
             } else {
-                checkState = ConstantValues.defaultCheckState
+                checkState = DefaultValues.checkState
             }
         }
     }

diff --git a/Sources/M13Checkbox.swift b/Sources/M13Checkbox.swift
@@ -215,7 +215,7 @@ open class M13Checkbox: UIControl {
 
     /// The manager that manages display and animations of the checkbox.
     /// The default animation is a stroke.
-    fileprivate var controller: M13CheckboxController = ConstantValues.defaultController
+    fileprivate var controller: M13CheckboxController = DefaultValues.controller
 
     //----------------------------
     // MARK: - Initalization
@@ -238,7 +238,7 @@ open class M13Checkbox: UIControl {
             layer.addSublayer(aLayer)
         }
         controller.tintColor = tintColor
-        controller.resetLayersForState(ConstantValues.defaultCheckState)
+        controller.resetLayersForState(DefaultValues.checkState)
 
         let longPressGesture = M13CheckboxGestureRecognizer(target: self, action: #selector(M13Checkbox.handleLongPress(_:)))
         addGestureRecognizer(longPressGesture)
@@ -345,7 +345,7 @@ open class M13Checkbox: UIControl {
     }
 
     /// The type of animation to preform when changing from the unchecked state to any other state.
-    open var stateChangeAnimation: Animation = ConstantValues.defaultAnimation {
+    open var stateChangeAnimation: Animation = DefaultValues.animation {
         didSet {
 
             // Remove the sublayers

diff --git a/Sources/M13CheckboxController.swift b/Sources/M13CheckboxController.swift
@@ -26,7 +26,7 @@ internal class M13CheckboxController {
     var animationGenerator: M13CheckboxAnimationGenerator = M13CheckboxAnimationGenerator()
 
     /// The current state of the checkbox.
-    var state: M13Checkbox.CheckState = .unchecked
+    var state: M13Checkbox.CheckState = DefaultValues.checkState
 
     /// The current tint color.
     /// - Note: Subclasses should override didSet to update the layers when this value changes.
@@ -48,7 +48,7 @@ internal class M13CheckboxController {
     var enableMorphing: Bool = true
 
     // The type of mark to display.
-    var markType: M13Checkbox.MarkType = .checkmark {
+    var markType: M13Checkbox.MarkType = DefaultValues.markType {
         willSet {
             if markType == newValue {
                 return

diff --git a/Sources/Paths/M13CheckboxPathGenerator.swift b/Sources/Paths/M13CheckboxPathGenerator.swift
@@ -33,7 +33,7 @@ internal class M13CheckboxPathGenerator {
     var cornerRadius: CGFloat = 3.0
 
     /// The box type to create.
-    var boxType: M13Checkbox.BoxType = .circle
+    var boxType: M13Checkbox.BoxType = DefaultValues.boxType
 
     //----------------------------
     // MARK: - Box Paths