123 add update Vacancy (#145)

AntaOtk · Nov 16, 2023 · 300d49d · 300d49d
1 parent eee0375
commit 300d49d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
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
@@ -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
@@ -121,17 +121,31 @@
         app:hintTextColor="@color/blue"
         app:layout_constraintTop_toBottomOf="@+id/industry_textInputLayout">
 
-        <EditText
-            android:id="@+id/salary_et"
-            style="@style/editTextInputStyle"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/ys_display_regular"
-            android:hint="@string/input_the_amount"
-            android:inputType="number"
-            android:textColor="@color/black"
-            android:textSize="@dimen/text_16"
-            tools:ignore="TouchTargetSizeCheck" />
+            android:layout_height="match_parent">
+
+            <EditText
+                android:id="@+id/salary_et"
+                style="@style/editTextInputStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/ys_display_regular"
+                android:hint="@string/input_the_amount"
+                android:inputType="number"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_16"
+                tools:ignore="TouchTargetSizeCheck" />
+
+            <ImageView
+                android:id="@+id/clearButtonIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|end"
+                android:src="@drawable/ic_clear_et"
+                android:visibility="gone"/>
+        </FrameLayout>
+
     </com.google.android.material.textfield.TextInputLayout>
 
     <TextView