Merge branch 'master' of https://github.com/retailcrm/Fastis

Author: Wojciech Lembryk

Cartfile.resolved

@@ -1,3 +1,3 @@
 github "SnapKit/SnapKit" "5.0.1"
-github "ilia3546/PrettyCards" "1.0.3"
+github "ilia3546/PrettyCards" "1.0.4"
 github "patchthecode/JTAppleCalendar" "8.0.3"

Fastis.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Fastis'
-  s.version          = '1.0.7'
+  s.version          = '1.0.10'
   s.summary          = "Simple date picker created using JTAppleCalendar library"
   s.description      = <<-DESC
   Fastis is a fully customizable UI component for picking dates and ranges created using JTAppleCalendar library.

Package.swift

@@ -36,7 +36,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/patchthecode/JTAppleCalendar", from: "8.0.3"),
         .package(url: "https://github.com/SnapKit/SnapKit", from: "5.0.1"),
-        .package(url: "https://github.com/ilia3546/PrettyCards", from: "1.0.3")
+        .package(url: "https://github.com/ilia3546/PrettyCards", from: "1.0.4")
     ],
     targets: [
         .target(name: "Fastis",

Source/Views/CurrentValueView.swift

@@ -44,7 +44,7 @@ class CurrentValueView<Value: FastisValue>: UIView {
 
     private lazy var dateFormatter: DateFormatter = {
         let formatter = DateFormatter()
-        formatter.locale = .autoupdatingCurrent
+        formatter.locale = self.config.locale
         formatter.dateFormat = self.config.format
         return formatter
     }()
@@ -155,5 +155,6 @@ extension FastisConfig {
         public var clearButtonTintColor: UIColor = .darkGray
         public var insets: UIEdgeInsets = UIEdgeInsets(top: 8, left: 0, bottom: 24, right: 0)
         public var format: String = "d MMMM"
+        public var locale: Locale = .autoupdatingCurrent
     }
 }

Source/Views/WeekView.swift

@@ -26,7 +26,6 @@ class WeekView: UIView {
     // MARK: - Variables
 
     private let config: FastisConfig.WeekView
-    public var currentCalendar: Calendar = .current
 
     // MARK: - Lifecycle
 
@@ -50,7 +49,7 @@ class WeekView: UIView {
     }
 
     private func configureSubviews() {
-        var weekDays = self.currentCalendar.shortWeekdaySymbols
+        var weekDays = self.config.calendar.shortWeekdaySymbols
         weekDays.append(weekDays.remove(at: 0))
         for weekdaySimbol in weekDays {
             self.stackView.addArrangedSubview(self.makeWeekLabel(for: weekdaySimbol))
@@ -81,6 +80,7 @@ class WeekView: UIView {
 
 extension FastisConfig {
     public struct WeekView {
+        public var calendar: Calendar = .current
         public var backgroundColor: UIColor = .groupTableViewBackground
         public var textColor: UIColor = .darkGray
         public var textFont: UIFont = .systemFont(ofSize: 10, weight: .bold)