Skip to content

Commit eb33115

Browse files
committed
Merge branch 'develop'
2 parents 8def2c7 + c5b49c3 commit eb33115

31 files changed

+154
-223
lines changed
Lines changed: 31 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,38 @@
11
{
22
"images" : [
33
{
4-
"size" : "20x20",
5-
"idiom" : "iphone",
6-
"filename" : "icon-bold-20@2x.png",
7-
"scale" : "2x"
8-
},
9-
{
10-
"size" : "20x20",
11-
"idiom" : "iphone",
12-
"filename" : "icon-bold-20@3x.png",
13-
"scale" : "3x"
14-
},
15-
{
16-
"size" : "29x29",
17-
"idiom" : "iphone",
18-
"filename" : "adamant-icon-bold-29@2x.png",
19-
"scale" : "2x"
20-
},
21-
{
22-
"size" : "29x29",
23-
"idiom" : "iphone",
24-
"filename" : "adamant-icon-bold-29@3x.png",
25-
"scale" : "3x"
26-
},
27-
{
28-
"size" : "40x40",
29-
"idiom" : "iphone",
30-
"filename" : "adamant-icon-bold-40@2x.png",
31-
"scale" : "2x"
32-
},
33-
{
34-
"size" : "40x40",
35-
"idiom" : "iphone",
36-
"filename" : "adamant-icon-bold-40@3x.png",
37-
"scale" : "3x"
38-
},
39-
{
40-
"size" : "60x60",
41-
"idiom" : "iphone",
42-
"filename" : "adamant-icon-bold-60@2x.png",
43-
"scale" : "2x"
44-
},
45-
{
46-
"size" : "60x60",
47-
"idiom" : "iphone",
48-
"filename" : "adamant-icon-bold-60@3x.png",
49-
"scale" : "3x"
50-
},
51-
{
52-
"size" : "20x20",
53-
"idiom" : "ipad",
54-
"filename" : "adamant-icon-bold-20.png",
55-
"scale" : "1x"
56-
},
57-
{
58-
"size" : "20x20",
59-
"idiom" : "ipad",
60-
"filename" : "adamant-icon-bold-20@2x.png",
61-
"scale" : "2x"
62-
},
63-
{
64-
"size" : "29x29",
65-
"idiom" : "ipad",
66-
"filename" : "adamant-icon-bold-29.png",
67-
"scale" : "1x"
68-
},
69-
{
70-
"size" : "29x29",
71-
"idiom" : "ipad",
72-
"filename" : "adamant-icon-bold-29@2x-1.png",
73-
"scale" : "2x"
74-
},
75-
{
76-
"size" : "40x40",
77-
"idiom" : "ipad",
78-
"filename" : "adamant-icon-bold-40.png",
79-
"scale" : "1x"
80-
},
81-
{
82-
"size" : "40x40",
83-
"idiom" : "ipad",
84-
"filename" : "adamant-icon-bold-40@2x-1.png",
85-
"scale" : "2x"
86-
},
87-
{
88-
"size" : "76x76",
89-
"idiom" : "ipad",
90-
"filename" : "adamant-icon-bold-76.png",
91-
"scale" : "1x"
92-
},
93-
{
94-
"size" : "76x76",
95-
"idiom" : "ipad",
96-
"filename" : "adamant-icon-bold-76@2x.png",
97-
"scale" : "2x"
98-
},
99-
{
100-
"size" : "83.5x83.5",
101-
"idiom" : "ipad",
102-
"filename" : "adamant-icon-bold-83.5@2x.png",
103-
"scale" : "2x"
104-
},
105-
{
106-
"size" : "1024x1024",
107-
"idiom" : "ios-marketing",
108-
"filename" : "adamant-icon-1024.png",
109-
"scale" : "1x"
4+
"filename" : "iOS_white.png",
5+
"idiom" : "universal",
6+
"platform" : "ios",
7+
"size" : "1024x1024"
8+
},
9+
{
10+
"appearances" : [
11+
{
12+
"appearance" : "luminosity",
13+
"value" : "dark"
14+
}
15+
],
16+
"filename" : "iOS_dark.png",
17+
"idiom" : "universal",
18+
"platform" : "ios",
19+
"size" : "1024x1024"
20+
},
21+
{
22+
"appearances" : [
23+
{
24+
"appearance" : "luminosity",
25+
"value" : "tinted"
26+
}
27+
],
28+
"filename" : "iOS_tint.png",
29+
"idiom" : "universal",
30+
"platform" : "ios",
31+
"size" : "1024x1024"
11032
}
11133
],
11234
"info" : {
113-
"version" : 1,
114-
"author" : "xcode"
35+
"author" : "xcode",
36+
"version" : 1
11537
}
116-
}
38+
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)