Skip to content

Commit ace2c7d

Browse files
vdovbnya-qbvdovbnya-qb
authored
Merge pull request #26 from QuickBlox/1.2.0-videochat-flutter
1.2.0-videochat-flutter
2 parents 142af4a + 1d6107f commit ace2c7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2637
-489
lines changed

‎videocall_webrtc_sample/android/app/build.gradle‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
id "com.android.application"
33
id "kotlin-android"
44
id "dev.flutter.flutter-gradle-plugin"
5+
id 'com.google.gms.google-services'
56
}
67

78
def localProperties = new Properties()
@@ -59,6 +60,8 @@ android {
5960
compileOptions {
6061
sourceCompatibility = JavaVersion.VERSION_17
6162
targetCompatibility = JavaVersion.VERSION_17
63+
64+
coreLibraryDesugaringEnabled true
6265
}
6366

6467
kotlinOptions {
@@ -74,4 +77,7 @@ flutter {
7477
source '../..'
7578
}
7679

77-
dependencies {}
80+
dependencies {
81+
implementation(platform("com.google.firebase:firebase-bom:33.6.0"))
82+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
83+
}

‎videocall_webrtc_sample/android/app/google-services.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"project_info": {
3+
"project_number": "Put here your value",
4+
"firebase_url": "https://qb-samples.firebaseio.com",
5+
"project_id": "qb-samples",
6+
"storage_bucket": "qb-samples.firebasestorage.app"
7+
},
8+
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "Put here your value",
12+
"android_client_info": {
13+
"package_name": "com.quickblox.videocall_webrtc_sample"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "Put here your value",
19+
"client_type": 3
20+
}
21+
],
22+
"api_key": [
23+
{
24+
"current_key":"Put here your value"
25+
}
26+
],
27+
"services": {
28+
"appinvite_service": {
29+
"other_platform_oauth_client": [
30+
{
31+
"client_id": "Put here your value",
32+
"client_type": 3
33+
},
34+
{
35+
"client_id": "Put here your value",
36+
"client_type": 2,
37+
"ios_info": {
38+
"bundle_id": "Put here your value"
39+
}
40+
}
41+
]
42+
}
43+
}
44+
}
45+
],
46+
"configuration_version": "1"
47+
}

‎videocall_webrtc_sample/android/app/proguard-rules.pro‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,24 @@
5050
-keep class org.json.** { *; }
5151

5252
#flutter file picker library
53-
-keep class androidx.lifecycle.DefaultLifecycleObserver
53+
-keep class androidx.lifecycle.DefaultLifecycleObserver
54+
55+
-keep class com.google.firebase.iid.** { *; }
56+
-keep class java.beans.** { *; }
57+
-keep class org.conscrypt.** { *; }
58+
-keep class org.w3c.dom.bootstrap.** { *; }
59+
-dontwarn com.google.firebase.iid.**
60+
-dontwarn java.beans.**
61+
-dontwarn org.conscrypt.**
62+
-dontwarn org.w3c.dom.bootstrap.**
63+
64+
# Firebase Messaging
65+
-keep class com.google.firebase.** { *; }
66+
-keep class com.google.android.gms.** { *; }
67+
-keep class com.hiennv.flutter_callkit_incoming.** { *; }
68+
69+
# QuickBlox
70+
-keep class com.quickblox.** { *; }
71+
-keep class com.google.gson.** { *; }
72+
-keepattributes Signature
73+
-keepattributes RuntimeVisibleAnnotations

‎videocall_webrtc_sample/android/app/src/main/AndroidManifest.xml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,34 @@
22
<!--//TODO: need to delete permissions, should be in SDK after update-->
33
<uses-permission android:name="android.permission.RECORD_AUDIO" />
44
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
5-
<uses-permission android:name="android.permission.BLUETOOTH"
6-
android:maxSdkVersion="30"/>
5+
<uses-permission
6+
android:name="android.permission.BLUETOOTH"
7+
android:maxSdkVersion="30" />
78
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
8-
<application
9-
android:label="videocall_webrtc_sample"
9+
<uses-permission android:name="android.permission.INTERNET" />
10+
11+
<application
1012
android:name="${applicationName}"
11-
android:icon="@mipmap/ic_launcher">
13+
android:icon="@mipmap/ic_launcher"
14+
android:label="videocall_webrtc_sample">
1215
<activity
1316
android:name=".MainActivity"
14-
android:exported="true"
15-
android:launchMode="singleTop"
16-
android:theme="@style/LaunchTheme"
1717
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
18+
android:exported="true"
1819
android:hardwareAccelerated="true"
20+
android:launchMode="singleInstance"
21+
android:theme="@style/LaunchTheme"
1922
android:windowSoftInputMode="adjustResize">
2023
<!-- Specifies an Android theme to apply to this Activity as soon as
2124
the Android process has started. This theme is visible to the user
2225
while the Flutter UI initializes. After that, this theme continues
2326
to determine the Window background behind the Flutter UI. -->
2427
<meta-data
25-
android:name="io.flutter.embedding.android.NormalTheme"
26-
android:resource="@style/NormalTheme"
27-
/>
28+
android:name="io.flutter.embedding.android.NormalTheme"
29+
android:resource="@style/NormalTheme" />
2830
<intent-filter>
29-
<action android:name="android.intent.action.MAIN"/>
30-
<category android:name="android.intent.category.LAUNCHER"/>
31+
<action android:name="android.intent.action.MAIN" />
32+
<category android:name="android.intent.category.LAUNCHER" />
3133
</intent-filter>
3234
</activity>
3335
<!-- Don't delete the meta-data below.

‎videocall_webrtc_sample/android/app/src/main/res/drawable/ic_launcher.png‎

816 Bytes
Loading

‎videocall_webrtc_sample/android/settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2222
id "com.android.application" version "8.2.2" apply false
2323
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
24+
id 'com.google.gms.google-services' version '4.4.2' apply false
2425
}
2526

2627
include ":app"

‎videocall_webrtc_sample/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎videocall_webrtc_sample/ios/Podfile.lock‎

Lines changed: 114 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,128 @@
11
PODS:
22
- audioplayers_darwin (0.0.1):
33
- Flutter
4+
- CryptoSwift (1.8.4)
5+
- Firebase/CoreOnly (11.4.0):
6+
- FirebaseCore (= 11.4.0)
7+
- Firebase/Messaging (11.4.0):
8+
- Firebase/CoreOnly
9+
- FirebaseMessaging (~> 11.4.0)
10+
- firebase_core (3.8.0):
11+
- Firebase/CoreOnly (= 11.4.0)
12+
- Flutter
13+
- firebase_messaging (15.1.5):
14+
- Firebase/Messaging (= 11.4.0)
15+
- firebase_core
16+
- Flutter
17+
- FirebaseCore (11.4.0):
18+
- FirebaseCoreInternal (~> 11.0)
19+
- GoogleUtilities/Environment (~> 8.0)
20+
- GoogleUtilities/Logger (~> 8.0)
21+
- FirebaseCoreInternal (11.10.0):
22+
- "GoogleUtilities/NSData+zlib (~> 8.0)"
23+
- FirebaseInstallations (11.4.0):
24+
- FirebaseCore (~> 11.0)
25+
- GoogleUtilities/Environment (~> 8.0)
26+
- GoogleUtilities/UserDefaults (~> 8.0)
27+
- PromisesObjC (~> 2.4)
28+
- FirebaseMessaging (11.4.0):
29+
- FirebaseCore (~> 11.0)
30+
- FirebaseInstallations (~> 11.0)
31+
- GoogleDataTransport (~> 10.0)
32+
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
33+
- GoogleUtilities/Environment (~> 8.0)
34+
- GoogleUtilities/Reachability (~> 8.0)
35+
- GoogleUtilities/UserDefaults (~> 8.0)
36+
- nanopb (~> 3.30910.0)
437
- Flutter (1.0.0)
38+
- flutter_callkit_incoming (0.0.1):
39+
- CryptoSwift
40+
- Flutter
41+
- GoogleDataTransport (10.1.0):
42+
- nanopb (~> 3.30910.0)
43+
- PromisesObjC (~> 2.4)
44+
- GoogleUtilities/AppDelegateSwizzler (8.0.2):
45+
- GoogleUtilities/Environment
46+
- GoogleUtilities/Logger
47+
- GoogleUtilities/Network
48+
- GoogleUtilities/Privacy
49+
- GoogleUtilities/Environment (8.0.2):
50+
- GoogleUtilities/Privacy
51+
- GoogleUtilities/Logger (8.0.2):
52+
- GoogleUtilities/Environment
53+
- GoogleUtilities/Privacy
54+
- GoogleUtilities/Network (8.0.2):
55+
- GoogleUtilities/Logger
56+
- "GoogleUtilities/NSData+zlib"
57+
- GoogleUtilities/Privacy
58+
- GoogleUtilities/Reachability
59+
- "GoogleUtilities/NSData+zlib (8.0.2)":
60+
- GoogleUtilities/Privacy
61+
- GoogleUtilities/Privacy (8.0.2)
62+
- GoogleUtilities/Reachability (8.0.2):
63+
- GoogleUtilities/Logger
64+
- GoogleUtilities/Privacy
65+
- GoogleUtilities/UserDefaults (8.0.2):
66+
- GoogleUtilities/Logger
67+
- GoogleUtilities/Privacy
68+
- nanopb (3.30910.0):
69+
- nanopb/decode (= 3.30910.0)
70+
- nanopb/encode (= 3.30910.0)
71+
- nanopb/decode (3.30910.0)
72+
- nanopb/encode (3.30910.0)
573
- path_provider_foundation (0.0.1):
674
- Flutter
775
- FlutterMacOS
876
- permission_handler_apple (9.1.1):
977
- Flutter
78+
- PromisesObjC (2.4.0)
1079
- QBGoogleWebRTC (124.0.2)
11-
- QuickBlox (2.20.0)
12-
- Quickblox-WebRTC (3.1.0):
80+
- QuickBlox (2.21.0)
81+
- Quickblox-WebRTC (3.2.0):
1382
- QBGoogleWebRTC (>= 124.0)
1483
- QuickBlox (>= 2.20)
15-
- quickblox_sdk (0.16.2):
84+
- quickblox_sdk (0.17.0):
1685
- Flutter
17-
- QuickBlox (~> 2.20)
18-
- Quickblox-WebRTC (~> 3.1)
86+
- QuickBlox (~> 2.21)
87+
- Quickblox-WebRTC (~> 3.2)
1988

2089
DEPENDENCIES:
2190
- audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
91+
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
92+
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
2293
- Flutter (from `Flutter`)
94+
- flutter_callkit_incoming (from `.symlinks/plugins/flutter_callkit_incoming/ios`)
2395
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
2496
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
2597
- quickblox_sdk (from `.symlinks/plugins/quickblox_sdk/ios`)
2698

2799
SPEC REPOS:
28100
trunk:
101+
- CryptoSwift
102+
- Firebase
103+
- FirebaseCore
104+
- FirebaseCoreInternal
105+
- FirebaseInstallations
106+
- FirebaseMessaging
107+
- GoogleDataTransport
108+
- GoogleUtilities
109+
- nanopb
110+
- PromisesObjC
29111
- QBGoogleWebRTC
30112
- QuickBlox
31113
- Quickblox-WebRTC
32114

33115
EXTERNAL SOURCES:
34116
audioplayers_darwin:
35117
:path: ".symlinks/plugins/audioplayers_darwin/ios"
118+
firebase_core:
119+
:path: ".symlinks/plugins/firebase_core/ios"
120+
firebase_messaging:
121+
:path: ".symlinks/plugins/firebase_messaging/ios"
36122
Flutter:
37123
:path: Flutter
124+
flutter_callkit_incoming:
125+
:path: ".symlinks/plugins/flutter_callkit_incoming/ios"
38126
path_provider_foundation:
39127
:path: ".symlinks/plugins/path_provider_foundation/darwin"
40128
permission_handler_apple:
@@ -43,15 +131,28 @@ EXTERNAL SOURCES:
43131
:path: ".symlinks/plugins/quickblox_sdk/ios"
44132

45133
SPEC CHECKSUMS:
46-
audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
134+
audioplayers_darwin: ccf9c770ee768abb07e26d90af093f7bab1c12ab
135+
CryptoSwift: e64e11850ede528a02a0f3e768cec8e9d92ecb90
136+
Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99
137+
firebase_core: 84a16d041be8bc166b6e00350f89849e06daf9d1
138+
firebase_messaging: 48ce5cf82b70ac47ed9cb9277f97bb77d1d01a38
139+
FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771
140+
FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
141+
FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
142+
FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2
47143
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
48-
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
49-
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
144+
flutter_callkit_incoming: cb8138af67cda6dd981f7101a5d709003af21502
145+
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
146+
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
147+
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
148+
path_provider_foundation: 608fcb11be570ce83519b076ab6a1fffe2474f05
149+
permission_handler_apple: 3787117e48f80715ff04a3830ca039283d6a4f29
150+
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
50151
QBGoogleWebRTC: 1391bfd075620e01512d2c334c7463c03f14467f
51-
QuickBlox: e3ba718b7a195a6569c3e0eb33918d9ee1014f66
52-
Quickblox-WebRTC: f9c4f73be00b207e88fdfc6f2b592f1deb669aec
53-
quickblox_sdk: d71a4523df7358b7837eac82f04f4c47294762dc
152+
QuickBlox: 6c0cdb52128f320b89b94bb3f07ac236c3beaf92
153+
Quickblox-WebRTC: 9d8dc8c7aade1d7f4ecc5e74bd29de045613c550
154+
quickblox_sdk: 5e472f20a4439d80db9df3e54026837485cff1dc
54155

55-
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
156+
PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
56157

57-
COCOAPODS: 1.15.2
158+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)