Compare commits

...

7 Commits

Author SHA1 Message Date
Nikolai Ashanin 36c44d5d49 Merge pull request #9 from scoreyou/fix/fix
Error fixed
2017-05-02 20:10:07 +03:00
Alexey Gerasimov cb665d29a1 Error fixed 2017-05-02 18:49:39 +03:00
Nikolai Ashanin a22d820c90 Merge pull request #8 from scoreyou/fix/someBugs
DateFormatter fixed
2017-05-02 18:36:44 +03:00
Alexey Gerasimov 602a5eda27 Version incremented 2017-05-02 18:34:31 +03:00
Alexey Gerasimov 3c78300d7f Merge branch 'master' into fix/someBugs 2017-05-02 18:34:13 +03:00
Alexey Gerasimov 1c3582683b Version incremented 2017-05-02 18:32:58 +03:00
Alexey Gerasimov 2945028909 DateFormatter fixed 2017-04-28 15:57:04 +03:00
3 changed files with 21 additions and 17 deletions
+1 -1
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"
@@ -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
}
@@ -241,12 +241,12 @@ extension BasePassCodeViewController: ConfigurableController {
extension BasePassCodeViewController: UITextFieldDelegate {
func textField(_ textField: UITextField,
shouldChangeCharactersIn range: NSRange,
replacementString string: String) -> Bool {
public func textField(_ textField: UITextField,
shouldChangeCharactersIn range: NSRange,
replacementString string: String) -> Bool {
let invalid = CharacterSet(charactersIn: "0123456789").inverted
return string.rangeOfCharacter(from: invalid, options: [], range: string.startIndex..<string.endIndex) == nil
}
}