witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Add bottom sheet in calls list fragment

Browse source
This commit is contained in:
benoit.martins 2024-01-23 17:28:20 +01:00 • committed by Benoit Martins
parent 05cc8277d8
commit 4320f9dcce
3 changed files with 129 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Linphone/Localizable.xcstrings
View file

@ -226,9 +226,6 @@
},
"Contacts" : {
},
"Content" : {
},
"Continue" : {
@ -322,6 +319,9 @@
},
"First name*" : {
},
"Hang up call" : {
},
"Headphones" : {
@ -480,6 +480,9 @@
},
"Remove picture" : {
},
"Resume" : {
},
"Resuming" : {
@ -546,9 +549,6 @@
},
"This contact will be deleted definitively." : {
},
"Title" : {
},
"TLS" : {

124
Linphone/UI/Call/Fragments/CallsListFragment.swift
View file

@ -18,22 +18,25 @@
*/
import SwiftUI
import linphonesw
struct CallsListFragment: View {
@ObservedObject private var coreContext = CoreContext.shared
@ObservedObject private var contactsManager = ContactsManager.shared
private var idiom: UIUserInterfaceIdiom { UIDevice.current.userInterfaceIdiom }
@ObservedObject var callViewModel: CallViewModel
@State private var delayedColor = Color.white
@State var isShowCallsListBottomSheet: Bool = false
@Binding var isShowCallsListFragment: Bool
var body: some View {
ZStack {
VStack(spacing: 1) {
Rectangle()
.foregroundColor(delayedColor)
.edgesIgnoringSafeArea(.top)
@ -69,13 +72,127 @@ struct CallsListFragment: View {
.padding(.bottom, 4)
.background(.white)
callsList
if #available(iOS 16.0, *), idiom != .pad {
callsList
.sheet(isPresented: $isShowCallsListBottomSheet, onDismiss: {
}) {
innerBottomSheet()
.presentationDetents([.fraction(0.2)])
}
} else {
callsList
.halfSheet(showSheet: $isShowCallsListBottomSheet) {
innerBottomSheet()
} onDismiss: {}
}
}
.background(.white)
}
.navigationBarHidden(true)
}
@ViewBuilder
func innerBottomSheet() -> some View {
VStack(spacing: 0) {
if callViewModel.selectedCall != nil {
Button(action: {
if callViewModel.currentCall != nil && callViewModel.selectedCall!.callLog!.callId == callViewModel.currentCall!.callLog!.callId {
if callViewModel.currentCall!.state == .StreamsRunning {
do {
try callViewModel.currentCall!.pause()
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
callViewModel.isPaused = true
}
} catch {
}
} else {
do {
try callViewModel.currentCall!.resume()
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
callViewModel.isPaused = false
}
} catch {
}
}
isShowCallsListBottomSheet = false
} else {
TelecomManager.shared.setHeldOtherCallsWithCore(exceptCallid: "")
TelecomManager.shared.setHeld(call: callViewModel.selectedCall!, hold: callViewModel.selectedCall!.state == .StreamsRunning)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
callViewModel.resetCallView()
}
}
}, label: {
HStack {
HStack {
Image((callViewModel.selectedCall!.state == .PausedByRemote
|| callViewModel.selectedCall!.state == .Pausing
|| callViewModel.selectedCall!.state == .Paused) ? "play" : "pause")
.resizable()
.frame(width: 30, height: 30)
}
.frame(width: 35, height: 30)
.background(.clear)
.cornerRadius(40)
Text((callViewModel.selectedCall!.state == .PausedByRemote
|| callViewModel.selectedCall!.state == .Pausing
|| callViewModel.selectedCall!.state == .Paused) ? "Resume" : "Pause")
.default_text_style(styleSize: 15)
Spacer()
}
})
.padding(.horizontal, 30)
.frame(maxHeight: .infinity)
VStack {
Divider()
}
.frame(maxWidth: .infinity)
Button(action: {
do {
try callViewModel.selectedCall!.terminate()
isShowCallsListBottomSheet = false
} catch _ {
}
}, label: {
HStack {
HStack {
Image("phone-disconnect")
.renderingMode(.template)
.resizable()
.foregroundStyle(.white)
.frame(width: 20, height: 20)
}
.frame(width: 35, height: 30)
.background(Color.redDanger500)
.cornerRadius(40)
Text("Hang up call")
.foregroundStyle(Color.redDanger500)
.default_text_style_white(styleSize: 15)
Spacer()
}
})
.padding(.horizontal, 30)
.frame(maxHeight: .infinity)
}
}
.frame(maxHeight: .infinity)
}
@Sendable private func delayColor() async {
try? await Task.sleep(nanoseconds: 250_000_000)
delayedColor = Color.orangeMain500
@ -217,9 +334,10 @@ struct CallsListFragment: View {
callViewModel.resetCallView()
}
}
}
.onLongPressGesture(minimumDuration: 0.2) {
callViewModel.selectedCall = callViewModel.calls[index]
isShowCallsListBottomSheet = true
}
}
}

3
Linphone/UI/Call/ViewModel/CallViewModel.swift
View file

@ -42,7 +42,8 @@ class CallViewModel: ObservableObject {
@Published var upperCaseAuthTokenToListen = ""
@Published var isMediaEncrypted: Bool = false
@Published var isZrtpPq: Bool = false
@Published var isRemoteDeviceTrusted: Bool = false
@Published var isRemoteDeviceTrusted: Bool = false
@Published var selectedCall: Call? = nil
var calls: [Call] = []