TouchInstinct
/
LeadKitAdditions
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from scoreyou/fix/someBugs 

DateFormatter fixed
This commit is contained in:
Nikolai Ashanin 2017-05-02 18:36:45 +03:00 committed by GitHub
parent 59dd7918cb 602a5eda27
commit a22d820c90
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LeadKitAdditions.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "LeadKitAdditions"
s.version = "0.0.9"
s.version = "0.0.10"
s.summary = "iOS framework with a bunch of tools for rapid development"
s.homepage = "https://github.com/NikAshanin/LeadKitAdditions"
s.license = "Apache License, Version 2.0"

28
LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift
View File

@ -34,35 +34,35 @@ open class BaseDateFormatter {
private static let apiFormatter: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.locale = usedLocale
dateFormatter.dateFormat = BaseDateFormatter.apiDateTimeFormat
dateFormatter.dateFormat = apiDateTimeFormat
return dateFormatter
}()
private static let apiDateWithoutTimeFormatter: DateFormatter = {
let dateFormatter = DateFormatter()
dateFormatter.locale = usedLocale
dateFormatter.dateFormat = BaseDateFormatter.apiDateWithoutTimeFormat
dateFormatter.dateFormat = apiDateWithoutTimeFormat
return dateFormatter
}()
private static let hourAndMinuteFormatter: DateFormatter = {
let dateFormater = DateFormatter()
dateFormater.locale = usedLocale
dateFormater.dateFormat = BaseDateFormatter.hourAndMinuteDateTimeFormat
dateFormater.dateFormat = hourAndMinuteDateTimeFormat
return dateFormater
}()
private static let dayAndMonthFormatter: DateFormatter = {
let dateFormater = DateFormatter()
dateFormater.locale = usedLocale
dateFormater.dateFormat = BaseDateFormatter.dayAndMonthDateTimeFormat
dateFormater.dateFormat = dayAndMonthDateTimeFormat
return dateFormater
}()
private static let dayMonthYearFormatter: DateFormatter = {
let dateFormater = DateFormatter()
dateFormater.locale = usedLocale
dateFormater.dateFormat = BaseDateFormatter.dayMonthYearDateTimeFormat
dateFormater.dateFormat = dayMonthYearDateTimeFormat
return dateFormater
}()
@ -73,23 +73,27 @@ open class BaseDateFormatter {
}
public static func backendDate(fromStrDate strDate: String) -> Date? {
return BaseDateFormatter.apiFormatter.date(from: strDate)
return apiFormatter.date(from: strDate)
}
public static func backendStrDate(withDate date: Date) -> String {
return BaseDateFormatter.apiFormatter.string(from: date)
return apiFormatter.string(from: date)
}
public static func backendDateWithoutTime(withDate date: Date) -> String {
return BaseDateFormatter.apiDateWithoutTimeFormatter.string(from: date)
return apiDateWithoutTimeFormatter.string(from: date)
}
public static func hourAndMinuteStrDate(withDate date: Date) -> String {
return BaseDateFormatter.hourAndMinuteFormatter.string(from: date)
return hourAndMinuteFormatter.string(from: date)
}
public static func dayAndMonthStrDate(withDate date: Date) -> String {
return dayAndMonthFormatter.string(from: date)
}
public static func dayMonthYearStrDate(withDate date: Date) -> String {
return BaseDateFormatter.dayMonthYearFormatter.string(from: date)
return dayMonthYearFormatter.string(from: date)
}
// MARK: - Transformers
@ -97,13 +101,13 @@ open class BaseDateFormatter {
public static var transformFromStringToDate: TransformOf<Date, String> {
return TransformOf<Date, String>(fromJSON: { (stringValue) -> Date? in
if let stringValue = stringValue {
return BaseDateFormatter.backendDate(fromStrDate: stringValue)
return backendDate(fromStrDate: stringValue)
} else {
return nil
}
}, toJSON: { (dateValue) -> String? in
if let dateValue = dateValue {
return BaseDateFormatter.backendStrDate(withDate: dateValue)
return backendStrDate(withDate: dateValue)
} else {
return nil
}