Improve code style

Author: ilia3546

Example/Source/AppDelegate.swift

@@ -13,7 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    ) -> Bool {
         let vc = ViewController()
         let navVc = UINavigationController(rootViewController: vc)
         self.window = UIWindow(frame: UIScreen.main.bounds)

Example/Source/ViewController.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 DIGITAL RETAIL TECHNOLOGIES, S.L. All rights reserved.
 //
 
-import UIKit
 import Fastis
+import UIKit
 
 class ViewController: UIViewController {
 
@@ -98,7 +98,8 @@ class ViewController: UIViewController {
 
     // MARK: - Actions
 
-    @objc private func chooseRange() {
+    @objc
+    private func chooseRange() {
         let fastisController = FastisController(mode: .range)
         fastisController.title = "Choose range"
         fastisController.initialValue = self.currentValue as? FastisRange
@@ -112,7 +113,8 @@ class ViewController: UIViewController {
         fastisController.present(above: self)
     }
 
-    @objc private func chooseSingleDate() {
+    @objc
+    private func chooseSingleDate() {
         let fastisController = FastisController(mode: .single)
         fastisController.title = "Choose date"
         fastisController.initialValue = self.currentValue as? Date

Sources/Extensions/Calendar+LastWeekday.swift

@@ -1,13 +1,13 @@
 //
 //  File.swift
-//  
+//
 //
 //  Created by Ilya Kharlamov on 9/12/22.
 //
 
 import Foundation
 
-internal extension Calendar {
+extension Calendar {
     var lastWeekday: Int {
         let numDays = self.weekdaySymbols.count
         let res = (self.firstWeekday + numDays - 1) % numDays

Sources/Extensions/Date+Utilities.swift

@@ -8,30 +8,30 @@
 
 import Foundation
 
-internal extension Date {
+extension Date {
 
     func startOfMonth(in calendar: Calendar = .current) -> Date {
-        return calendar.date(from: calendar.dateComponents([.year, .month], from: calendar.startOfDay(for: self)))!.startOfDay(in: calendar)
+        calendar.date(from: calendar.dateComponents([.year, .month], from: calendar.startOfDay(for: self)))!.startOfDay(in: calendar)
     }
 
     func endOfMonth(in calendar: Calendar = .current) -> Date {
-        return calendar.date(byAdding: DateComponents(month: 1, day: -1), to: self.startOfMonth(in: calendar))!.endOfDay(in: calendar)
+        calendar.date(byAdding: DateComponents(month: 1, day: -1), to: self.startOfMonth(in: calendar))!.endOfDay(in: calendar)
     }
 
     func isInSameDay(in calendar: Calendar = .current, date: Date) -> Bool {
-        return calendar.isDate(self, equalTo: date, toGranularity: .day)
+        calendar.isDate(self, equalTo: date, toGranularity: .day)
     }
 
     func isInSameMonth(in calendar: Calendar = .current, date: Date) -> Bool {
-        return calendar.component(.month, from: self) == calendar.component(.month, from: date)
+        calendar.component(.month, from: self) == calendar.component(.month, from: date)
     }
 
     func startOfDay(in calendar: Calendar = .current) -> Date {
-        return calendar.date(bySettingHour: 0, minute: 0, second: 0, of: self)!
+        calendar.date(bySettingHour: 0, minute: 0, second: 0, of: self)!
     }
 
     func endOfDay(in calendar: Calendar = .current) -> Date {
-        return calendar.date(bySettingHour: 23, minute: 59, second: 59, of: self)!
+        calendar.date(bySettingHour: 23, minute: 59, second: 59, of: self)!
     }
 
 }

Sources/Extensions/String+CapitalizeFirstLetter.swift

@@ -8,10 +8,10 @@
 
 import Foundation
 
-internal extension String {
+extension String {
 
     func capitalizingFirstLetter() -> String {
-        return prefix(1).capitalized + dropFirst()
+        prefix(1).capitalized + dropFirst()
     }
 
     mutating func capitalizeFirstLetter() {

Sources/Models/Config.swift

@@ -13,14 +13,14 @@ public struct FastisConfig {
 
     /**
      The default configuration.
-     
+
      Fastis can be customized global or local.
-     
+
      Modify this variable to customize all Fastis controllers in your app:
      ```swift
      FastisConfig.default.monthHeader.labelColor = .red
      ```
-     
+
      Or you can copy and modify this config for some special controller:
      ```swift
      let config: FastisConfig = .default
@@ -30,11 +30,11 @@ public struct FastisConfig {
      */
     public static var `default` = FastisConfig()
 
-    private init() {}
+    private init() { }
 
     /**
      Base calendar used to build a view
-     
+
      Default value — `.current`
      */
     public var calendar: Calendar = .current

Sources/Models/Shortcut.swift

@@ -29,7 +29,7 @@ import Foundation
  */
 public struct FastisShortcut<Value: FastisValue>: Hashable {
 
-    private var id: UUID = UUID()
+    private var id = UUID()
 
     /// Display name of shortcut
     public var name: String
@@ -51,7 +51,7 @@ public struct FastisShortcut<Value: FastisValue>: Hashable {
     }
 
     public static func == (lhs: FastisShortcut<Value>, rhs: FastisShortcut<Value>) -> Bool {
-        return lhs.id == rhs.id
+        lhs.id == rhs.id
     }
 
     internal func isEqual(to value: Value) -> Bool {
@@ -65,28 +65,28 @@ public struct FastisShortcut<Value: FastisValue>: Hashable {
 
 }
 
-extension FastisShortcut where Value == FastisRange {
+public extension FastisShortcut where Value == FastisRange {
 
     /// Range: from **`now.startOfDay`** to **`now.endOfDay`**
-    public static var today: FastisShortcut {
-        return FastisShortcut(name: "Today") {
+    static var today: FastisShortcut {
+        FastisShortcut(name: "Today") {
             let now = Date()
             return FastisRange(from: now.startOfDay(), to: now.endOfDay())
         }
     }
 
     /// Range: from **`now.startOfDay - 7 days`** to **`now.endOfDay`**
-    public static var lastWeek: FastisShortcut {
-        return FastisShortcut(name: "Last week") {
+    static var lastWeek: FastisShortcut {
+        FastisShortcut(name: "Last week") {
             let now = Date()
             let weekAgo = Calendar.current.date(byAdding: .day, value: -7, to: now)!
             return FastisRange(from: weekAgo.startOfDay(), to: now.endOfDay())
         }
     }
 
     /// Range: from **`now.startOfDay - 1 month`** to **`now.endOfDay`**
-    public static var lastMonth: FastisShortcut {
-        return FastisShortcut(name: "Last month") {
+    static var lastMonth: FastisShortcut {
+        FastisShortcut(name: "Last month") {
             let now = Date()
             let monthAgo = Calendar.current.date(byAdding: .month, value: -1, to: now)!
             return FastisRange(from: monthAgo.startOfDay(), to: now.endOfDay())
@@ -95,26 +95,26 @@ extension FastisShortcut where Value == FastisRange {
 
 }
 
-extension FastisShortcut where Value == Date {
+public extension FastisShortcut where Value == Date {
 
     /// Date value: **`now`**
-    public static var today: FastisShortcut {
-        return FastisShortcut(name: "Today") {
-            return Date()
+    static var today: FastisShortcut {
+        FastisShortcut(name: "Today") {
+            Date()
         }
     }
 
     /// Date value: **`now - .day(1)`**
-    public static var yesterday: FastisShortcut {
-        return FastisShortcut(name: "Yesterday") {
-            return Calendar.current.date(byAdding: .day, value: -1, to: Date())!
+    static var yesterday: FastisShortcut {
+        FastisShortcut(name: "Yesterday") {
+            Calendar.current.date(byAdding: .day, value: -1, to: Date())!
         }
     }
 
     /// Date value: **`now + .day(1)`**
-    public static var tomorrow: FastisShortcut {
-        return FastisShortcut(name: "Tomorrow") {
-            return Calendar.current.date(byAdding: .day, value: 1, to: Date())!
+    static var tomorrow: FastisShortcut {
+        FastisShortcut(name: "Tomorrow") {
+            Calendar.current.date(byAdding: .day, value: 1, to: Date())!
         }
     }
 

Sources/Models/Value.swift

@@ -46,15 +46,15 @@ public struct FastisRange: FastisValue, Hashable {
     }
 
     public static func from(_ fromDate: Date, to toDate: Date) -> FastisRange {
-        return FastisRange(from: fromDate, to: toDate)
+        FastisRange(from: fromDate, to: toDate)
     }
 
     public var onSameDay: Bool {
-        return self.fromDate.isInSameDay(date: self.toDate)
+        self.fromDate.isInSameDay(date: self.toDate)
     }
 
     public func outOfRange(minDate: Date?, maxDate: Date?) -> Bool {
-        return self.fromDate < minDate ?? self.fromDate || self.toDate > maxDate ?? self.toDate
+        self.fromDate < minDate ?? self.fromDate || self.toDate > maxDate ?? self.toDate
     }
 
 }
@@ -73,7 +73,7 @@ extension Date: FastisValue {
     public static var mode: FastisMode = .single
 
     public func outOfRange(minDate: Date?, maxDate: Date?) -> Bool {
-        return self < minDate ?? self || self > maxDate ?? self
+        self < minDate ?? self || self > maxDate ?? self
     }
 
 }