diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchFragment.kt index 47d84c2f..a5fd85c3 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchFragment.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchFragment.kt @@ -67,18 +67,18 @@ class SearchFragment : BaseFragment() { } override fun afterTextChanged(s: Editable?) { - viewModel.validateSearchContent() + viewModel.validateSearchClearButtonVisibility() } }) - viewModel.searchValidation.observe(viewLifecycleOwner) { isValid -> - binding.ivSearchCancel.visibility = if (isValid) View.VISIBLE else View.GONE + viewModel.searchClearVisibility.observe(viewLifecycleOwner) { isValid -> + binding.ivSearchClear.visibility = if (isValid) View.VISIBLE else View.GONE } } private fun setTextClearButtonClickListener() { with(binding) { - ivSearchCancel.setOnClickListener { + ivSearchClear.setOnClickListener { etSearchBar.text.clear() } } diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchViewModel.kt index 8cd144c2..2881a1e0 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchViewModel.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/search/SearchViewModel.kt @@ -8,10 +8,10 @@ class SearchViewModel : BaseViewModel() { private val _searchContent: MutableLiveData = MutableLiveData() val searchContent: MutableLiveData = _searchContent - private val _searchValidation: MutableLiveData = MutableLiveData() - val searchValidation: LiveData = _searchValidation + private val _searchClearVisibility: MutableLiveData = MutableLiveData() + val searchClearVisibility: LiveData = _searchClearVisibility - fun validateSearchContent() { - _searchValidation.value = !_searchContent.value.isNullOrEmpty() + fun validateSearchClearButtonVisibility() { + _searchClearVisibility.value = !_searchContent.value.isNullOrEmpty() } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search_cancel.xml b/app/src/main/res/drawable/ic_search_clear.xml similarity index 100% rename from app/src/main/res/drawable/ic_search_cancel.xml rename to app/src/main/res/drawable/ic_search_clear.xml diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index db5f523a..7be9149f 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -46,18 +46,18 @@ android:textColor="@color/blue300" android:textColorHint="@color/gray300" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="@id/iv_search_cancel" + app:layout_constraintEnd_toEndOf="@id/iv_search_clear" app:layout_constraintStart_toEndOf="@id/iv_search_icon" app:layout_constraintTop_toTopOf="parent" />