diff --git a/ios/Podfile b/ios/Podfile index b30a428b..3b20de57 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -63,6 +63,7 @@ target 'Runner' do # Keep pod path relative so it can be checked into Podfile.lock. pod 'Flutter', :path => 'Flutter' + pod 'OpenTok' # Plugin Pods diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 392290a0..ab95eb7c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -22,6 +22,7 @@ PODS: - local_auth (0.0.1): - Flutter - MTBBarcodeScanner (5.0.11) + - OpenTok (2.15.3) - "permission_handler (5.0.0+hotfix.5)": - Flutter - Reachability (3.2) @@ -50,6 +51,7 @@ DEPENDENCIES: - hexcolor (from `.symlinks/plugins/hexcolor/ios`) - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`) - local_auth (from `.symlinks/plugins/local_auth/ios`) + - OpenTok - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`) @@ -59,8 +61,9 @@ DEPENDENCIES: - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) SPEC REPOS: - https://cdn.cocoapods.org/: + trunk: - MTBBarcodeScanner + - OpenTok - Reachability - SwiftProtobuf @@ -112,6 +115,7 @@ SPEC CHECKSUMS: imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb + OpenTok: fde03ecc5ea31fe0a453242847c4ee1f47e1d735 permission_handler: 6226fcb78b97c7c7458a95c7346a11d5184fec12 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d @@ -122,6 +126,6 @@ SPEC CHECKSUMS: url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c -PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83 +PODFILE CHECKSUM: ad71cae222b2dc22820a69b80873417b35fef79e COCOAPODS: 1.9.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8548667e..9488fd99 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + AF260AD724A4922F006461D3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF260AD624A4922F006461D3 /* ViewController.swift */; }; B650DC3076E9D70CB188286A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A5F83B23AB032D1E096663 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ @@ -46,6 +47,7 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9D4B7DB43C6A6C849D2387CE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + AF260AD624A4922F006461D3 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../../../../AndroidStudioProjects/open_tok_app/ios/Runner/ViewController.swift; sourceTree = ""; }; E698D7B14B12DF768FE47A1A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -104,6 +106,7 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( + AF260AD624A4922F006461D3 /* ViewController.swift */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -278,6 +281,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + AF260AD724A4922F006461D3 /* ViewController.swift in Sources */, 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, ); @@ -307,7 +311,6 @@ /* Begin XCBuildConfiguration section */ 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -385,7 +388,6 @@ }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -441,7 +443,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 70693e4a..5e32b165 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,5 +1,9 @@ import UIKit import Flutter +import OpenTok + +// Created by Mohammad Aljammal & Elham Rababah on 24/06/20. +// Copyright © 2020 Cloud. All rights reserved. @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { @@ -7,7 +11,47 @@ import Flutter _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { + + + let controller : FlutterViewController = window?.rootViewController as! FlutterViewController + let videoCallChannel = FlutterMethodChannel(name: "Dr.cloudSolution/videoCall", + binaryMessenger: controller.binaryMessenger) + videoCallChannel.setMethodCallHandler({ + (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in + switch call.method { + case "openVideoCall": + do { + let arguments = call.arguments as? NSDictionary + let kApiKey = arguments!["kApiKey"] as? String + let kSessionId = arguments!["kSessionId"] as? String + let kToken = arguments!["kToken"] as? String + let appLang = arguments!["appLang"] as? String + self.openVideoChat(result: result,kApiKey: kApiKey!,kSessionId:kSessionId!,kToken: kToken!, appLang: appLang!) + } + default: + result(FlutterMethodNotImplemented) + } + }) + GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + + + private func openVideoChat(result: FlutterResult,kApiKey: String, kSessionId: String,kToken: String,appLang:String) { + + let storyboard = UIStoryboard(name: "Main", bundle: nil) + let identifier = "ViewControllerNav" + let navVC = storyboard.instantiateViewController(withIdentifier: identifier) as! UINavigationController + let videoVC = navVC.viewControllers.first as! ViewController + videoVC.kApiKey=kApiKey + videoVC.kSessionId=kSessionId + videoVC.kToken=kToken + videoVC.navigationController?.setNavigationBarHidden(true, animated: false) + navVC.modalPresentationStyle = .fullScreen + window.rootViewController?.present(navVC, animated: true, completion: nil) + + + } } diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset copy/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset copy/Contents.json new file mode 100755 index 00000000..d8db8d65 --- /dev/null +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset copy/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json new file mode 100755 index 00000000..da4a164c --- /dev/null +++ b/ios/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/hangUpButton.imageset/Contents.json b/ios/Runner/Assets.xcassets/hangUpButton.imageset/Contents.json new file mode 100755 index 00000000..4d6f2ca5 --- /dev/null +++ b/ios/Runner/Assets.xcassets/hangUpButton.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "call.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "call-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "call-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/hangUpButton.imageset/call-1.png b/ios/Runner/Assets.xcassets/hangUpButton.imageset/call-1.png new file mode 100755 index 00000000..27bb36fb Binary files /dev/null and b/ios/Runner/Assets.xcassets/hangUpButton.imageset/call-1.png differ diff --git a/ios/Runner/Assets.xcassets/hangUpButton.imageset/call-2.png b/ios/Runner/Assets.xcassets/hangUpButton.imageset/call-2.png new file mode 100755 index 00000000..fc00f4f9 Binary files /dev/null and b/ios/Runner/Assets.xcassets/hangUpButton.imageset/call-2.png differ diff --git a/ios/Runner/Assets.xcassets/hangUpButton.imageset/call.png b/ios/Runner/Assets.xcassets/hangUpButton.imageset/call.png new file mode 100755 index 00000000..34475399 Binary files /dev/null and b/ios/Runner/Assets.xcassets/hangUpButton.imageset/call.png differ diff --git a/ios/Runner/Assets.xcassets/localVideoMutedBg.imageset/Contents.json b/ios/Runner/Assets.xcassets/localVideoMutedBg.imageset/Contents.json new file mode 100755 index 00000000..88daa0cb --- /dev/null +++ b/ios/Runner/Assets.xcassets/localVideoMutedBg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "cameramute.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/localVideoMutedBg.imageset/cameramute.png b/ios/Runner/Assets.xcassets/localVideoMutedBg.imageset/cameramute.png new file mode 100755 index 00000000..4778bb24 Binary files /dev/null and b/ios/Runner/Assets.xcassets/localVideoMutedBg.imageset/cameramute.png differ diff --git a/ios/Runner/Assets.xcassets/muteButton.imageset/Contents.json b/ios/Runner/Assets.xcassets/muteButton.imageset/Contents.json new file mode 100755 index 00000000..dc221130 --- /dev/null +++ b/ios/Runner/Assets.xcassets/muteButton.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mic_enabled.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mic_enabled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mic_enabled-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled-1.png b/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled-1.png new file mode 100755 index 00000000..6dccd908 Binary files /dev/null and b/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled-2.png b/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled-2.png new file mode 100755 index 00000000..5d9aa677 Binary files /dev/null and b/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled.png b/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled.png new file mode 100755 index 00000000..e42895e2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/muteButton.imageset/mic_enabled.png differ diff --git a/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/Contents.json b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/Contents.json new file mode 100755 index 00000000..d59e22e8 --- /dev/null +++ b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mic_disabled.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mic_disabled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mic_disabled-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled-1.png b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled-1.png new file mode 100755 index 00000000..115381b6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled-2.png b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled-2.png new file mode 100755 index 00000000..3603df75 Binary files /dev/null and b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled.png b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled.png new file mode 100755 index 00000000..4101f849 Binary files /dev/null and b/ios/Runner/Assets.xcassets/muteButtonSelected.imageset/mic_disabled.png differ diff --git a/ios/Runner/Assets.xcassets/speakerOff.imageset/Contents.json b/ios/Runner/Assets.xcassets/speakerOff.imageset/Contents.json new file mode 100755 index 00000000..38db78c6 --- /dev/null +++ b/ios/Runner/Assets.xcassets/speakerOff.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "audio_enabled.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "audio_enabled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "audio_enabled-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled-1.png b/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled-1.png new file mode 100755 index 00000000..3edbf65b Binary files /dev/null and b/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled-2.png b/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled-2.png new file mode 100755 index 00000000..f2e25f75 Binary files /dev/null and b/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled.png b/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled.png new file mode 100755 index 00000000..8dca1127 Binary files /dev/null and b/ios/Runner/Assets.xcassets/speakerOff.imageset/audio_enabled.png differ diff --git a/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/Contents.json b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/Contents.json new file mode 100755 index 00000000..866d9a2d --- /dev/null +++ b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "audio_disabled.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "audio_disabled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "audio_disabled-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled-1.png b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled-1.png new file mode 100755 index 00000000..0bfea871 Binary files /dev/null and b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled-2.png b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled-2.png new file mode 100755 index 00000000..3afc77ce Binary files /dev/null and b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled.png b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled.png new file mode 100755 index 00000000..13038522 Binary files /dev/null and b/ios/Runner/Assets.xcassets/speakerOffSelected.imageset/audio_disabled.png differ diff --git a/ios/Runner/Assets.xcassets/switchCameraButton.imageset/Contents.json b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/Contents.json new file mode 100755 index 00000000..dce44933 --- /dev/null +++ b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "flip_enabled-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "flip_enabled.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "flip_enabled-1.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled-1.png b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled-1.png new file mode 100755 index 00000000..152dc10e Binary files /dev/null and b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled-2.png b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled-2.png new file mode 100755 index 00000000..b17a1c82 Binary files /dev/null and b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled.png b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled.png new file mode 100755 index 00000000..e28e69b2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/switchCameraButton.imageset/flip_enabled.png differ diff --git a/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/Contents.json b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/Contents.json new file mode 100755 index 00000000..457b9984 --- /dev/null +++ b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "flip_disapled.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "flip_disapled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "flip_disapled-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled-1.png b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled-1.png new file mode 100755 index 00000000..7d3b6067 Binary files /dev/null and b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled-1.png differ diff --git a/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled-2.png b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled-2.png new file mode 100755 index 00000000..5226029e Binary files /dev/null and b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled-2.png differ diff --git a/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled.png b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled.png new file mode 100755 index 00000000..37e68084 Binary files /dev/null and b/ios/Runner/Assets.xcassets/switchCameraButtonSelected.imageset/flip_disapled.png differ diff --git a/ios/Runner/Assets.xcassets/videoMuteButton.imageset/Contents.json b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/Contents.json new file mode 100755 index 00000000..14969431 --- /dev/null +++ b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "video_enabled-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "video_enabled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "video_enabled.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled-1.png b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled-1.png new file mode 100755 index 00000000..0d9912ea Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled-2.png b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled-2.png new file mode 100755 index 00000000..8dc7b66d Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled.png b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled.png new file mode 100755 index 00000000..23331e30 Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMuteButton.imageset/video_enabled.png differ diff --git a/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/Contents.json b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/Contents.json new file mode 100755 index 00000000..c68d9986 --- /dev/null +++ b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "video_disanabled.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "video_disanabled-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "video_disanabled-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled-1.png b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled-1.png new file mode 100755 index 00000000..cd0faff8 Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled-1.png differ diff --git a/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled-2.png b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled-2.png new file mode 100755 index 00000000..5c20c7bd Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled-2.png differ diff --git a/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled.png b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled.png new file mode 100755 index 00000000..c89b763e Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMuteButtonSelected.imageset/video_disanabled.png differ diff --git a/ios/Runner/Assets.xcassets/videoMutedIndicator.imageset/Contents.json b/ios/Runner/Assets.xcassets/videoMutedIndicator.imageset/Contents.json new file mode 100755 index 00000000..c029fd7a --- /dev/null +++ b/ios/Runner/Assets.xcassets/videoMutedIndicator.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "cameraoff_mainVideo.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/videoMutedIndicator.imageset/cameraoff_mainVideo.png b/ios/Runner/Assets.xcassets/videoMutedIndicator.imageset/cameraoff_mainVideo.png new file mode 100755 index 00000000..29fcf060 Binary files /dev/null and b/ios/Runner/Assets.xcassets/videoMutedIndicator.imageset/cameraoff_mainVideo.png differ diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard old mode 100644 new mode 100755 index f3c28516..95f4bd10 --- a/ios/Runner/Base.lproj/Main.storyboard +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -1,8 +1,10 @@ - - + + + - + + @@ -14,13 +16,281 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 4c18587e..d0d77b5e 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -45,5 +45,12 @@ UIViewControllerBasedStatusBarAppearance + + NSCameraUsageDescription + ${PRODUCT_NAME} always camera use + + NSMicrophoneUsageDescription + ${PRODUCT_NAME} always Microphone use + diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index c541236b..7950b0d6 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -90,8 +90,9 @@ class _DashboardScreenState extends State { //TODO Change the location of it VideoChannel.openVideoCallScreen(kApiKey: '46803224', - kSessionId: '1_MX40NjgwMzIyNH5-MTU5Mjk4ODM4NTIwMH5tdjZpNmY2S2REa3c0ZUFobWxpS2RVdmt-fg', - kToken: 'T1==cGFydG5lcl9pZD00NjgwMzIyNCZzaWc9MzM4NWRkMjEzOTU5ZTdhYzliM2M0MTI1YTBkYzI4MDNhNTJhNjQ0ZTpzZXNzaW9uX2lkPTFfTVg0ME5qZ3dNekl5Tkg1LU1UVTVNams0T0RNNE5USXdNSDV0ZGpacE5tWTJTMlJFYTNjMFpVRm9iV3hwUzJSVmRtdC1mZyZjcmVhdGVfdGltZT0xNTkyOTg4NDE3Jm5vbmNlPTAuMzQ1MjQ4NTU3MzgxNzY4NSZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNTkzMDc0ODE2JmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9',); + kSessionId: '2_MX40NjgwMzIyNH5-MTU5MzA3NDk2MjQxNH5QekwrY1oyaHdnbjVSaENkemlvNFVqeEJ-fg', + kToken: 'T1==cGFydG5lcl9pZD00NjgwMzIyNCZzaWc9ZTUxZGI0NGJiNjhjOGY2YzZkZGVjNTQ0M2Q5ZDJkODY2MjBlYjJjYTpzZXNzaW9uX2lkPTJfTVg0ME5qZ3dNekl5Tkg1LU1UVTVNekEzTkRrMk1qUXhOSDVRZWt3clkxb3lhSGRuYmpWU2FFTmtlbWx2TkZWcWVFSi1mZyZjcmVhdGVfdGltZT0xNTkzMDc1MDA3Jm5vbmNlPTAuNjQ2OTA2MTAwMTU0ODY3NSZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNTkzNjc5ODA2JmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9', + ); // showCupertinoPicker( // context: context, diff --git a/pubspec.lock b/pubspec.lock index 71445e35..ded299e4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -155,6 +155,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" code_builder: dependency: transitive description: @@ -246,6 +253,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.1.4" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" fixnum: dependency: transitive description: @@ -350,13 +364,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.12" imei_plugin: dependency: "direct main" description: @@ -468,7 +475,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.7.0" pedantic: dependency: transitive description: @@ -497,13 +504,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" platform: dependency: transitive description: @@ -676,7 +676,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.16" timing: dependency: transitive description: @@ -740,13 +740,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.6.1" yaml: dependency: transitive description: