Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add short format support #51

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add short format support #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc08ab0
Add short format support
vvit Mar 28, 2020
1301995
Fix expression to remove type-check compiler error
vvit Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions CountdownLabel/CountdownLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,21 +299,46 @@ extension CountdownLabel {
var labelText = timeFormat;
let comp = calendar.dateComponents([.day, .hour, .minute, .second], from: date1970 as Date, to: to1970Date)

if let day = comp.day ,let _ = timeFormat.range(of: "dd"){
labelText = labelText.replacingOccurrences(of: "dd", with: String.init(format: "%02ld", day))
if let day = comp.day {
if let _ = timeFormat.range(of: "dd") {
labelText = labelText.replacingOccurrences(of: "dd", with: String(format: "%02ld", day))
} else if let _ = timeFormat.range(of: "d") {
labelText = labelText.replacingOccurrences(of: "d", with: String(format: "%ld", day))
}
}
if let hour = comp.hour ,let _ = timeFormat.range(of: "hh"){
labelText = labelText.replacingOccurrences(of: "hh", with: String.init(format: "%02ld", hour))

if let hour = comp.hour {
if let _ = timeFormat.range(of: "hh") {
labelText = labelText.replacingOccurrences(of: "hh", with: String(format: "%02ld", hour))
} else if let _ = timeFormat.range(of: "h") {
labelText = labelText.replacingOccurrences(of: "h", with: String(format: "%ld", hour))
}
}
if let hour = comp.hour ,let _ = timeFormat.range(of: "HH"){
labelText = labelText.replacingOccurrences(of: "HH", with: String.init(format: "%02ld", hour))

if let hour = comp.hour {
if let _ = timeFormat.range(of: "HH") {
labelText = labelText.replacingOccurrences(of: "HH", with: String(format: "%02ld", hour))
} else if let _ = timeFormat.range(of: "H") {
labelText = labelText.replacingOccurrences(of: "H", with: String(format: "%ld", hour))
}
}
if let minute = comp.minute ,let _ = timeFormat.range(of: "mm"){
labelText = labelText.replacingOccurrences(of: "mm", with: String.init(format: "%02ld", minute))

if let minute = comp.minute {
if let _ = timeFormat.range(of: "mm") {
labelText = labelText.replacingOccurrences(of: "mm", with: String(format: "%02ld", minute))
} else if let _ = timeFormat.range(of: "m") {
labelText = labelText.replacingOccurrences(of: "m", with: String(format: "%ld", minute))
}
}
if let second = comp.second ,let _ = timeFormat.range(of: "ss"){
labelText = labelText.replacingOccurrences(of: "ss", with: String.init(format: "%02ld", second))

if let second = comp.second {
if let _ = timeFormat.range(of: "ss") {
labelText = labelText.replacingOccurrences(of: "ss", with: String(format: "%02ld", second))
} else if let _ = timeFormat.range(of: "s") {
labelText = labelText.replacingOccurrences(of: "s", with: String(format: "%ld", second))
}
}

return labelText
}

Expand Down
2 changes: 1 addition & 1 deletion CountdownLabel/LTMorphingLabel/LTEasing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public struct LTEasing {

public static func easeInQuint(_ t: Float, _ b: Float, _ c: Float, _ d: Float = 1.0) -> Float {
return {
return c * $0 * $0 * $0 * $0 * $0 + b
return c * ($0 * $0 * $0 * $0 * $0) + b
}(t / d)
}

Expand Down