Skip to content
This repository was archived by the owner on Jun 28, 2024. It is now read-only.

Commit 4ae6db5

Browse files
committed
Merge branch 'refs/heads/main' into karkakol/change-npm-package-name
# Conflicts: # example/ios/FishjamExample/Images.xcassets/AppIcon.appiconset/Contents.json
2 parents 03e94d2 + 3b7efc0 commit 4ae6db5

17 files changed

+151
-151
lines changed

example/ios/FishjamExample.xcodeproj/project.pbxproj

+86-86
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
{
22
"images" : [
3-
{
4-
"filename" : "sygnet-color-20@2x.png",
5-
"idiom" : "iphone",
6-
"scale" : "2x",
7-
"size" : "20x20"
3+
{
4+
"size" : "20x20",
5+
"idiom": "iphone",
6+
"filename" : "fishjam-icon-20@2x.png",
7+
"scale": "2x"
88
},
9-
{
10-
"filename" : "sygnet-color-20@3x.png",
11-
"idiom" : "iphone",
12-
"scale" : "3x",
13-
"size" : "20x20"
9+
{
10+
"size" : "20x20",
11+
"idiom": "iphone",
12+
"filename" : "fishjam-icon-20@3x.png",
13+
"scale": "3x"
1414
},
15-
{
16-
"filename" : "sygnet-color-29@2x.png",
17-
"idiom" : "iphone",
18-
"scale" : "2x",
19-
"size" : "29x29"
15+
{
16+
"size" : "20x20",
17+
"idiom": "ipad",
18+
"filename" : "fishjam-icon-20.png",
19+
"scale": "1x"
2020
},
2121
{
22-
"filename" : "sygnet-color-29@3x.png",
23-
"idiom" : "iphone",
24-
"scale" : "3x",
25-
"size" : "29x29"
22+
"size" : "20x20",
23+
"idiom": "ipad",
24+
"filename" : "fishjam-icon-20@2x.png",
25+
"scale": "2x"
2626
},
2727
{
28-
"filename" : "sygnet-color-40@2x.png",
28+
"size" : "29x29",
2929
"idiom" : "iphone",
30-
"scale" : "2x",
31-
"size" : "40x40"
30+
"filename" : "fishjam-icon-29@2x.png",
31+
"scale" : "2x"
3232
},
3333
{
34-
"filename" : "sygnet-color-40@3x.png",
34+
"size" : "29x29",
3535
"idiom" : "iphone",
36-
"scale" : "3x",
37-
"size" : "40x40"
36+
"filename" : "fishjam-icon-29@3x.png",
37+
"scale" : "3x"
3838
},
3939
{
40-
"filename" : "sygnet-color-60@2x.png",
40+
"size" : "40x40",
4141
"idiom" : "iphone",
42-
"scale" : "2x",
43-
"size" : "60x60"
42+
"filename" : "fishjam-icon-40@2x.png",
43+
"scale" : "2x"
4444
},
4545
{
46-
"filename" : "sygnet-color-60@3x.png",
46+
"size" : "40x40",
4747
"idiom" : "iphone",
48-
"scale" : "3x",
49-
"size" : "60x60"
48+
"filename" : "fishjam-icon-40@3x.png",
49+
"scale" : "3x"
5050
},
5151
{
52-
"filename" : "sygnet-color-20.png",
53-
"idiom" : "ipad",
54-
"scale" : "1x",
55-
"size" : "20x20"
52+
"size" : "60x60",
53+
"idiom" : "iphone",
54+
"filename" : "fishjam-icon-60@2x.png",
55+
"scale" : "2x"
5656
},
5757
{
58-
"filename" : "sygnet-color-20@2x.png",
59-
"idiom" : "ipad",
60-
"scale" : "2x",
61-
"size" : "20x20"
58+
"size" : "60x60",
59+
"idiom" : "iphone",
60+
"filename" : "fishjam-icon-60@3x.png",
61+
"scale" : "3x"
6262
},
6363
{
64-
"filename" : "sygnet-color-29.png",
64+
"size" : "29x29",
6565
"idiom" : "ipad",
66-
"scale" : "1x",
67-
"size" : "29x29"
66+
"filename" : "fishjam-icon-29.png",
67+
"scale" : "1x"
6868
},
6969
{
70-
"filename" : "sygnet-color-29@2x.png",
70+
"size" : "29x29",
7171
"idiom" : "ipad",
72-
"scale" : "2x",
73-
"size" : "29x29"
72+
"filename" : "fishjam-icon-29@2x.png",
73+
"scale" : "2x"
7474
},
7575
{
76-
"filename" : "sygnet-color-40.png",
76+
"size" : "40x40",
7777
"idiom" : "ipad",
78-
"scale" : "1x",
79-
"size" : "40x40"
78+
"filename" : "fishjam-icon-40.png",
79+
"scale" : "1x"
8080
},
8181
{
82-
"filename" : "sygnet-color-40@2x.png",
82+
"size" : "40x40",
8383
"idiom" : "ipad",
84-
"scale" : "2x",
85-
"size" : "40x40"
84+
"filename" : "fishjam-icon-40@2x.png",
85+
"scale" : "2x"
8686
},
8787
{
88-
"filename" : "sygnet-color-76.png",
88+
"size" : "76x76",
8989
"idiom" : "ipad",
90-
"scale" : "1x",
91-
"size" : "76x76"
90+
"filename" : "fishjam-icon-76.png",
91+
"scale" : "1x"
9292
},
9393
{
94-
"filename" : "sygnet-color-76@2x.png",
94+
"size" : "76x76",
9595
"idiom" : "ipad",
96-
"scale" : "2x",
97-
"size" : "76x76"
96+
"filename" : "fishjam-icon-76@2x.png",
97+
"scale" : "2x"
9898
},
9999
{
100-
"filename" : "sygnet-color-83.5@2x.png",
100+
"size" : "83.5x83.5",
101101
"idiom" : "ipad",
102-
"scale" : "2x",
103-
"size" : "83.5x83.5"
102+
"filename" : "fishjam-icon-83.5@2x.png",
103+
"scale" : "2x"
104104
},
105105
{
106-
"filename" : "sygnet-color-1024.png",
106+
"size" : "1024x1024",
107107
"idiom" : "ios-marketing",
108-
"scale" : "1x",
109-
"size" : "1024x1024"
108+
"filename" : "fishjam-icon-1024.png",
109+
"scale" : "1x"
110110
}
111111
],
112112
"info" : {
113-
"author" : "xcode",
114-
"version" : 1
113+
"version" : 1,
114+
"author" : "xcode"
115115
}
116116
}
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)