Sfoglia il codice sorgente

[iOS] Add icon for CallKit in-call UI

master
Saúl Ibarra Corretgé 7 anni fa
parent
commit
20a6a61b45

+ 4
- 0
ios/sdk/sdk.xcodeproj/project.pbxproj Vedi File

16
 		0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */; };
16
 		0BA13D311EE83FF8007BEF7F /* ExternalAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */; };
17
 		0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */; };
17
 		0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */; };
18
 		0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7C1F60356D001C08DB /* AppInfo.m */; };
18
 		0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB9AD7C1F60356D001C08DB /* AppInfo.m */; };
19
+		0BC4B8691F8C03A700CE8B21 /* CallKitIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */; };
19
 		0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495C1EC4B6C600B793EE /* AudioMode.m */; };
20
 		0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495C1EC4B6C600B793EE /* AudioMode.m */; };
20
 		0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
21
 		0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
21
 		0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
22
 		0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
35
 		0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExternalAPI.m; sourceTree = "<group>"; };
36
 		0BA13D301EE83FF8007BEF7F /* ExternalAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExternalAPI.m; sourceTree = "<group>"; };
36
 		0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallKit.m; sourceTree = "<group>"; };
37
 		0BB9AD7A1F5EC8F4001C08DB /* CallKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallKit.m; sourceTree = "<group>"; };
37
 		0BB9AD7C1F60356D001C08DB /* AppInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfo.m; sourceTree = "<group>"; };
38
 		0BB9AD7C1F60356D001C08DB /* AppInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppInfo.m; sourceTree = "<group>"; };
39
+		0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CallKitIcon.png; path = ../../react/features/mobile/callkit/CallKitIcon.png; sourceTree = "<group>"; };
38
 		0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = "<group>"; };
40
 		0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = "<group>"; };
39
 		0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = "<group>"; };
41
 		0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = "<group>"; };
40
 		0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = "<group>"; };
42
 		0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = "<group>"; };
63
 		0BCA49681EC4BBE500B793EE /* Resources */ = {
65
 		0BCA49681EC4BBE500B793EE /* Resources */ = {
64
 			isa = PBXGroup;
66
 			isa = PBXGroup;
65
 			children = (
67
 			children = (
68
+				0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */,
66
 				0BCA496B1EC4BBF900B793EE /* jitsi.ttf */,
69
 				0BCA496B1EC4BBF900B793EE /* jitsi.ttf */,
67
 			);
70
 			);
68
 			name = Resources;
71
 			name = Resources;
202
 			buildActionMask = 2147483647;
205
 			buildActionMask = 2147483647;
203
 			files = (
206
 			files = (
204
 				0BCA496C1EC4BBF900B793EE /* jitsi.ttf in Resources */,
207
 				0BCA496C1EC4BBF900B793EE /* jitsi.ttf in Resources */,
208
+				0BC4B8691F8C03A700CE8B21 /* CallKitIcon.png in Resources */,
205
 			);
209
 			);
206
 			runOnlyForDeploymentPostprocessing = 0;
210
 			runOnlyForDeploymentPostprocessing = 0;
207
 		};
211
 		};

+ 4
- 1
ios/sdk/src/CallKit.m Vedi File

260
     // iconTemplateImageData
260
     // iconTemplateImageData
261
     NSString *iconTemplateImageName = dictionary[@"iconTemplateImageName"];
261
     NSString *iconTemplateImageName = dictionary[@"iconTemplateImageName"];
262
     if (iconTemplateImageName) {
262
     if (iconTemplateImageName) {
263
-        UIImage *iconTemplateImage = [UIImage imageNamed:iconTemplateImageName];
263
+        UIImage *iconTemplateImage
264
+            = [UIImage imageNamed:iconTemplateImageName
265
+                         inBundle:[NSBundle bundleForClass:self.class]
266
+    compatibleWithTraitCollection:nil];
264
         if (iconTemplateImage) {
267
         if (iconTemplateImage) {
265
             providerConfiguration.iconTemplateImageData
268
             providerConfiguration.iconTemplateImageData
266
                 = UIImagePNGRepresentation(iconTemplateImage);
269
                 = UIImagePNGRepresentation(iconTemplateImage);

BIN
react/features/mobile/callkit/CallKitIcon.png Vedi File


+ 1
- 1
react/features/mobile/callkit/middleware.js Vedi File

83
     const result = next(action);
83
     const result = next(action);
84
 
84
 
85
     CallKit.setProviderConfiguration({
85
     CallKit.setProviderConfiguration({
86
-        iconTemplateImageName: 'AppIcon40x40',
86
+        iconTemplateImageName: 'CallKitIcon',
87
         localizedName: NativeModules.AppInfo.name
87
         localizedName: NativeModules.AppInfo.name
88
     });
88
     });
89
 
89
 

Loading…
Annulla
Salva