Viewbinding

app/build.gradle.kts

@@ -52,7 +52,7 @@ android {
 		}
 	}
 
-	dataBinding {
+	viewBinding {
 		isEnabled = true
 	}
 }

app/src/main/java/com/spitchenko/pokeapp/component/extensions/ContextExtensions.kt

@@ -1,9 +1,12 @@
 package com.spitchenko.pokeapp.component.extensions
 
 import android.content.Context
+import android.view.LayoutInflater
 import android.widget.Toast
 import com.spitchenko.pokeapp.component.messaging.Message
 
+val Context.layoutInflater: LayoutInflater get() = LayoutInflater.from(this)
+
 fun Context.showMessage(message: Message, duration: Duration = Duration.LONG) {
     val toastDuration = when (duration) {
         Duration.LONG -> Toast.LENGTH_LONG

app/src/main/java/com/spitchenko/pokeapp/component/databinding/adapters/ImageViewAdapters.kt → app/src/main/java/com/spitchenko/pokeapp/component/extensions/ImageViewExtensions.kt

@@ -1,17 +1,9 @@
-package com.spitchenko.pokeapp.component.databinding.adapters
+package com.spitchenko.pokeapp.component.extensions
 
 import android.widget.ImageView
-import androidx.databinding.BindingAdapter
 import com.bumptech.glide.request.RequestOptions
 import com.spitchenko.pokeapp.component.glide.GlideApp
 
-@BindingAdapter(
-    value = [
-        "imageUrl",
-        "imagePlaceholder"
-    ],
-    requireAll = false
-)
 fun ImageView.setImageGlide(
     imageUrl: String?,
     imagePlaceholder: Int?

app/src/main/java/com/spitchenko/pokeapp/component/extensions/LiveDataExtensions.kt

@@ -1,5 +1,14 @@
 package com.spitchenko.pokeapp.component.extensions
 
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
 
-fun <T> LiveData<List<T>>.size(): Int = value?.size ?: 0
+fun <T> LiveData<List<T>>.size(): Int = value?.size ?: 0
+
+inline fun <T> LiveData<T>.observe(
+    viewLifecycleOwner: LifecycleOwner,
+    crossinline action: (T) -> Unit
+) = observe(viewLifecycleOwner, Observer {
+    action(it)
+})

app/src/main/java/com/spitchenko/pokeapp/component/databinding/adapters/RecyclerViewAdapters.kt → app/src/main/java/com/spitchenko/pokeapp/component/extensions/RecyclerViewExtensions.kt

@@ -1,15 +1,13 @@
-package com.spitchenko.pokeapp.component.databinding.adapters
+package com.spitchenko.pokeapp.component.extensions
 
-import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BinderAdapter
 import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BindingClass
 import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BindingDiffUtilCallback
 
-@BindingAdapter("onScrolledToFooter")
-fun RecyclerView.setOnScrolledToFooter(action: () -> Unit) {
+inline fun RecyclerView.setOnScrolledToFooter(crossinline action: () -> Unit) {
     addOnScrollListener(
         object : RecyclerView.OnScrollListener() {
 
@@ -22,22 +20,26 @@ fun RecyclerView.setOnScrolledToFooter(action: () -> Unit) {
                     val totalItemCount = itemCount
 
                     if ((visibleItemCount + firstVisibleItemPosition) >= totalItemCount) {
-                        action()
+                        post {
+                            action()
+                        }
                     }
                 }
             }
         })
 }
 
-@BindingAdapter(value = ["bindingList", "detectMoves"], requireAll = false)
-fun RecyclerView.setBindingList(bindingList: List<BindingClass>?, detectMoves: Boolean?) {
+fun RecyclerView.setBindingList(
+    bindingList: List<BindingClass>?,
+    detectMoves: Boolean = false
+) {
     val bindingAdapter = adapter as? BinderAdapter ?: return
 
     val newOrEmptyList = bindingList.orEmpty()
 
     val bindingsDiffResult = DiffUtil.calculateDiff(
         BindingDiffUtilCallback(bindingAdapter.itemList, newOrEmptyList),
-        detectMoves ?: false
+        detectMoves
     )
 
     bindingAdapter.setItems(bindingsDiffResult, newOrEmptyList)

app/src/main/java/com/spitchenko/pokeapp/component/extensions/TextViewExtensions.kt

@@ -0,0 +1,47 @@
+package com.spitchenko.pokeapp.component.extensions
+
+import android.graphics.drawable.Drawable
+import android.widget.TextView
+import com.spitchenko.pokeapp.component.messaging.Message
+
+fun TextView.setMessage(message: Message?) {
+    text = message?.getString(context)
+}
+
+fun TextView.setTextIfDifferent(message: Message?) {
+    val newText = message?.getString(context)
+
+    if (this.text != newText) {
+        this.text = newText
+    }
+}
+
+fun TextView.setTextIfDifferent(text: CharSequence) {
+    if (this.text != text) {
+        this.text = text
+    }
+}
+
+fun TextView.setDrawables(
+    drawableStart: Drawable? = null,
+    drawableEnd: Drawable? = null,
+    drawableTop: Drawable? = null,
+    drawableBottom: Drawable? = null
+) {
+    if (isDrawableDifferent(drawableStart, CompoundDrawables.START)
+        || isDrawableDifferent(drawableEnd, CompoundDrawables.END)
+        || isDrawableDifferent(drawableTop, CompoundDrawables.TOP)
+        || isDrawableDifferent(drawableBottom, CompoundDrawables.BOTTOM)) {
+        setCompoundDrawablesRelativeWithIntrinsicBounds(drawableStart, drawableTop, drawableEnd, drawableBottom)
+    }
+}
+
+private fun TextView.isDrawableDifferent(drawable: Drawable?, compoundDrawable: CompoundDrawables) : Boolean =
+    compoundDrawablesRelative[compoundDrawable.ordinal] != drawable
+
+enum class CompoundDrawables {
+    START,
+    TOP,
+    END,
+    BOTTOM
+}

app/src/main/java/com/spitchenko/pokeapp/component/extensions/ViewExtensions.kt

@@ -0,0 +1,25 @@
+package com.spitchenko.pokeapp.component.extensions
+
+import android.view.View
+
+fun View.setVisibleOrGone(visibleOrGone: Boolean) {
+    if (visibleOrGone) {
+        if (visibility != View.VISIBLE) {
+            visibility = View.VISIBLE
+        }
+    } else {
+        if (visibility != View.GONE) {
+            visibility = View.GONE
+        }
+    }
+}
+
+fun View.setClickableAndFocusable(clickable: Boolean) {
+
+    if (isClickable != clickable) {
+        isClickable = clickable
+    }
+    if (isFocusable != clickable) {
+        isFocusable = clickable
+    }
+}

app/src/main/java/com/spitchenko/pokeapp/feature/details/presentation/ItemPokemonDetailViewHolderFactory.kt

@@ -0,0 +1,21 @@
+package com.spitchenko.pokeapp.feature.details.presentation
+
+import android.view.ViewGroup
+import androidx.viewbinding.ViewBinding
+import com.spitchenko.pokeapp.component.extensions.layoutInflater
+import com.spitchenko.pokeapp.databinding.ItemPokemonDetailBinding
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BinderAdapter
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BindingViewHolder
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.ViewHolderFactory
+
+object ItemPokemonDetailViewHolderFactory : ViewHolderFactory {
+
+    override fun create(
+        parent: ViewGroup,
+        adapter: BinderAdapter
+    ): BindingViewHolder<ViewBinding> {
+        val binding = ItemPokemonDetailBinding.inflate(parent.context.layoutInflater, parent, false)
+
+        return BindingViewHolder(binding)
+    }
+}

app/src/main/java/com/spitchenko/pokeapp/feature/details/presentation/ItemPokemonDetailViewRenderer.kt

@@ -0,0 +1,24 @@
+package com.spitchenko.pokeapp.feature.details.presentation
+
+import androidx.viewbinding.ViewBinding
+import com.spitchenko.pokeapp.component.extensions.setTextIfDifferent
+import com.spitchenko.pokeapp.databinding.ItemPokemonDetailBinding
+import com.spitchenko.pokeapp.feature.details.presentation.model.PokemonDetailUiModel
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BindingClass
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BindingViewHolder
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.ViewRenderer
+
+object ItemPokemonDetailViewRenderer : ViewRenderer {
+
+    override fun render(
+        item: BindingClass,
+        viewHolder: BindingViewHolder<ViewBinding>,
+        position: Int
+    ) {
+        if (item !is PokemonDetailUiModel || viewHolder.binding !is ItemPokemonDetailBinding) {
+            return
+        }
+
+        viewHolder.binding.pokemonDetails.setTextIfDifferent(item.text)
+    }
+}

app/src/main/java/com/spitchenko/pokeapp/feature/details/presentation/PokemonDetailsFragment.kt

@@ -1,25 +1,24 @@
 package com.spitchenko.pokeapp.feature.details.presentation
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.transition.TransitionInflater
+import com.spitchenko.pokeapp.R
 import com.spitchenko.pokeapp.component.extensions.getViewModel
-import com.spitchenko.pokeapp.component.extensions.initToolbar
 import com.spitchenko.pokeapp.component.lifecycle.ViewModelFactory
 import com.spitchenko.pokeapp.databinding.PokemonDetailsFragmentBinding
 import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BinderAdapter
 import javax.inject.Inject
 
 class PokemonDetailsFragment @Inject constructor(
-    private val pokemonDetailsUiConverter: PokemonDetailsUiConverter
-) : Fragment() {
+    private val pokemonDetailsUiConverter: PokemonDetailsUiConverter,
+    private val adapter: BinderAdapter
+) : Fragment(R.layout.pokemon_details_fragment) {
 
-    lateinit var viewModel: PokemonDetailsViewModel
+    private lateinit var viewModel: PokemonDetailsViewModel
 
     lateinit var args: PokemonDetailsFragmentArgs
 
@@ -39,16 +38,10 @@ class PokemonDetailsFragment @Inject constructor(
         })
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val binding = PokemonDetailsFragmentBinding.inflate(inflater, container, false)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val binding = PokemonDetailsFragmentBinding.bind(view)
 
-        binding.viewModel = viewModel
-
-        binding.pokemonDetailsList.adapter = BinderAdapter()
+        binding.pokemonDetailsList.adapter = adapter
 
         binding.pokemonDetailsList.addItemDecoration(
             DividerItemDecoration(
@@ -61,6 +54,15 @@ class PokemonDetailsFragment @Inject constructor(
 
         binding.toolbar.initToolbar(findNavController())
 
-        return binding.root
+        binding.pokemonDetailsList.setBindingList(viewModel.uiModel.details)
+
+        binding.headerImage.setImageGlide(
+            args.pokemonDetails.details.image?.url,
+            R.drawable.ic_pokeball_pokemon
+        )
+
+        binding.headerImage.transitionName = args.transitionName
+
+        binding.toolbar.title = args.pokemonDetails.details.name
     }
 }

app/src/main/java/com/spitchenko/pokeapp/feature/details/presentation/di/PokemonDetailsModule.kt

@@ -1,13 +1,34 @@
 package com.spitchenko.pokeapp.feature.details.presentation.di
 
+import com.spitchenko.pokeapp.feature.details.presentation.ItemPokemonDetailViewHolderFactory
+import com.spitchenko.pokeapp.feature.details.presentation.ItemPokemonDetailViewRenderer
 import com.spitchenko.pokeapp.feature.details.presentation.PokemonDetailsUiConverter
 import com.spitchenko.pokeapp.feature.details.presentation.PokemonDetailsUiConverterImpl
+import com.spitchenko.pokeapp.feature.details.presentation.model.PokemonDetailUiModel
+import com.spitchenko.pokeapp.feature.list.presentation.binderadapter.BinderAdapter
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 
 @Module
-interface PokemonDetailsModule {
+abstract class PokemonDetailsModule {
+
+    @Module
+    companion object {
+
+        @JvmStatic
+        @Provides
+        fun provideAdapter(): BinderAdapter =
+            BinderAdapter(
+                factory = mapOf(
+                    PokemonDetailUiModel.viewType to ItemPokemonDetailViewHolderFactory
+                ),
+                renders = mapOf(
+                    PokemonDetailUiModel.viewType to ItemPokemonDetailViewRenderer
+                )
+            )
+    }
 
     @Binds
-    fun bindPokemonDetailsUiConverter(impl: PokemonDetailsUiConverterImpl): PokemonDetailsUiConverter
+    abstract fun bindPokemonDetailsUiConverter(impl: PokemonDetailsUiConverterImpl): PokemonDetailsUiConverter
 }