Merge pull request #136 from ElchinGasymov/careehub_2iteraton_fix2

Careehub 2iteraton fix2

Author: Logomann

app/src/main/java/ru/practicum/android/diploma/data/db/converters/ConverterIntoEntity.kt

@@ -40,47 +40,47 @@ class ConverterIntoEntity {
     }
 
     fun intoPhoneEntity(vacancy: VacancyDetails): List<PhoneEntity> {
-        val listPhone = ArrayList<PhoneEntity>()
-        vacancy.contacts?.phones?.forEach { phonesModel ->
-            listPhone.add(
-                PhoneEntity(
-                    idVacancy = vacancy.id,
-                    cityCode = phonesModel.cityCode,
-                    comment = phonesModel.comment,
-                    countryCode = phonesModel.countryCode,
-                    formatted = phonesModel.formatted,
-                    number = phonesModel.number
+        return buildList {
+            vacancy.contacts?.phones?.forEach { phonesModel ->
+                add(
+                    PhoneEntity(
+                        idVacancy = vacancy.id,
+                        cityCode = phonesModel.cityCode,
+                        comment = phonesModel.comment,
+                        countryCode = phonesModel.countryCode,
+                        formatted = phonesModel.formatted,
+                        number = phonesModel.number
+                    )
                 )
-            )
+            }
         }
-        return listPhone
     }
 
     fun intoKeySkillEntity(vacancy: VacancyDetails): List<KeySkillEntity> {
-        val listKey = ArrayList<KeySkillEntity>()
-        vacancy.keySkills?.forEach { keySkillsModel ->
-            listKey.add(
-                KeySkillEntity(
-                    idVacancy = vacancy.id,
-                    name = keySkillsModel.name
+        return buildList {
+            vacancy.keySkills?.forEach { keySkillsModel ->
+                add(
+                    KeySkillEntity(
+                        idVacancy = vacancy.id,
+                        name = keySkillsModel.name
+                    )
                 )
-            )
+            }
         }
-        return listKey
     }
 
     fun intoAreaEntity(vacancy: VacancyDetails): List<AreaEntity> {
-        val listArea = ArrayList<AreaEntity>()
-        vacancy.area?.areas?.forEach { area ->
-            listArea.add(
-                AreaEntity(
-                    idVacancy = vacancy.id,
-                    idArea = area.id,
-                    name = area.name,
-                    countryId = area.countryId
+        return buildList {
+            vacancy.area?.areas?.forEach { area ->
+                add(
+                    AreaEntity(
+                        idVacancy = vacancy.id,
+                        idArea = area.id,
+                        name = area.name,
+                        countryId = area.countryId
+                    )
                 )
-            )
+            }
         }
-        return listArea
     }
 }

app/src/main/java/ru/practicum/android/diploma/di/DataModule.kt

@@ -20,7 +20,7 @@ import ru.practicum.android.diploma.data.network.RetrofitNetworkClient
 const val HISTORY_MAIN = "historyMain"
 const val BASE_URL = "https://api.hh.ru/"
 val dataModule = module {
-    factory<NetworkClient> {
+    single<NetworkClient> {
         RetrofitNetworkClient(
             hhApiService = get(),
             context = androidContext()

app/src/main/java/ru/practicum/android/diploma/presentation/viewmodels/SearchViewModel.kt

@@ -25,6 +25,9 @@ class SearchViewModel(
         const val TWO_SECONDS = 2000L
     }
 
+    private val _vacanciesLiveData = MutableLiveData<List<Vacancy>>()
+    val vacanciesLiveData: LiveData<List<Vacancy>> get() = _vacanciesLiveData
+
     private val screenStateLiveData = MutableLiveData<SearchScreenState>()
     private var currentPage = 0
     private var maxPages = 1
@@ -41,7 +44,7 @@ class SearchViewModel(
         false
     )
     private val _vacancyIsClickable = MutableLiveData(true)
-    var vacancyIsClickable: LiveData<Boolean> = _vacancyIsClickable
+    val vacancyIsClickable: LiveData<Boolean> = _vacancyIsClickable
 
     private val vacancySearchDebounce =
         debounce<String>(TWO_SECONDS, viewModelScope, true) { query ->
@@ -69,6 +72,10 @@ class SearchViewModel(
         return mainRequest
     }
 
+    private fun updateVacancies(vacancies: List<Vacancy>) {
+        _vacanciesLiveData.postValue(vacancies)
+    }
+
     private fun searchVacancies(request: String) {
         if (request != this.mainRequest) {
             currentPage = 0
@@ -182,11 +189,13 @@ class SearchViewModel(
             if (data.isEmpty()) {
                 setScreenState(SearchScreenState.NothingFound)
             } else {
-                setScreenState(
-                    SearchScreenState.Success(data, quantity)
-                )
+                setScreenState(SearchScreenState.Success(data, quantity))
+                updateVacancies(data)
             }
         } else {
+            val currentVacancies = _vacanciesLiveData.value.orEmpty().toMutableList()
+            currentVacancies.addAll(data)
+            updateVacancies(currentVacancies)
             setScreenState(SearchScreenState.LoadNextPage(data))
         }
     }

app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt

@@ -10,6 +10,7 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.os.bundleOf
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
@@ -39,11 +40,8 @@ class SearchFragment : Fragment() {
     private val binding: FragmentSearchBinding by viewBinding(CreateMethod.INFLATE)
     private val viewModel by viewModel<SearchViewModel>()
 
-    private val listOfVacancies = ArrayList<Vacancy>()
     private val adapter = VacancyAdapter({ setOnItemClicked(it) })
 
-    private var amountVacancies = 0
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -55,12 +53,16 @@ class SearchFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        if (listOfVacancies.isNotEmpty()) {
-            binding.searchDefaultPlaceholder.isVisible = false
-            binding.textUnderSearch.text = getCorrectAmountText(amountVacancies)
-            binding.textUnderSearch.isVisible = true
+        viewModel.vacanciesLiveData.observe(viewLifecycleOwner) { vacancies ->
+            adapter.setVacancies(vacancies)
+            binding.textUnderSearch.text = getCorrectAmountText(vacancies.size)
+            binding.textUnderSearch.isVisible = vacancies.isNotEmpty()
+            binding.searchDefaultPlaceholder.isGone = vacancies.isNotEmpty()
         }
 
+        binding.searchRecycleView.layoutManager = LinearLayoutManager(requireContext())
+        binding.searchRecycleView.adapter = adapter
+
         binding.filterIc.setOnClickListener {
             findNavController().navigate(R.id.action_searchFragment_to_filterFragment)
         }
@@ -126,14 +128,10 @@ class SearchFragment : Fragment() {
 
                 is SearchScreenState.LoadNextPage -> {
                     binding.progressBarNextPage.isVisible = false
-                    listOfVacancies.addAll(state.vacancies)
-                    adapter.setVacancies(listOfVacancies)
                 }
 
                 SearchScreenState.Loading -> {
-                    amountVacancies = 0
-                    listOfVacancies.clear()
-                    adapter.setVacancies(listOfVacancies)
+                    clearList()
                     removePlaceholders()
                     startProgressBar()
                 }
@@ -144,14 +142,8 @@ class SearchFragment : Fragment() {
                 }
 
                 is SearchScreenState.Success -> {
-                    listOfVacancies.clear()
                     stopProgressBar()
                     removePlaceholders()
-                    listOfVacancies.addAll(state.vacancies)
-                    adapter.setVacancies(listOfVacancies)
-                    amountVacancies = state.found
-                    binding.textUnderSearch.text = getCorrectAmountText(amountVacancies)
-                    binding.textUnderSearch.isVisible = true
                 }
 
                 SearchScreenState.LoadingNextPage -> {
@@ -188,9 +180,6 @@ class SearchFragment : Fragment() {
         }
         viewModel.getOptions()
 
-        val vacanciesRecyclerView = binding.searchRecycleView
-        vacanciesRecyclerView.layoutManager = LinearLayoutManager(requireContext())
-        vacanciesRecyclerView.adapter = adapter
         initResultListeners()
     }
 
@@ -204,12 +193,10 @@ class SearchFragment : Fragment() {
     }
 
     private fun clearList() {
-        listOfVacancies.clear()
-        adapter.setVacancies(listOfVacancies)
+        adapter.setVacancies(emptyList())
     }
 
     private fun removePlaceholders() {
-        binding.textUnderSearch.isVisible = false
         binding.noVacancyToShow.isVisible = false
         binding.noVacancyToShowText.isVisible = false
         binding.noConnectionText.isVisible = false

app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt

@@ -143,14 +143,16 @@ class VacancyFragment : Fragment() {
         binding.experience.text = vacancyDetails.experience?.name
         binding.scheduleEmployment.text = vacancyDetails.employment?.name
         binding.dutiesSubtitle.text = Html.fromHtml(vacancyDetails.description, Html.FROM_HTML_MODE_COMPACT)
+
         if (vacancyDetails.keySkills?.isNotEmpty() == true) {
             binding.keySkillsGroup.isVisible = true
-            var keySkillsText = ""
+            val keySkillsBuilder = StringBuilder()
             vacancyDetails.keySkills.forEach {
-                keySkillsText += StringBuilder().append("• ").append(it.name).append("\n").toString()
+                keySkillsBuilder.append("• ").append(it.name).append("\n")
             }
-            binding.coreSkills.text = keySkillsText
+            binding.coreSkills.text = keySkillsBuilder.toString()
         }
+
         setVacancyContacts(vacancyDetails)
         binding.vacancyDetailsLayout.isVisible = true