From 4104b1f6f793866c2e619d0649d0f292a33037dd Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 8 Jan 2017 17:30:39 -0800 Subject: [PATCH 01/34] WIP --- .../Base.lproj/MainInterface.storyboard | 24 ++++++++++----- .../StatusViewController.swift | 29 ++++++++++++++++++- Loop.xcodeproj/project.pbxproj | 20 +++++++++++++ 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/Loop Status Extension/Base.lproj/MainInterface.storyboard b/Loop Status Extension/Base.lproj/MainInterface.storyboard index 05b95fa8dd..d87568d298 100644 --- a/Loop Status Extension/Base.lproj/MainInterface.storyboard +++ b/Loop Status Extension/Base.lproj/MainInterface.storyboard @@ -6,7 +6,6 @@ - @@ -28,8 +27,12 @@ + + + + - + diff --git a/Loop Status Extension/UIColor+Widget.swift b/Loop Status Extension/UIColor+Widget.swift index f0e9109222..331fcdb95a 100644 --- a/Loop Status Extension/UIColor+Widget.swift +++ b/Loop Status Extension/UIColor+Widget.swift @@ -9,15 +9,19 @@ import UIKit extension UIColor { + @nonobjc static let axisLabelColor = subtitleLabelColor + + @nonobjc static let axisLineColor = subtitleLabelColor + @nonobjc static let doseTintColor = UIColor(red: 255 / 255, green: 109 / 255, blue: 0, alpha: 1) + @nonobjc static let freshColor = UIColor(red: 64 / 255, green: 219 / 255, blue: 89 / 255, alpha: 1) + @nonobjc static let glucoseTintColor = UIColor(red: 0 / 255, green: 122 / 255, blue: 244 / 255, alpha: 1) + @nonobjc static let gridColor = subtitleLabelColor + @nonobjc static let pumpStatusNormal = UIColor(red: 100 / 255, green: 101 / 255, blue: 105 / 255, alpha: 1) @nonobjc static let subtitleLabelColor = UIColor(white: 0, alpha: 0.4) } - -extension UIColor { - @nonobjc static let freshColor = UIColor(red: 64 / 255, green: 219 / 255, blue: 89 / 255, alpha: 1) -} diff --git a/Loop/Extensions/UIColor+Loop.swift b/Loop/Extensions/UIColor+Loop.swift index 864654fbf0..e9075532f1 100644 --- a/Loop/Extensions/UIColor+Loop.swift +++ b/Loop/Extensions/UIColor+Loop.swift @@ -10,11 +10,17 @@ import UIKit extension UIColor { + @nonobjc static let axisLabelColor = secondaryLabelColor + + @nonobjc static let axisLineColor = UIColor.clear + @nonobjc static let doseTintColor = UIColor.HIGOrangeColor() @nonobjc static let freshColor = UIColor.HIGGreenColor() @nonobjc static let glucoseTintColor = UIColor(red: 0 / 255, green: 176 / 255, blue: 255 / 255, alpha: 1) + @nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1) + @nonobjc static let pumpStatusNormal = secondaryLabelColor } diff --git a/Loop/Managers/StatusChartManager.swift b/Loop/Managers/StatusChartManager.swift index 6a77d98da9..99ff81b437 100644 --- a/Loop/Managers/StatusChartManager.swift +++ b/Loop/Managers/StatusChartManager.swift @@ -62,9 +62,9 @@ final class StatusChartsManager { return numberFormatter }() - private lazy var axisLineColor = UIColor.clear + private lazy var axisLineColor = UIColor.axisLineColor - private lazy var axisLabelSettings: ChartLabelSettings = ChartLabelSettings(font: UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption1), fontColor: UIColor.secondaryLabelColor) + private lazy var axisLabelSettings: ChartLabelSettings = ChartLabelSettings(font: UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption1), fontColor: UIColor.axisLabelColor) private lazy var guideLinesLayerSettings: ChartGuideLinesLayerSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.gridColor) From 3e0261c2e8f00a8d01f25a223fe8f80f9c9db569 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 11 Mar 2017 17:08:36 -0800 Subject: [PATCH 15/34] Fix predicted glucose scene to use ChartContentView from it's new location in LoopUI --- Loop/Base.lproj/Main.storyboard | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard index ba3ee77b1e..352e33d1d5 100644 --- a/Loop/Base.lproj/Main.storyboard +++ b/Loop/Base.lproj/Main.storyboard @@ -23,17 +23,17 @@ - + - + @@ -54,18 +54,18 @@ - +