detekt fix9

ElchinGasymov · Aug 21, 2024 · 2b1f787 · 2b1f787
1 parent b4a8d00
commit 2b1f787
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterPlaceOfWorkFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterPlaceOfWorkFragment.kt
@@ -144,7 +144,7 @@ class FilterPlaceOfWorkFragment : Fragment() {
             val json = bundle.getString(REGION_BUNDLE_KEY).toString()
             val type = object : TypeToken<Region>() {}.type
             region = Gson().fromJson(json, type)
-            getCountryName(region)
+            viewModel.getCountryName(region, false)
             viewModel.setRegionName(region)
         }
 
@@ -173,15 +173,11 @@ class FilterPlaceOfWorkFragment : Fragment() {
 
     private fun initButtonListeners() {
         binding.selectPlaceOfWorkToolbar.setNavigationOnClickListener { findNavController().navigateUp() }
-        binding.applyButton.setOnClickListener { saveFilters() }
+        binding.applyButton.setOnClickListener { viewModel.saveFields(country, region) }
         binding.countryTextInput.setOnClickListener { navigateToCountrySelection() }
         binding.regionTextInput.setOnClickListener { navigateToRegionSelection() }
     }
 
-    private fun getCountryName(region: Region) {
-        viewModel.getCountryName(region, false)
-    }
-
     private fun initTextBehaviour() {
         binding.countryTextInput.doOnTextChanged { text, _, _, _ ->
             updateCountryHintAppearance(text?.isNotEmpty() == true)
@@ -191,10 +187,6 @@ class FilterPlaceOfWorkFragment : Fragment() {
         }
     }
 
-    private fun saveFilters() {
-        viewModel.saveFields(country, region)
-    }
-
     private fun setNoCountryEndIcon() {
         binding.countryLayout.apply {
             setEndIconDrawable(R.drawable.ic_arrow_forward_14px)

diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt
@@ -26,8 +26,8 @@ import ru.practicum.android.diploma.R
 import ru.practicum.android.diploma.databinding.FragmentSearchBinding
 import ru.practicum.android.diploma.domain.models.Vacancy
 import ru.practicum.android.diploma.presentation.viewmodels.SearchViewModel
-import ru.practicum.android.diploma.ui.fragments.FilterFragment.Companion.FILTER_REQUEST_KEY
 import ru.practicum.android.diploma.ui.state.SearchScreenState
+import ru.practicum.android.diploma.util.FILTER_REQUEST_KEY
 import ru.practicum.android.diploma.util.ResponseData
 import ru.practicum.android.diploma.util.adapter.VacancyAdapter