Skip to content

Commit 9074469

Browse files
KimPilGyeomKimPilGyeom
authored
Merge pull request #68 from DeveloperAcademy-POSTECH/fix/#64_all
fix/#62_fix the issue
2 parents c5b0cbb + d1020ca commit 9074469

File tree

15 files changed

+221
-47
lines changed

15 files changed

+221
-47
lines changed

‎hearo/HearoadWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
{
22
"colors" : [
33
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "255",
9+
"green" : "255",
10+
"red" : "255"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "255",
27+
"green" : "255",
28+
"red" : "255"
29+
}
30+
},
431
"idiom" : "universal"
532
}
633
],

‎hearo/HearoadWatch Watch App/Assets.xcassets/Bicycle.imageset/Bicycle.svg

Lines changed: 22 additions & 0 deletions
Loading

‎hearo/HearoadWatch Watch App/Assets.xcassets/Bicycle.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Bicycle.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎hearo/HearoadWatch Watch App/Assets.xcassets/Car.imageset/Car.svg

Lines changed: 18 additions & 0 deletions
Loading

‎hearo/HearoadWatch Watch App/Assets.xcassets/Car.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Car.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎hearo/HearoadWatch Watch App/Assets.xcassets/Siren.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Siren.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎hearo/HearoadWatch Watch App/Assets.xcassets/Siren.imageset/Siren.svg

Lines changed: 17 additions & 0 deletions
Loading

‎hearo/hearo/Resources/Assets.xcassets/AccentColor.colorset/Contents.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "255",
9+
"green" : "255",
10+
"red" : "255"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "255",
27+
"green" : "255",
28+
"red" : "255"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎hearo/hearo/Resources/Assets.xcassets/Color/Background.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "1.000",
27-
"green" : "1.000",
28-
"red" : "1.000"
26+
"blue" : "254",
27+
"green" : "254",
28+
"red" : "254"
2929
}
3030
},
3131
"idiom" : "universal"

‎hearo/hearo/Resources/Assets.xcassets/Color/HPrimaryColor.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "1.000",
27-
"green" : "1.000",
28-
"red" : "1.000"
26+
"blue" : "60",
27+
"green" : "213",
28+
"red" : "88"
2929
}
3030
},
3131
"idiom" : "universal"

0 commit comments

Comments
 (0)