fixed films general screen architecture

Created by: Aprekek

features/films/general/src/main/java/ru/sequenia/testtask/features/films/general/presentation/contracts/FilmsGeneralContract.kt

@@ -15,7 +15,7 @@ interface FilmsGeneralContract : BaseContract {
 
 	interface Presenter : BaseContract.Presenter<FilmsGeneralContract.View> {
 
-		fun loadFilmsData()
+		fun onInitialized()
 		fun onReload()
 		fun onFilmSelect(film: FilmAnnotation)
 		fun onGenreFilterSelect(genreFilter: Long)

features/films/general/src/main/java/ru/sequenia/testtask/features/films/general/presentation/presenter/FilmsGeneralPresenter.kt

@@ -39,7 +39,7 @@ class FilmsGeneralPresenter(
 		view.bind(eventsDispatcher)
 	}
 
-	override fun loadFilmsData() {
+	override fun onInitialized() {
 		eventsDispatcher.dispatchEvent { showLoading() }
 
 		if (wasInitialized && !hasError) {

features/films/general/src/main/java/ru/sequenia/testtask/features/films/general/presentation/screen/FilmsGeneralScreen.kt

 package ru.sequenia.testtask.features.films.general.presentation.screen
 
 import com.github.terrakok.cicerone.androidx.FragmentScreen
-import ru.sequenia.testtask.features.films.general.presentation.ui.FilmsGeneralFragment
+import ru.sequenia.testtask.features.films.general.ui.FilmsGeneralFragment
 
 fun getFilmsGeneralScreen() = FragmentScreen { FilmsGeneralFragment.getInstance() }
\ No newline at end of file

features/films/general/src/main/java/ru/sequenia/testtask/features/films/general/presentation/ui/adapters/HeaderAdapter.kt

-package ru.sequenia.testtask.features.films.general.presentation.ui.adapters
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import ru.sequenia.testtask.features.films.general.presentation.ui.adapters.viewholders.HeaderViewHolder
-
-class HeaderAdapter : ListAdapter<String, HeaderViewHolder>(HeaderDiffUtil()) {
-
-	companion object {
-
-		const val VIEW_TYPE = 0
-	}
-
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HeaderViewHolder =
-		HeaderViewHolder.from(parent)
-
-	override fun onBindViewHolder(holder: HeaderViewHolder, position: Int) {
-		holder.bind(getItem(position))
-	}
-
-	override fun getItemViewType(position: Int): Int {
-		return VIEW_TYPE
-	}
-
-	private class HeaderDiffUtil : DiffUtil.ItemCallback<String>() {
-
-		override fun areItemsTheSame(oldItem: String, newItem: String) =
-			oldItem == newItem
-
-		override fun areContentsTheSame(oldItem: String, newItem: String) =
-			oldItem == newItem
-	}
-}
\ No newline at end of file

features/films/general/src/main/java/ru/sequenia/testtask/features/films/general/ui/adapters/decorators/FilmItemDecorator.kt

-package ru.sequenia.testtask.features.films.general.presentation.ui.adapters.decorators
+package ru.sequenia.testtask.features.films.general.ui.adapters.decorators
 
 import android.graphics.Rect
 import android.view.View
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.RecyclerView
-import ru.sequenia.testtask.features.films.general.presentation.ui.adapters.FilmsAdapter
+import ru.sequenia.testtask.features.films.general.ui.adapters.FilmsAdapter
 
 class FilmItemDecorator(
 	private val spanCount: Int,

[Mikhail Shamburov]

Merged by: Aprekek at 2022-03-23 12:55:22 UTC