mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

code change, Date.toString has now two parameters for date and time style.

This commit is contained in:
Johan Degraeve 2020-08-10 21:15:10 +02:00
parent ae5f1f16b7
commit 52d490d204
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdrip/Extensions/Date.swift
View File

@ -47,11 +47,11 @@ extension Date {
return dateFormatter.string(from: self).appending("Z")
}
/// date to short string, according to locale
func toShortString() -> String {
/// date to string, with date and time as specified by one of the values in DateFormatter.Style
func toString(timeStyle: DateFormatter.Style, dateStyle: DateFormatter.Style) -> String {
let dateFormatter = DateFormatter()
dateFormatter.timeStyle = .short
dateFormatter.dateStyle = .short
dateFormatter.timeStyle = timeStyle
dateFormatter.dateStyle = dateStyle
return dateFormatter.string(from: self)
}

2
xdrip/Utilities/Trace.swift
View File

@ -295,7 +295,7 @@ class Trace {
// timestamp app launch
// unwrap timeStampAppLaunch
if let timeStampAppLaunch = UserDefaults.standard.timeStampAppLaunch {
traceInfo.appendStringAndNewLine("App launched at " + timeStampAppLaunch.toShortString() + " local time.")
traceInfo.appendStringAndNewLine("App launched at " + timeStampAppLaunch.toString(timeStyle: .short, dateStyle: .short) + " local time.")
}
// cgm transmitter type from UserDefaults

2
xdrip/View Controllers/BluetoothPeripheralsNavigationController/BluetoothPeripheralsViewController/BluetoothPeripheralViewController/BluetoothPeripheralViewController.swift
View File

@ -975,7 +975,7 @@ extension BluetoothPeripheralViewController: UITableViewDataSource, UITableViewD
}
cell.detailTextLabel?.text = lastConnectionStatusChangeTimeStamp.toShortString()
cell.detailTextLabel?.text = lastConnectionStatusChangeTimeStamp.toString(timeStyle: .short, dateStyle: .short)
} else {
cell.textLabel?.text = Texts_BluetoothPeripheralView.connectedAt

2
xdrip/View Controllers/BluetoothPeripheralsNavigationController/BluetoothPeripheralsViewController/BluetoothPeripheralViewController/Models/CGM/Dexcom/DexcomG5/DexcomG5BluetoothPeripheralViewModel.swift
View File

@ -235,7 +235,7 @@ extension DexcomG5BluetoothPeripheralViewModel: BluetoothPeripheralViewModel {
if let lastResetTimeStamp = dexcomG5.lastResetTimeStamp {
cell.textLabel?.text = Texts_BluetoothPeripheralView.lastResetTimeStamp
cell.detailTextLabel?.text = lastResetTimeStamp.toShortString()
cell.detailTextLabel?.text = lastResetTimeStamp.toString(timeStyle: .short, dateStyle: .short)
cell.accessoryType = .none
} else {