From 054d6224919331d961225fe0788e37ed2956649c Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 15 Jan 2024 16:03:39 +0100 Subject: [PATCH] Resolve merge conflicts after git rebase --- Linphone/Core/CoreContext.swift | 2 - Linphone/Localizable.xcstrings | 9 - Linphone/UI/Call/CallView.swift | 318 +++----------------------------- 3 files changed, 28 insertions(+), 301 deletions(-) diff --git a/Linphone/Core/CoreContext.swift b/Linphone/Core/CoreContext.swift index 593cea6b8..3e579d97c 100644 --- a/Linphone/Core/CoreContext.swift +++ b/Linphone/Core/CoreContext.swift @@ -123,8 +123,6 @@ final class CoreContext: ObservableObject { self.mCore.videoCaptureEnabled = true self.mCore.videoDisplayEnabled = true - try? self.mCore.start() - // Create a Core listener to listen for the callback we need // In this case, we want to know about the account registration status self.mCoreSuscriptions.insert(self.mCore.publisher?.onConfiguringStatus?.postOnMainQueue { (cbVal: (core: Core, status: Config.ConfiguringState, message: String)) in diff --git a/Linphone/Localizable.xcstrings b/Linphone/Localizable.xcstrings index ec823b015..7b82fa2c6 100644 --- a/Linphone/Localizable.xcstrings +++ b/Linphone/Localizable.xcstrings @@ -3,9 +3,6 @@ "strings" : { "" : { - }, - " " : { - }, " et " : { @@ -337,9 +334,6 @@ }, "Incoming call" : { - }, - "Incoming Call" : { - }, "Information" : { @@ -418,9 +412,6 @@ }, "Outgoing call" : { - }, - "Outgoing Call" : { - }, "password" : { "extractionState" : "manual", diff --git a/Linphone/UI/Call/CallView.swift b/Linphone/UI/Call/CallView.swift index 5de1d37d8..a70340599 100644 --- a/Linphone/UI/Call/CallView.swift +++ b/Linphone/UI/Call/CallView.swift @@ -51,280 +51,6 @@ struct CallView: View { GeometryReader { geo in if #available(iOS 16.0, *), idiom != .pad { innerView(geometry: geo) - .sheet(isPresented: - .constant( - telecomManager.callStarted - && !fullscreenVideo - && !hideButtonsSheet - && idiom != .pad - && !(orientation == .landscapeLeft || orientation == .landscapeRight || UIScreen.main.bounds.size.width > UIScreen.main.bounds.size.height) - ) - ) { - GeometryReader { _ in - VStack(spacing: 0) { - HStack(spacing: 12) { - Button { - callViewModel.terminateCall() - } label: { - Image("phone-disconnect") - .renderingMode(.template) - .resizable() - .foregroundStyle(.white) - .frame(width: 32, height: 32) - - } - .frame(width: 90, height: 60) - .background(Color.redDanger500) - .cornerRadius(40) - - Spacer() - - Button { - callViewModel.toggleVideo() - } label: { - Image(telecomManager.remoteVideo ? "video-camera" : "video-camera-slash") - .renderingMode(.template) - .resizable() - .foregroundStyle((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray500 : .white) - .frame(width: 32, height: 32) - - } - .frame(width: 60, height: 60) - .background((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray600 : Color.gray500) - .cornerRadius(40) - .disabled(callViewModel.isPaused || telecomManager.isPausedByRemote) - - Button { - callViewModel.toggleMuteMicrophone() - } label: { - Image(callViewModel.micMutted ? "microphone-slash" : "microphone") - .renderingMode(.template) - .resizable() - .foregroundStyle(callViewModel.micMutted ? .black : .white) - .frame(width: 32, height: 32) - - } - .frame(width: 60, height: 60) - .background(callViewModel.micMutted ? .white : Color.gray500) - .cornerRadius(40) - - Button { - if AVAudioSession.sharedInstance().availableInputs != nil - && !AVAudioSession.sharedInstance().availableInputs!.filter({ $0.portType.rawValue.contains("Bluetooth") }).isEmpty { - - hideButtonsSheet = true - - DispatchQueue.global().asyncAfter(deadline: .now() + 0.5) { - audioRouteSheet = true - } - } else { - do { - try AVAudioSession.sharedInstance().overrideOutputAudioPort(AVAudioSession.sharedInstance().currentRoute.outputs.filter({ $0.portType.rawValue == "Speaker" }).isEmpty ? .speaker : .none) - } catch _ { - - } - } - - } label: { - Image(imageAudioRoute) - .renderingMode(.template) - .resizable() - .foregroundStyle(.white) - .frame(width: 32, height: 32) - .onAppear(perform: getAudioRouteImage) - .onReceive(pub) { _ in - self.getAudioRouteImage() - } - - } - .frame(width: 60, height: 60) - .background(Color.gray500) - .cornerRadius(40) - } - .frame(height: geo.size.height * 0.15) - .padding(.horizontal, 20) - .padding(.top, -6) - - HStack(spacing: 0) { - VStack { - Button { - } label: { - Image("phone-transfer") - .renderingMode(.template) - .resizable() - .foregroundStyle(Color.gray500) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background(Color.gray600) - .cornerRadius(40) - .disabled(true) - - Text("Transfer") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - - VStack { - Button { - } label: { - Image("phone-plus") - .renderingMode(.template) - .resizable() - .foregroundStyle(Color.gray500) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background(Color.gray600) - .cornerRadius(40) - .disabled(true) - - Text("New call") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - - VStack { - Button { - } label: { - Image("phone-list") - .renderingMode(.template) - .resizable() - .foregroundStyle(Color.gray500) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background(Color.gray600) - .cornerRadius(40) - .disabled(true) - - Text("Call list") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - - VStack { - Button { - } label: { - Image("dialer") - .renderingMode(.template) - .resizable() - .foregroundStyle(Color.gray500) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background(Color.gray600) - .cornerRadius(40) - .disabled(true) - - Text("Dialer") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - } - .frame(height: geo.size.height * 0.15) - - HStack(spacing: 0) { - VStack { - Button { - } label: { - Image("chat-teardrop-text") - .renderingMode(.template) - .resizable() - //.foregroundStyle((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray500 : .white) - .foregroundStyle(Color.gray500) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - //.background((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray600 : Color.gray500) - .background(Color.gray600) - .cornerRadius(40) - //.disabled(callViewModel.isPaused || telecomManager.isPausedByRemote) - .disabled(true) - - Text("Messages") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - - VStack { - Button { - callViewModel.togglePause() - } label: { - Image(callViewModel.isPaused ? "play" : "pause") - .renderingMode(.template) - .resizable() - .foregroundStyle(telecomManager.isPausedByRemote ? Color.gray500 : .white) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background(telecomManager.isPausedByRemote ? Color.gray600 : (callViewModel.isPaused ? Color.greenSuccess500 : Color.gray500)) - .cornerRadius(40) - .disabled(telecomManager.isPausedByRemote) - - Text("Pause") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - - VStack { - Button { - callViewModel.toggleRecording() - } label: { - Image("record-fill") - .renderingMode(.template) - .resizable() - .foregroundStyle((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray500 : .white) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray600 : (callViewModel.isRecording ? Color.redDanger500 : Color.gray500)) - .cornerRadius(40) - .disabled(callViewModel.isPaused || telecomManager.isPausedByRemote) - - Text("Record") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - - VStack { - Button { - } label: { - Image("video-camera") - .renderingMode(.template) - .resizable() - .foregroundStyle(.white) - .frame(width: 32, height: 32) - } - .frame(width: 60, height: 60) - .background(Color.gray500) - .cornerRadius(40) - - Text("Disposition") - .foregroundStyle(.white) - .default_text_style(styleSize: 15) - } - .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) - .hidden() - } - .frame(height: geo.size.height * 0.15) - - Spacer() - } - .frame(maxHeight: .infinity, alignment: .top) - .presentationBackground(.black) - .presentationDetents([.fraction(0.1), .fraction(0.45)]) - .interactiveDismissDisabled() - .presentationBackgroundInteraction(.enabled) - } - } .sheet(isPresented: $audioRouteSheet, onDismiss: { audioRouteSheet = false hideButtonsSheet = false @@ -904,12 +630,13 @@ struct CallView: View { Image("phone-transfer") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("Transfer") .foregroundStyle(.white) @@ -923,12 +650,13 @@ struct CallView: View { Image("phone-plus") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("New call") .foregroundStyle(.white) @@ -942,12 +670,13 @@ struct CallView: View { Image("phone-list") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("Call list") .foregroundStyle(.white) @@ -961,18 +690,21 @@ struct CallView: View { Image("dialer") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("Dialer") .foregroundStyle(.white) .default_text_style(styleSize: 15) } .frame(width: geo.size.width * 0.25, height: geo.size.width * 0.25) + + } .frame(height: geo.size.height * 0.15) @@ -1071,12 +803,13 @@ struct CallView: View { Image("phone-transfer") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("Transfer") .foregroundStyle(.white) @@ -1090,12 +823,13 @@ struct CallView: View { Image("phone-plus") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("New call") .foregroundStyle(.white) @@ -1109,12 +843,13 @@ struct CallView: View { Image("phone-list") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("Call list") .foregroundStyle(.white) @@ -1128,12 +863,13 @@ struct CallView: View { Image("dialer") .renderingMode(.template) .resizable() - .foregroundStyle(.white) + .foregroundStyle(Color.gray500) .frame(width: 32, height: 32) } .frame(width: 60, height: 60) - .background(Color.gray500) + .background(Color.gray600) .cornerRadius(40) + .disabled(true) Text("Dialer") .foregroundStyle(.white) @@ -1141,6 +877,8 @@ struct CallView: View { } .frame(width: geo.size.width * 0.125, height: geo.size.width * 0.125) + + VStack { Button { } label: {