mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 02:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix EditContactFragment view and allow '+' in number dialer

Browse source
This commit is contained in:
Benoit Martins 2025-09-26 15:57:07 +02:00
parent 3b2ce2ed4b
commit a33a8666ae
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift
View file

@ -29,6 +29,7 @@ struct EditContactFragment: View {
@State private var orientation = UIDevice.current.orientation
@StateObject private var editContactViewModel: EditContactViewModel
@StateObject private var keyboard = KeyboardResponder()
@Binding var isShowEditContactFragment: Bool
@Binding var isShowDismissPopup: Bool
@ -339,7 +340,7 @@ struct EditContactFragment: View {
editContactViewModel.sipAddresses.append("")
}
}
Button(action: {
guard editContactViewModel.sipAddresses.indices.contains(index) else { return }
editContactViewModel.sipAddresses.remove(at: index)
@ -349,17 +350,15 @@ struct EditContactFragment: View {
.resizable()
.foregroundStyle(
editContactViewModel.sipAddresses[index].isEmpty && index == editContactViewModel.sipAddresses.count - 1
? Color.gray100
: Color.grayMain2c600
? Color.gray100
: Color.grayMain2c600
)
.frame(width: 25, height: 25)
.padding(.all, 10)
}
.disabled(editContactViewModel.sipAddresses[index].isEmpty && index == editContactViewModel.sipAddresses.count - 1)
.frame(maxHeight: .infinity)
}
}
}
.padding(.bottom)
@ -373,20 +372,12 @@ struct EditContactFragment: View {
TextField("phone_number", text: $editContactViewModel.phoneNumbers[index])
.default_text_style(styleSize: 15)
.textContentType(.oneTimeCode)
.keyboardType(.numberPad)
.keyboardType(.phonePad)
.frame(height: 25)
.padding(.horizontal, 20)
.padding(.vertical, 15)
.background(.white)
.cornerRadius(60)
.toolbar {
ToolbarItemGroup(placement: .keyboard) {
Spacer()
Button("Done") {
UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
}
}
}
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
@ -400,7 +391,7 @@ struct EditContactFragment: View {
}
}
}
Button(action: {
guard editContactViewModel.phoneNumbers.indices.contains(index) else { return }
editContactViewModel.phoneNumbers.remove(at: index)
@ -410,19 +401,17 @@ struct EditContactFragment: View {
.resizable()
.foregroundStyle(
editContactViewModel.phoneNumbers[index].isEmpty && index == editContactViewModel.phoneNumbers.count - 1
? Color.gray100
: Color.grayMain2c600
? Color.gray100
: Color.grayMain2c600
)
.frame(width: 25, height: 25)
.padding(.all, 10)
}
.disabled(editContactViewModel.phoneNumbers[index].isEmpty && index == editContactViewModel.phoneNumbers.count - 1)
.frame(maxHeight: .infinity)
}
.zIndex(isPhoneNumberFocused == index ? 1 : 0)
.transition(.move(edge: .top))
}
}
.padding(.bottom)

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

@ -1062,17 +1062,22 @@ struct ContentView: View {
}
if isShowEditContactFragment {
EditContactFragment(
isShowEditContactFragment: $isShowEditContactFragment,
isShowDismissPopup: $isShowDismissPopup,
isShowEditContactFragmentAddress: isShowEditContactFragmentAddress
)
VStack {
EditContactFragment(
isShowEditContactFragment: $isShowEditContactFragment,
isShowDismissPopup: $isShowDismissPopup,
isShowEditContactFragmentAddress: isShowEditContactFragmentAddress
)
.frame(height: geometry.size.height)
.onAppear {
sharedMainViewModel.displayedFriend = nil
isShowEditContactFragmentAddress = ""
}
Spacer()
}
.zIndex(3)
.transition(.opacity.combined(with: .move(edge: .bottom)))
.onAppear {
sharedMainViewModel.displayedFriend = nil
isShowEditContactFragmentAddress = ""
}
}
if isShowStartCallFragment {