Skip to content

Commit 14af7d5

Browse files
committed
Adding watch menu icons
(Thanks to @skrugman for the shape!)
1 parent 25330a0 commit 14af7d5

File tree

10 files changed

+64
-12
lines changed

10 files changed

+64
-12
lines changed
-338 KB
Binary file not shown.
10.7 KB
Loading

Loop/Extensions/UIColor.swift

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extension UIColor {
1616

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

19-
@nonobjc static let glucoseTintColor = UIColor.HIGLightBlueColor()
19+
@nonobjc static let glucoseTintColor = UIColor.HIGTealBlueColor()
2020

2121
@nonobjc static let IOBTintColor = UIColor.HIGOrangeColor()
2222

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

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

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

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

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

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

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

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

6464
private static func HIGRedColor() -> UIColor {
65-
return UIColor(red: 253 / 255, green: 61 / 255, blue: 57 / 255, alpha: 1)
65+
return UIColor(red: 1, green: 59 / 255, blue: 48 / 255, alpha: 1)
66+
}
67+
68+
private static func HIGPurpleColor() -> UIColor {
69+
return UIColor(red: 88 / 255, green: 86 / 255, blue: 214 / 255, alpha: 1)
6670
}
6771

6872
private static func HIGGrayColor() -> UIColor {
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "watch",
5+
"scale" : "2x"
6+
},
7+
{
8+
"idiom" : "watch",
9+
"filename" : "bolus_38.png",
10+
"screen-width" : "<=145",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "watch",
15+
"filename" : "bolus_42.png",
16+
"screen-width" : ">145",
17+
"scale" : "2x"
18+
}
19+
],
20+
"info" : {
21+
"version" : 1,
22+
"author" : "xcode"
23+
}
24+
}
Loading
Loading
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "watch",
5+
"scale" : "2x"
6+
},
7+
{
8+
"idiom" : "watch",
9+
"filename" : "fork_38.png",
10+
"screen-width" : "<=145",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "watch",
15+
"filename" : "fork_42.png",
16+
"screen-width" : ">145",
17+
"scale" : "2x"
18+
}
19+
],
20+
"info" : {
21+
"version" : 1,
22+
"author" : "xcode"
23+
}
24+
}
947 Bytes
Loading
Loading

WatchApp/Base.lproj/Interface.storyboard

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@
141141
</items>
142142
<menu key="menu" id="Enz-3V-zIL">
143143
<items>
144-
<menuItem title="Carbs" icon="add" id="Fhb-O2-qgq">
144+
<menuItem title="Carbs" image="fork" id="Fhb-O2-qgq">
145145
<connections>
146146
<action selector="addCarbs" destination="rNf-Mh-tID" id="vV7-7n-9Jh"/>
147147
</connections>
148148
</menuItem>
149-
<menuItem title="Bolus" icon="add" id="ONR-Fr-rMn">
149+
<menuItem title="Bolus" image="bolus" id="ONR-Fr-rMn">
150150
<connections>
151151
<action selector="setBolus" destination="rNf-Mh-tID" id="lqt-6H-VfV"/>
152152
</connections>

0 commit comments

Comments
 (0)