diff --git a/app/src/main/java/ru/practicum/android/diploma/presentation/filter/SettingsFilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/presentation/filter/SettingsFilterFragment.kt index f3e107026a..117225dd2e 100644 --- a/app/src/main/java/ru/practicum/android/diploma/presentation/filter/SettingsFilterFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/presentation/filter/SettingsFilterFragment.kt @@ -64,12 +64,20 @@ class SettingsFilterFragment : Fragment() { override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { inputText = s?.toString() ?: "" viewModel.checkChanges(inputText) + if (binding.salaryEt.text.isNotEmpty()) { + binding.clearButtonIcon.isVisible = true + } } override fun afterTextChanged(s: Editable?) { } } simpleTextWatcher?.let { binding.salaryEt.addTextChangedListener(it) } + binding.clearButtonIcon.setOnClickListener { + binding.salaryEt.setText("") + binding.clearButtonIcon.isVisible = false + + } binding.confirmButton.setOnClickListener { viewModel.setSalary(inputText) @@ -110,6 +118,7 @@ class SettingsFilterFragment : Fragment() { append(areaName) }) else binding.workPlaceEt.setText(countryName) binding.industryTextInputEditText.setText(filters.industry?.name ?: "") + binding.clearButtonIcon.isVisible = !filters.preferSalary.isNullOrEmpty() binding.salaryEt.setText(filters.preferSalary) binding.doNotShowWithoutSalaryCheckBox.isChecked = filters.isIncludeSalary } diff --git a/app/src/main/res/layout/fragment_settings_filters.xml b/app/src/main/res/layout/fragment_settings_filters.xml index b184eda1a6..bb9a2ec46e 100644 --- a/app/src/main/res/layout/fragment_settings_filters.xml +++ b/app/src/main/res/layout/fragment_settings_filters.xml @@ -121,17 +121,31 @@ app:hintTextColor="@color/blue" app:layout_constraintTop_toBottomOf="@+id/industry_textInputLayout"> - + android:layout_height="match_parent"> + + + + + +