From 5e99ebb31dce6ed61929d2417360703bb14825da Mon Sep 17 00:00:00 2001
From: BMItter <Berndus@gmx.de>
Date: Mon, 26 Apr 2021 18:51:23 +0200
Subject: [PATCH] Close keyboard when closing fragment (#2966)
---
.../ui/location/ContactDiaryAddLocationFragment.kt | 4 +---
.../contactdiary/ui/person/ContactDiaryAddPersonFragment.kt | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
index 0a27b0f12..bc0aa5196 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
@@ -58,7 +58,6 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
DialogHelper.showDialog(deleteLocationConfirmationDialog)
}
locationSaveButton.setOnClickListener {
- it.hideKeyboard()
viewModel.updateLocation(
location,
phoneNumber = binding.locationPhoneInput.text.toString(),
@@ -71,7 +70,6 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
binding.apply {
locationDeleteButton.visibility = View.GONE
locationSaveButton.setOnClickListener {
- it.hideKeyboard()
viewModel.addLocation(
phoneNumber = binding.locationPhoneInput.text.toString(),
emailAddress = binding.locationEmailInput.text.toString()
@@ -84,7 +82,6 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
locationNameInputEdit.focusAndShowKeyboard()
locationCloseButton.setOnClickListener {
- it.hideKeyboard()
viewModel.closePressed()
}
locationNameInputEdit.doAfterTextChanged {
@@ -105,6 +102,7 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
}
viewModel.shouldClose.observe2(this) {
+ binding.root.hideKeyboard()
popBackStack()
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
index 88004506f..6379a8778 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
@@ -60,7 +60,6 @@ class ContactDiaryAddPersonFragment :
DialogHelper.showDialog(deletePersonConfirmationDialog)
}
personSaveButton.setOnClickListener {
- it.hideKeyboard()
viewModel.updatePerson(
person,
phoneNumber = binding.personPhoneNumberInput.text.toString(),
@@ -72,7 +71,6 @@ class ContactDiaryAddPersonFragment :
} else {
binding.personDeleteButton.visibility = View.GONE
binding.personSaveButton.setOnClickListener {
- it.hideKeyboard()
viewModel.addPerson(
phoneNumber = binding.personPhoneNumberInput.text.toString(),
emailAddress = binding.personEmailInput.text.toString()
@@ -84,7 +82,6 @@ class ContactDiaryAddPersonFragment :
personNameInput.focusAndShowKeyboard()
personCloseButton.setOnClickListener {
- it.hideKeyboard()
viewModel.closePressed()
}
personNameInput.doAfterTextChanged {
@@ -105,6 +102,7 @@ class ContactDiaryAddPersonFragment :
}
viewModel.shouldClose.observe2(this) {
+ binding.root.hideKeyboard()
popBackStack()
}
--
GitLab