Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt renaming

Browse source
This commit is contained in:
ismailgulek 2021-06-29 15:10:16 +03:00
parent d720a6fa6b
commit d9a8631c7e
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Riot/Modules/Call/CallViewController.m
View file

@ -231,7 +231,7 @@ CallAudioRouteMenuViewDelegate>
- (void)showAudioDeviceOptions
{
MXAudioOutputRouter *router = self.mxCall.audioOutputRouter;
MXiOSAudioOutputRouter *router = self.mxCall.audioOutputRouter;
if (router.isAnyExternalDeviceConnected)
{
self.slidingModalPresenter = [SlidingModalPresenter new];
@ -251,10 +251,10 @@ CallAudioRouteMenuViewDelegate>
// toggle between built-in and loud speakers
switch (router.currentRoute.routeType)
{
case MXAudioOutputRouteTypeBuiltIn:
case MXiOSAudioOutputRouteTypeBuiltIn:
[router changeCurrentRouteTo:router.loudSpeakersRoute];
break;
case MXAudioOutputRouteTypeLoudSpeakers:
case MXiOSAudioOutputRouteTypeLoudSpeakers:
[router changeCurrentRouteTo:router.builtInRoute];
break;
default:
@ -268,17 +268,17 @@ CallAudioRouteMenuViewDelegate>
{
switch (self.mxCall.audioOutputRouter.currentRoute.routeType)
{
case MXAudioOutputRouteTypeBuiltIn:
case MXiOSAudioOutputRouteTypeBuiltIn:
[self.speakerButton setImage:[UIImage imageNamed:@"call_speaker_off_icon"]
forState:UIControlStateNormal];
break;
case MXAudioOutputRouteTypeLoudSpeakers:
case MXiOSAudioOutputRouteTypeLoudSpeakers:
[self.speakerButton setImage:[UIImage imageNamed:@"call_speaker_on_icon"]
forState:UIControlStateNormal];
break;
case MXAudioOutputRouteTypeExternalWired:
case MXAudioOutputRouteTypeExternalBluetooth:
case MXAudioOutputRouteTypeExternalCar:
case MXiOSAudioOutputRouteTypeExternalWired:
case MXiOSAudioOutputRouteTypeExternalBluetooth:
case MXiOSAudioOutputRouteTypeExternalCar:
[self.speakerButton setImage:[UIImage imageNamed:@"call_speaker_external_icon"]
forState:UIControlStateNormal];
break;
@ -769,7 +769,7 @@ CallAudioRouteMenuViewDelegate>
#pragma mark - CallAudioRouteMenuViewDelegate
- (void)callAudioRouteMenuView:(CallAudioRouteMenuView *)view didSelectRoute:(MXAudioOutputRoute *)route
- (void)callAudioRouteMenuView:(CallAudioRouteMenuView *)view didSelectRoute:(MXiOSAudioOutputRoute *)route
{
[self.mxCall.audioOutputRouter changeCurrentRouteTo:route];
[self.slidingModalPresenter dismissWithAnimated:YES completion:nil];

10
Riot/Modules/Call/Views/CallAudioRouteMenuView.swift
View file

@ -18,7 +18,7 @@ import Foundation
@objc
protocol CallAudioRouteMenuViewDelegate: AnyObject {
func callAudioRouteMenuView(_ view: CallAudioRouteMenuView, didSelectRoute route: MXAudioOutputRoute)
func callAudioRouteMenuView(_ view: CallAudioRouteMenuView, didSelectRoute route: MXiOSAudioOutputRoute)
}
@objcMembers
@ -30,8 +30,8 @@ class CallAudioRouteMenuView: UIView {
static let stackViewCornerRadius: CGFloat = 13
}
let routes: [MXAudioOutputRoute]
let currentRoute: MXAudioOutputRoute?
let routes: [MXiOSAudioOutputRoute]
let currentRoute: MXiOSAudioOutputRoute?
private lazy var stackView: UIStackView = {
let view = UIStackView(frame: bounds.inset(by: Constants.stackViewInsets))
@ -47,8 +47,8 @@ class CallAudioRouteMenuView: UIView {
weak var delegate: CallAudioRouteMenuViewDelegate?
init(withRoutes routes: [MXAudioOutputRoute],
currentRoute: MXAudioOutputRoute?) {
init(withRoutes routes: [MXiOSAudioOutputRoute],
currentRoute: MXiOSAudioOutputRoute?) {
self.routes = routes
self.currentRoute = currentRoute
super.init(frame: CGRect(origin: .zero, size: CGSize(width: UIScreen.main.bounds.width, height: CGFloat(routes.count) * Constants.routeHeight)))

4
Riot/Modules/Call/Views/CallAudioRouteView.swift
View file

@ -24,13 +24,13 @@ class CallAudioRouteView: UIView {
@IBOutlet private weak var selectedIconImageView: UIImageView!
@IBOutlet private weak var bottomLineView: UIView!
let route: MXAudioOutputRoute
let route: MXiOSAudioOutputRoute
private let isSelected: Bool
private let isBottomLineHidden: Bool
private var theme: Theme = ThemeService.shared().theme
init(withRoute route: MXAudioOutputRoute,
init(withRoute route: MXiOSAudioOutputRoute,
isSelected: Bool,
isBottomLineHidden: Bool = false) {
self.route = route