Skip to content

Commit

Permalink
Data Binding on Characters Activity #37
Browse files Browse the repository at this point in the history
delete charactersUiModel because implemented databinding.
Create diferent bindingAdapter for use in xml.
Create Event for use navigation.

javier.mcardona@gmail.com
  • Loading branch information
jamacado committed Jan 14, 2020
1 parent 920735e commit 54b316e
Show file tree
Hide file tree
Showing 12 changed files with 218 additions and 122 deletions.
4 changes: 4 additions & 0 deletions presentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apply plugin: 'com.google.gms.google-services'
apply plugin: 'io.fabric'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply from: "$rootDir/detekt.gradle"

android {
Expand All @@ -23,6 +24,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
dataBinding{
enabled true
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,46 +1,32 @@
package com.architect.coders.mu8.characters

import android.os.Bundle
import android.view.View.GONE
import android.view.View.VISIBLE
import android.widget.ProgressBar
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.databinding.DataBindingUtil
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.architect.coders.mu8.R
import com.architect.coders.mu8.characters.CharactersUiModel.Content
import com.architect.coders.mu8.characters.CharactersUiModel.Loading
import com.architect.coders.mu8.characters.CharactersUiModel.Navigation
import com.architect.coders.mu8.characters.detail.CharactersDetailActivity
import com.architect.coders.mu8.data.DataApp
import com.architect.coders.mu8.data.characters.CharactersMapper
import com.architect.coders.mu8.data.characters.CharactersRepositoryImpl
import com.architect.coders.mu8.data.mapper.common.UrlsMapper
import com.architect.coders.mu8.databinding.ActivityCharactersBinding
import com.architect.coders.mu8.utils.EventObserver
import com.architect.coders.mu8.utils.getViewModel
import com.architect.coders.mu8.utils.startActivity
import com.architect.codes.mu8.characters.CharactersUseCaseImpl

class CharactersActivity : AppCompatActivity() {

private val toolbar: Toolbar by lazy { findViewById<Toolbar>(R.id.toolbar) }
private val progress: ProgressBar by lazy { findViewById<ProgressBar>(R.id.progress) }
private val recycler: RecyclerView by lazy { findViewById<RecyclerView>(R.id.recycler) }

private lateinit var viewModel: CharactersViewModel
private lateinit var adapter: CharactersAdapter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_characters)

setSupportActionBar(toolbar)
supportActionBar?.setDisplayShowTitleEnabled(false)

val toolbarTitle = findViewById<TextView>(R.id.toolbar_title)
toolbarTitle.text = getString(R.string.characters_name)
val binding: ActivityCharactersBinding =
DataBindingUtil.setContentView(this, R.layout.activity_characters)

viewModel = getViewModel {
CharactersViewModel(
Expand All @@ -50,22 +36,28 @@ class CharactersActivity : AppCompatActivity() {
)
}

adapter = CharactersAdapter(viewModel::onCharacterClicked)
recycler.layoutManager = LinearLayoutManager(this)
recycler.adapter = adapter
binding.viewmodel = viewModel
binding.lifecycleOwner = this

viewModel.model.observe(this, Observer(::updateUi))
}

private fun updateUi(model: CharactersUiModel) {
progress.visibility = if (model == Loading) VISIBLE else GONE
setSupportActionBar(binding.toolbar.toolbarWidget)
supportActionBar?.setDisplayShowTitleEnabled(false)
binding.toolbar.toolbarTitle.text = getString(R.string.characters_name)

when (model) {
is Content -> {
adapter.characters = model.characters
progress.visibility = GONE
}
is Navigation -> startActivity<CharactersDetailActivity> {}
adapter = CharactersAdapter(viewModel::onCharacterClicked)
binding.recycler.layoutManager = LinearLayoutManager(this)
binding.recycler.adapter = adapter

with(viewModel.characters){
observe(this@CharactersActivity, Observer {
value?.let {
adapter.characters = it
}
})
}

viewModel.navigateToCharacter.observe(
this,
EventObserver { startActivity<CharactersDetailActivity> {} }
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.architect.coders.mu8.R
import com.architect.coders.mu8.databinding.ViewCharacterBinding
import com.architect.coders.mu8.utils.bindingInflate
import com.architect.coders.mu8.utils.inflate
import com.architect.coders.mu8.utils.loadUrl
import com.architect.codes.mu8.characters.Character
Expand All @@ -21,25 +23,22 @@ class CharactersAdapter(
)

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return ViewHolder(parent.inflate(R.layout.view_character, false))
return ViewHolder(parent.bindingInflate(R.layout.view_character, false))
}

override fun getItemCount(): Int = characters.size

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val character = characters[position]
holder.dataBinding.character = character
holder.bind(character)
holder.itemView.setOnClickListener { listener(character) }
}

class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {

private var characterPicture: ImageView = itemView.findViewById(R.id.image_character_picture)
private var characterName: TextView = itemView.findViewById(R.id.text_character_name)
class ViewHolder(val dataBinding: ViewCharacterBinding) : RecyclerView.ViewHolder(dataBinding.root) {

fun bind(character: Character) {
characterPicture.loadUrl(character.thumbnailUrl)
characterName.text = character.name
dataBinding.imageCharacterPicture.loadUrl(character.thumbnailUrl)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.architect.coders.mu8.characters

import androidx.databinding.BindingAdapter
import androidx.recyclerview.widget.RecyclerView
import com.architect.codes.mu8.characters.Character

@BindingAdapter("items")
fun RecyclerView.setItems(characters: List<Character>?) {
(adapter as? CharactersAdapter)?.let {
it.characters = characters ?: emptyList()
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
package com.architect.coders.mu8.characters

import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.architect.coders.mu8.utils.Event
import com.architect.coders.mu8.utils.ScopedViewModel
import com.architect.codes.mu8.characters.Character
import com.architect.codes.mu8.characters.CharactersUseCase
import kotlinx.coroutines.launch

class CharactersViewModel(private val charactersUseCase: CharactersUseCase) : ScopedViewModel() {

private val _model = MutableLiveData<CharactersUiModel>()
val model: LiveData<CharactersUiModel>
get() {
if (_model.value == null) getCharacters()
return _model
}
private val _navigateToCharacter = MutableLiveData<Event<Long>>()
val navigateToCharacter: LiveData<Event<Long>> get() = _navigateToCharacter

private val _loading = MutableLiveData<Boolean>()
val loading: LiveData<Boolean> get() = _loading

private val _characters = MutableLiveData<List<Character>>()
val characters: LiveData<List<Character>> get() = _characters

init {
getCharacters()
}

private fun getCharacters() {
launch {
_model.value = CharactersUiModel.Loading
_model.value = CharactersUiModel.Content(charactersUseCase())
_loading.value = true
_characters.value = charactersUseCase()
_loading.value = false
}
}

fun onCharacterClicked(character: Character) = Unit
fun onCharacterClicked(character: Character) {
_navigateToCharacter.value = Event(character.id)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.architect.coders.mu8.utils

import android.view.View
import androidx.databinding.BindingAdapter

@BindingAdapter("visible")
fun View.setVisible(visible: Boolean?) {
visibility = visible?.let {
if (visible) View.VISIBLE else View.GONE
} ?: View.GONE
}
44 changes: 44 additions & 0 deletions presentation/src/main/java/com/architect/coders/mu8/utils/Event.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.architect.coders.mu8.utils

import androidx.lifecycle.Observer

/**
* Used as a wrapper for data that is exposed via a LiveData that represents an event.
* Taken from: https://medium.com/androiddevelopers/livedata-with-snackbar-navigation-and-other-events-the-singleliveevent-case-ac2622673150
*/
open class Event<out T>(private val content: T) {

var hasBeenHandled = false
private set // Allow external read but not write

/**
* Returns the content and prevents its use again.
*/
fun getContentIfNotHandled(): T? {
return if (hasBeenHandled) {
null
} else {
hasBeenHandled = true
content
}
}

/**
* Returns the content, even if it's already been handled.
*/
fun peekContent(): T = content
}

/**
* An [Observer] for [Event]s, simplifying the pattern of checking if the [Event]'s content has
* already been handled.
*
* [onEventUnhandledContent] is *only* called if the [Event]'s contents has not been handled.
*/
class EventObserver<T>(private val onEventUnhandledContent: (T) -> Unit) : Observer<Event<T>> {
override fun onChanged(event: Event<T>?) {
event?.getContentIfNotHandled()?.let { value ->
onEventUnhandledContent(value)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
Expand Down Expand Up @@ -64,3 +66,8 @@ inline fun <reified T : ViewModel> FragmentActivity.getViewModel(crossinline fac
}
return ViewModelProviders.of(this, vmFactory)[T::class.java]
}

fun <T : ViewDataBinding> ViewGroup.bindingInflate(
@LayoutRes layoutRes: Int,
attachToRoot: Boolean = true
): T = DataBindingUtil.inflate(LayoutInflater.from(context), layoutRes, this, attachToRoot)
60 changes: 35 additions & 25 deletions presentation/src/main/res/layout/activity_characters.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".categories.CategoriesActivity">
xmlns:tools="http://schemas.android.com/tools">

<include
android:id="@+id/toolbar"
layout="@layout/toolbar" />
<data>
<variable
name="viewmodel"
type="com.architect.coders.mu8.characters.CharactersViewModel" />
</data>

<ProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".categories.CategoriesActivity">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include
android:id="@+id/toolbar"
layout="@layout/toolbar" />

<ProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:visible="@{viewmodel.loading}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
Loading

0 comments on commit 54b316e

Please sign in to comment.