Skip to content

Commit

Permalink
[video_call]: update for flutter 3.3 and update sdk version to 3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
YuliaGrigorieva committed Dec 6, 2022
1 parent 61d6609 commit 18e9f9f
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 56 deletions.
2 changes: 1 addition & 1 deletion video_call/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '11.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
30 changes: 15 additions & 15 deletions video_call/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ PODS:
- Flutter
- flutter_voip_push_notification (0.0.1):
- Flutter
- flutter_voximplant (2.6.0):
- flutter_voximplant (3.7.0):
- Flutter
- VoxImplantSDK (= 2.36.2)
- VoxImplantSDK (= 2.46.11)
- GoogleDataTransport (7.5.1):
- nanopb (~> 1.30906.0)
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
Expand Down Expand Up @@ -76,14 +76,14 @@ PODS:
- "permission_handler (5.0.1+1)":
- Flutter
- PromisesObjC (1.2.12)
- Protobuf (3.14.0)
- Protobuf (3.21.10)
- shared_preferences (0.0.1):
- Flutter
- VoxImplantSDK (2.36.2):
- VoxImplantSDK/Core (= 2.36.2)
- VoxImplantSDK/Core (2.36.2):
- VoxImplantWebRTC (= 78.5.1)
- VoxImplantWebRTC (78.5.1)
- VoxImplantSDK (2.46.11):
- VoxImplantSDK/Core (= 2.46.11)
- VoxImplantSDK/Core (2.46.11):
- VoxImplantWebRTC (= 93.0.0)
- VoxImplantWebRTC (93.0.0)

DEPENDENCIES:
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
Expand Down Expand Up @@ -141,21 +141,21 @@ SPEC CHECKSUMS:
FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_callkit_voximplant: 3a3645b8265af3d61050087056ba1440ef9a5eaf
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
flutter_voip_push_notification: f28f3ce1c6b835a3fa9e833f37f33dc1291ab888
flutter_voximplant: b221289a2aa3fd7cc1b6db82dbcca516f589d3d3
flutter_voximplant: 241870e77fa607a2fd7026b58c24ea94ca50e1c1
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
Protobuf: 0cde852566359049847168e51bd1c690e0f70056
Protobuf: ced4c17d029d7566cbfc51cfb44193e4aaafae27
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
VoxImplantSDK: 349743fa9798c405ace58ca133718ad1d6b1a555
VoxImplantWebRTC: 706f77ca9df71b4013af45a3d4ed7e06185c0be6
VoxImplantSDK: d631df6bb0b858196bd71999e0325f4e5b7e75f2
VoxImplantWebRTC: 8ddd8a63d0c20afa604fec22a2552c32b0371974

PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d

COCOAPODS: 1.10.0
COCOAPODS: 1.11.3
6 changes: 3 additions & 3 deletions video_call/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -460,7 +460,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -494,7 +494,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class ActiveCallBloc extends Bloc<ActiveCallEvent, ActiveCallState> {
VICameraType cameraToSwitch = state.cameraType == VICameraType.Front
? VICameraType.Back
: VICameraType.Front;
await Voximplant().getCameraManager().selectCamera(cameraToSwitch);
await Voximplant().cameraManager.selectCamera(cameraToSwitch);
yield state.copyWith(cameraType: cameraToSwitch);
} else if (event is HoldPressedEvent) {
Platform.isIOS
Expand Down
10 changes: 6 additions & 4 deletions video_call/lib/screens/login/login_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ class _LoginPageState extends State<LoginPage> {
} else if (errorCode == 'ERROR_INVALID_PASSWORD') {
setState(() => _isPasswordValid = false);
} else {
Scaffold.of(context).showSnackBar(SnackBar(
content: Text('$errorDescription'),
backgroundColor: Colors.red,
));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('$errorDescription'),
backgroundColor: Colors.red,
),
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion video_call/lib/screens/main/main_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
content: Text(
'Please give "record audio" and "camera" permissions to make calls'),
actions: <Widget>[
FlatButton(
TextButton(
child: Text('Close'),
onPressed: () {
Navigator.of(context).pop();
Expand Down
4 changes: 2 additions & 2 deletions video_call/lib/services/call/call_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CallService {
VICallSettings callSettings = VICallSettings();
callSettings.videoFlags = VIVideoFlags(receiveVideo: true, sendVideo: true);
callSettings.preferredVideoCodec = VIVideoCodec.VP8;
_activeCall = await _client.call(callTo, callSettings);
_activeCall = await _client.call(callTo, settings: callSettings);
_callState = CallState.connecting;
_listenToActiveCallEvents();
}
Expand All @@ -67,7 +67,7 @@ class CallService {
VICallSettings callSettings = VICallSettings();
callSettings.videoFlags = VIVideoFlags(receiveVideo: true, sendVideo: true);
callSettings.preferredVideoCodec = VIVideoCodec.VP8;
await _activeCall.answer(callSettings);
await _activeCall.answer(settings: callSettings);
}

Future<void> hangup() async {
Expand Down
10 changes: 5 additions & 5 deletions video_call/lib/services/call/callkit_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class CallKitService {

try {
await Voximplant()
.getAudioDeviceManager()
.audioDeviceManager
.callKitConfigureAudioSession();
await _callService.makeCall(callTo: startCallAction.handle.value);
_callService.callKitUUID = startCallAction.callUuid;
Expand All @@ -113,7 +113,7 @@ class CallKitService {
? await _callService.hangup()
: await _callService.decline();
await Voximplant()
.getAudioDeviceManager()
.audioDeviceManager
.callKitReleaseAudioSession();
forgetCall(endCallAction.callUuid);
await endCallAction.fulfill();
Expand Down Expand Up @@ -144,7 +144,7 @@ class CallKitService {
Future<void> _answer() async {
try {
await Voximplant()
.getAudioDeviceManager()
.audioDeviceManager
.callKitConfigureAudioSession();
await _callService.answerCall();
await answerCallAction.fulfill();
Expand Down Expand Up @@ -194,10 +194,10 @@ class CallKitService {
};

_provider.providerDidActivateAudioSession = () async =>
await Voximplant().getAudioDeviceManager().callKitStartAudio();
await Voximplant().audioDeviceManager.callKitStartAudio();

_provider.providerDidDeactivateAudioSession = () async =>
await Voximplant().getAudioDeviceManager().callKitStopAudio();
await Voximplant().audioDeviceManager.callKitStopAudio();

_callController.callObserver.callChanged = (call) async {
if (call.hasEnded) {
Expand Down
14 changes: 8 additions & 6 deletions video_call/lib/widgets/widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class Widgets {
data: ThemeData(
primaryColor:
darkBackground ? VoximplantColors.white : VoximplantColors.button,
cursorColor:
darkBackground ? VoximplantColors.white : VoximplantColors.button,
// cursorColor:
// darkBackground ? VoximplantColors.white : VoximplantColors.button,
hintColor:
darkBackground ? VoximplantColors.white : VoximplantColors.button,
),
Expand Down Expand Up @@ -55,11 +55,13 @@ class Widgets {
child: SizedBox(
width: double.infinity,
height: 50,
child: RaisedButton(
textColor: VoximplantColors.white,
color: VoximplantColors.button,
onPressed: onPressed,
child: ElevatedButton(
child: Text(text),
style: ElevatedButton.styleFrom(
backgroundColor: VoximplantColors.button,
foregroundColor: VoximplantColors.white,
),
onPressed: onPressed,
),
),
);
Expand Down
34 changes: 17 additions & 17 deletions video_call/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.2"
version: "2.9.0"
bloc:
dependency: transitive
description:
Expand All @@ -28,7 +28,7 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.1"
charcode:
dependency: transitive
description:
Expand All @@ -42,14 +42,14 @@ packages:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -84,7 +84,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -178,7 +178,7 @@ packages:
name: flutter_voximplant
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.0"
version: "3.7.0"
flutter_web_plugins:
dependency: transitive
description: flutter
Expand All @@ -190,28 +190,28 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
version: "1.8.0"
nested:
dependency: transitive
description:
Expand All @@ -225,7 +225,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.2"
path_provider_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -349,7 +349,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.9.0"
stack_trace:
dependency: transitive
description:
Expand All @@ -370,21 +370,21 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
version: "0.4.12"
timezone:
dependency: transitive
description:
Expand Down Expand Up @@ -412,7 +412,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
win32:
dependency: transitive
description:
Expand All @@ -428,5 +428,5 @@ packages:
source: hosted
version: "0.1.2"
sdks:
dart: ">=2.15.0 <3.0.0"
dart: ">=2.17.0-0 <3.0.0"
flutter: ">=1.20.0"
2 changes: 1 addition & 1 deletion video_call/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
flutter_bloc: 6.0.6
equatable: 1.2.5
firebase_messaging: 7.0.3
flutter_voximplant: 2.6.0
flutter_voximplant: 3.7.0
flutter_callkit_voximplant: 1.2.0+3
flutter_voip_push_notification: 0.0.3
flutter_local_notifications: 2.0.1+1
Expand Down

0 comments on commit 18e9f9f

Please sign in to comment.