Merge branch 'develop' into feature/bnav_blur

GoetzDeBouville · Dec 25, 2023 · 794599b · 794599b
2 parents e1bb213 + 5a3b0ef
commit 794599b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/app/src/main/java/ru/practicum/android/diploma/search/ui/fragments/SearchFragment.kt b/app/src/main/java/ru/practicum/android/diploma/search/ui/fragments/SearchFragment.kt
@@ -180,6 +180,9 @@ class SearchFragment : BaseFragment<FragmentSearchBinding, SearchViewModel>(Frag
     private fun showData(content: SearchScreenState.Content) {
         vacancyListAdapter.setScrollLoadingEnabled(content.currentPage != content.totalPages - 1)
         vacancyListAdapter.setShowScrollRefresh(false)
+        if (content.currentPage == 0) {
+            vacancyListAdapter.clearAll()
+        }
         vacancyListAdapter.setData(content.vacancies, content.currentPage)
         binding.vacancyCount.apply {
             text = resources.getQuantityString(

diff --git a/app/src/main/java/ru/practicum/android/diploma/search/ui/fragments/VacancyAdapter.kt b/app/src/main/java/ru/practicum/android/diploma/search/ui/fragments/VacancyAdapter.kt
@@ -162,6 +162,13 @@ class VacancyAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
+    fun clearAll() {
+        val diffCallback = VacancyDiffCallback(dataList, emptyList())
+        val diffResult = DiffUtil.calculateDiff(diffCallback)
+        dataList.clear()
+        diffResult.dispatchUpdatesTo(this)
+    }
+
     fun clearPageCounter() {
         currentPage = 0
     }

diff --git a/app/src/main/java/ru/practicum/android/diploma/search/ui/viewmodels/SearchViewModel.kt b/app/src/main/java/ru/practicum/android/diploma/search/ui/viewmodels/SearchViewModel.kt
@@ -177,7 +177,9 @@ open class SearchViewModel @Inject constructor(
 
     fun handleInteraction(interaction: ViewModelInteractionState) {
         var newSearchSettings = searchSettings
-        isLastUpdatePage = false
+        // переменная костыль, чтобы обработать setQuery при возвращении на фрагмент
+        // в таких случаях нам надо восстановить всё как было.
+        val t = isLastUpdatePage; isLastUpdatePage = false
         when (interaction) {
             is ViewModelInteractionState.setRegion -> {
                 newSearchSettings = newSearchSettings.copy(currentPage = 0)
@@ -191,27 +193,26 @@ open class SearchViewModel @Inject constructor(
 
             is ViewModelInteractionState.setSalary -> {
                 newSearchSettings = newSearchSettings.copy(currentPage = 0)
-                newSearchSettings =
-                    newSearchSettings.copy(currentSalary = interaction.salary)
+                newSearchSettings = newSearchSettings.copy(currentSalary = interaction.salary)
             }
 
             is ViewModelInteractionState.setSalaryOnly -> {
                 newSearchSettings = newSearchSettings.copy(currentPage = 0)
-                newSearchSettings =
-                    newSearchSettings.copy(currentSalaryOnly = interaction.salaryOnly)
+                newSearchSettings = newSearchSettings.copy(currentSalaryOnly = interaction.salaryOnly)
             }
 
             is ViewModelInteractionState.setQuery -> {
+                if (interaction.query == searchSettings.currentQuery) {
+                    isLastUpdatePage = t; return
+                }
                 showSnackBar = false
                 newSearchSettings = newSearchSettings.copy(currentPage = 0)
-                newSearchSettings =
-                    newSearchSettings.copy(currentQuery = interaction.query)
+                newSearchSettings = newSearchSettings.copy(currentQuery = interaction.query)
             }
 
             is ViewModelInteractionState.setPage -> {
                 isLastUpdatePage = true
-                newSearchSettings =
-                    newSearchSettings.copy(currentPage = interaction.page)
+                newSearchSettings = newSearchSettings.copy(currentPage = interaction.page)
             }
         }
         if (newSearchSettings != searchSettings) {