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

Call view fixes

Browse source
This commit is contained in:
Benoit Martins 2024-05-03 10:43:51 +02:00
parent cfe3bef32d
commit 517ff07904
3 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,9 @@ class CallViewModel: ObservableObject {
if core.currentCall != nil && core.currentCall!.remoteAddress != nil {
self.currentCall = core.currentCall
self.callSuscriptions.removeAll()
self.mConferenceSuscriptions.removeAll()
var videoDisplayedTmp = false
do {
let params = try core.createCallParams(call: self.currentCall)

11
Linphone/UI/Main/ContentView.swift
View file

@ -784,7 +784,7 @@ struct ContentView: View {
showingDialer: $showingDialer,
resetCallView: {callViewModel.resetCallView()}
)
.zIndex(4)
.zIndex(6)
.transition(.opacity.combined(with: .move(edge: .bottom)))
.sheet(isPresented: $showingDialer) {
DialerBottomSheet(
@ -803,7 +803,7 @@ struct ContentView: View {
showingDialer: $showingDialer,
resetCallView: {callViewModel.resetCallView()}
)
.zIndex(4)
.zIndex(6)
.transition(.opacity.combined(with: .move(edge: .bottom)))
.halfSheet(showSheet: $showingDialer) {
DialerBottomSheet(
@ -938,11 +938,16 @@ struct ContentView: View {
.transition(.scale.combined(with: .move(edge: .top)))
.onAppear {
callViewModel.resetCallView()
if callViewModel.calls.count >= 1 {
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
callViewModel.resetCallView()
}
}
}
}
ToastView()
.zIndex(3)
.zIndex(6)
}
}
.onAppear {

47
Linphone/UI/Main/History/Fragments/DialerBottomSheet.swift
View file

@ -58,7 +58,7 @@ struct DialerBottomSheet: View {
.padding(.trailing)
} else {
Capsule()
.fill(Color.grayMain2c300)
.fill(currentCall != nil ? .white : Color.grayMain2c300)
.frame(width: 75, height: 5)
.padding(15)
}
@ -66,6 +66,7 @@ struct DialerBottomSheet: View {
if currentCall != nil {
HStack {
Text(dialerField)
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 25)
.frame(maxWidth: .infinity)
.padding(.horizontal, 10)
@ -76,7 +77,9 @@ struct DialerBottomSheet: View {
dialerField = String(dialerField.dropLast())
} label: {
Image("backspace-fill")
.renderingMode(.template)
.resizable()
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c500)
.frame(width: 32, height: 32)
}
@ -106,10 +109,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("1")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -130,10 +134,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("2")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -154,10 +159,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("3")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -180,10 +186,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("4")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -204,10 +211,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("5")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -228,10 +236,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("6")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -255,10 +264,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("7")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -279,10 +289,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("8")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -303,10 +314,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("9")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -330,10 +342,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("*")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -345,14 +358,16 @@ struct DialerBottomSheet: View {
} label: {
ZStack {
Text("0")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 75)
.padding(.top, -15)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
Text("+")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 20)
.multilineTextAlignment(.center)
.frame(width: 60, height: 85)
@ -384,10 +399,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("0")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -409,10 +425,11 @@ struct DialerBottomSheet: View {
}
} label: {
Text("#")
.foregroundStyle(currentCall != nil ? .white : Color.grayMain2c600)
.default_text_style(styleSize: 32)
.multilineTextAlignment(.center)
.frame(width: 60, height: 60)
.background(.white)
.background(currentCall != nil ? Color.gray500 : .white)
.clipShape(Circle())
.shadow(color: .black.opacity(0.2), radius: 4)
}
@ -474,7 +491,7 @@ struct DialerBottomSheet: View {
.frame(maxWidth: .infinity)
.frame(maxHeight: .infinity)
}
.background(Color.gray100)
.background(currentCall != nil ? Color.gray600 : Color.gray100)
.frame(maxWidth: .infinity)
.frame(maxHeight: .infinity)
.onRotate { newOrientation in