Unify call screen methods, use UIViewController

This commit is contained in:
ismailgulek
2021-04-02 14:22:03 +03:00
parent 11a8db2639
commit 4a53e96dcb
10 changed files with 71 additions and 214 deletions
+9 -38
View File
@@ -4378,16 +4378,20 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[self presentViewController:viewController animated:YES completion:completion];
}
- (void)callPresenter:(CallPresenter *)presenter dismissCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion
- (void)callPresenter:(CallPresenter *)presenter dismissCallViewController:(UIViewController *)viewController completion:(void (^)(void))completion
{
// Check whether the call view controller is actually presented
if (viewController.presentingViewController)
{
[viewController.presentingViewController dismissViewControllerAnimated:YES completion:^{
if (viewController.shouldPromptForStunServerFallback)
if ([viewController isKindOfClass:CallViewController.class])
{
[self promptForStunServerFallback];
CallViewController *callVC = (CallViewController *)viewController;
if (callVC.shouldPromptForStunServerFallback)
{
[self promptForStunServerFallback];
}
}
if (completion)
@@ -4497,7 +4501,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
}
}
- (void)callPresenter:(CallPresenter *)presenter enterPipForCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion
- (void)callPresenter:(CallPresenter *)presenter enterPipForCallViewController:(UIViewController *)viewController completion:(void (^)(void))completion
{
// Check whether the call view controller is actually presented
if (viewController.presentingViewController)
@@ -4513,7 +4517,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
}
}
- (void)callPresenter:(CallPresenter *)presenter exitPipForCallViewController:(CallViewController *)viewController completion:(void (^)(void))completion
- (void)callPresenter:(CallPresenter *)presenter exitPipForCallViewController:(UIViewController *)viewController completion:(void (^)(void))completion
{
if (@available(iOS 13.0, *))
{
@@ -4523,39 +4527,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[self presentViewController:viewController animated:YES completion:completion];
}
- (void)callPresenter:(CallPresenter *)presenter presentGroupCallViewController:(JitsiViewController *)viewController completion:(void (^)(void))completion
{
if (@available(iOS 13.0, *))
{
viewController.modalPresentationStyle = UIModalPresentationFullScreen;
}
[self presentViewController:viewController animated:YES completion:completion];
}
- (void)callPresenter:(CallPresenter *)presenter dismissGroupCallViewController:(JitsiViewController *)viewController completion:(void (^)(void))completion
{
// Check whether the call view controller is actually presented
if (viewController.presentingViewController)
{
[viewController.presentingViewController dismissViewControllerAnimated:YES completion:^{
if (completion)
{
completion();
}
}];
}
else
{
if (completion)
{
completion();
}
}
}
#pragma mark - CallBarDelegate
- (void)callBarDidTap:(CallBar *)callBar