mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue with abort confirmation dialog in new contact fragment

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-31 14:20:23 +02:00
parent 72e7445f87
commit 157c233ab1
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
View file

@ -24,6 +24,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.OnBackPressedCallback
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.UiThread
@ -59,6 +60,12 @@ class NewContactFragment : GenericFragment() {
R.id.newContactFragment
)
private val backPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
showAbortConfirmationDialog()
}
}
private val pickMedia = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
if (uri != null) {
Log.i("$TAG Picture picked [$uri]")
@ -84,6 +91,7 @@ class NewContactFragment : GenericFragment() {
savedInstanceState: Bundle?
): View {
binding = ContactNewOrEditFragmentBinding.inflate(layoutInflater)
return binding.root
}
@ -94,6 +102,11 @@ class NewContactFragment : GenericFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
requireActivity().onBackPressedDispatcher.addCallback(
viewLifecycleOwner,
backPressedCallback
)
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = viewModel
@ -110,8 +123,7 @@ class NewContactFragment : GenericFragment() {
}
binding.setBackClickListener {
goBack()
// TODO: confirmation dialog
showAbortConfirmationDialog()
}
binding.setPickImageClickListener {
@ -121,6 +133,7 @@ class NewContactFragment : GenericFragment() {
viewModel.saveChangesEvent.observe(viewLifecycleOwner) {
it.consume { refKey ->
if (refKey.isNotEmpty()) {
backPressedCallback.isEnabled = false
goBack()
sharedViewModel.showContactEvent.value = Event(refKey)
} else {
@ -157,6 +170,11 @@ class NewContactFragment : GenericFragment() {
sharedViewModel.contactEditorReadyToBeDisplayedEvent.value = Event(true)
}
override fun onResume() {
super.onResume()
backPressedCallback.isEnabled = true
}
private fun addCell(model: NewOrEditNumberOrAddressModel) {
val inflater = requireContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val parent = if (model.isSip) binding.sipAddresses else binding.phoneNumbers
@ -201,6 +219,7 @@ class NewContactFragment : GenericFragment() {
model.confirmRemovalEvent.observe(viewLifecycleOwner) {
it.consume {
backPressedCallback.isEnabled = false
goBack()
dialog.dismiss()
}