Skip to content

Show 12h or 24h time on chart x-axis depending on locale #952

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

Merged
ps2 merged 1 commit into from
May 28, 2019
Merged

Show 12h or 24h time on chart x-axis depending on locale #952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions LoopUI/Charts/ChartsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ import os.log
open class ChartsManager {
private let log = OSLog(category: "ChartsManager")

private lazy var timeFormatter: DateFormatter = {
let formatter = DateFormatter()
let dateFormat = DateFormatter.dateFormat(fromTemplate: "j", options: 0, locale: Locale.current)!
let isAmPmTimeFormat = dateFormat.index( of: "a") != nil
formatter.dateFormat = isAmPmTimeFormat
? "h a"
: "H:mm"
return formatter
}()

public init(colors: ChartColorPalette, settings: ChartSettings, charts: [ChartProviding]) {
self.colors = colors
self.chartSettings = settings
Expand Down Expand Up @@ -105,7 +115,7 @@ open class ChartsManager {
/// - Parameter date: The new candidate date
public func updateEndDate(_ date: Date) {
if date > endDate {
var components = DateComponents(minute: 0)
let components = DateComponents(minute: 0)
endDate = min(
maxEndDate,
Calendar.current.nextDate(
Expand Down Expand Up @@ -156,14 +166,12 @@ open class ChartsManager {

// MARK: - Shared Axis


private func generateXAxisValues() {
if let endDate = charts.compactMap({ $0.endDate }).max() {
updateEndDate(endDate)
}

let timeFormatter = DateFormatter()
timeFormatter.dateFormat = "h a"

let points = [
ChartPoint(
x: ChartAxisValueDate(date: startDate, formatter: timeFormatter),
Expand Down