Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed Documentation/Changing the target name.png
Binary file not shown.
Binary file added Documentation/Screenshots/Watch Menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 14 additions & 10 deletions Loop/Extensions/UIColor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extension UIColor {

@nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1)

@nonobjc static let glucoseTintColor = UIColor.HIGLightBlueColor()
@nonobjc static let glucoseTintColor = UIColor.HIGTealBlueColor()

@nonobjc static let IOBTintColor = UIColor.HIGOrangeColor()

Expand All @@ -35,34 +35,38 @@ extension UIColor {
@nonobjc static let deleteColor = UIColor.HIGRedColor()

// MARK: - HIG colors
// See: https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/MobileHIG/ColorImagesText.html
// See: https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/

private static func HIGLightBlueColor() -> UIColor {
return UIColor(red: 96 / 255, green: 201 / 255, blue: 248 / 255, alpha: 1)
private static func HIGTealBlueColor() -> UIColor {
return UIColor(red: 90 / 255, green: 200 / 255, blue: 250 / 255, alpha: 1)
}

private static func HIGYellowColor() -> UIColor {
return UIColor(red: 1, green: 203 / 255, blue: 47 / 255, alpha: 1)
return UIColor(red: 1, green: 204 / 255, blue: 0 / 255, alpha: 1)
}

private static func HIGOrangeColor() -> UIColor {
return UIColor(red: 254 / 255, green: 149 / 255, blue: 38 / 255, alpha: 1)
return UIColor(red: 1, green: 149 / 255, blue: 0 / 255, alpha: 1)
}

private static func HIGPinkColor() -> UIColor {
return UIColor(red: 253 / 255, green: 50 / 255, blue: 89 / 255, alpha: 1)
return UIColor(red: 1, green: 45 / 255, blue: 85 / 255, alpha: 1)
}

private static func HIGBlueColor() -> UIColor {
return UIColor(red: 22 / 255, green: 127 / 255, blue: 252 / 255, alpha: 1)
return UIColor(red: 0, green: 122 / 255, blue: 1, alpha: 1)
}

private static func HIGGreenColor() -> UIColor {
return UIColor(red: 83 / 255, green: 216 / 255, blue: 106 / 255, alpha: 1)
return UIColor(red: 76 / 255, green: 217 / 255, blue: 100 / 255, alpha: 1)
}

private static func HIGRedColor() -> UIColor {
return UIColor(red: 253 / 255, green: 61 / 255, blue: 57 / 255, alpha: 1)
return UIColor(red: 1, green: 59 / 255, blue: 48 / 255, alpha: 1)
}

private static func HIGPurpleColor() -> UIColor {
return UIColor(red: 88 / 255, green: 86 / 255, blue: 214 / 255, alpha: 1)
}

private static func HIGGrayColor() -> UIColor {
Expand Down
24 changes: 24 additions & 0 deletions WatchApp/Assets.xcassets/bolus.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"images" : [
{
"idiom" : "watch",
"scale" : "2x"
},
{
"idiom" : "watch",
"filename" : "bolus_38.png",
"screen-width" : "<=145",
"scale" : "2x"
},
{
"idiom" : "watch",
"filename" : "bolus_42.png",
"screen-width" : ">145",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions WatchApp/Assets.xcassets/fork.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"images" : [
{
"idiom" : "watch",
"scale" : "2x"
},
{
"idiom" : "watch",
"filename" : "fork_38.png",
"screen-width" : "<=145",
"scale" : "2x"
},
{
"idiom" : "watch",
"filename" : "fork_42.png",
"screen-width" : ">145",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added WatchApp/Assets.xcassets/fork.imageset/fork_38.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions WatchApp/Base.lproj/Interface.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@
</items>
<menu key="menu" id="Enz-3V-zIL">
<items>
<menuItem title="Carbs" icon="add" id="Fhb-O2-qgq">
<menuItem title="Carbs" image="fork" id="Fhb-O2-qgq">
<connections>
<action selector="addCarbs" destination="rNf-Mh-tID" id="vV7-7n-9Jh"/>
</connections>
</menuItem>
<menuItem title="Bolus" icon="add" id="ONR-Fr-rMn">
<menuItem title="Bolus" image="bolus" id="ONR-Fr-rMn">
<connections>
<action selector="setBolus" destination="rNf-Mh-tID" id="lqt-6H-VfV"/>
</connections>
Expand Down