JoaquimLey · JoaquimLey · Apr 1, 2018 · Apr 1, 2018
diff --git a/transport-eta-android/gradle/wrapper/gradle-wrapper.properties b/transport-eta-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 24 15:16:17 CET 2018
+#Sun Apr 01 18:04:13 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/.../mobile-ui/src/main/java/com/joaquimley/transporteta/di/module/FavouriteFragmentModule.kt b/.../mobile-ui/src/main/java/com/joaquimley/transporteta/di/module/FavouriteFragmentModule.kt
@@ -1,6 +1,6 @@
 package com.joaquimley.transporteta.di.module
 
-import com.joaquimley.transporteta.home.favorite.FavouritesViewModelFactory
+import com.joaquimley.transporteta.home.favorite.FavoritesViewModelFactory
 import com.joaquimley.transporteta.sms.SmsController
 import dagger.Module
 import dagger.Provides
@@ -9,7 +9,7 @@ import dagger.Provides
 class FavouriteFragmentModule {
 
     @Provides
-    fun provideFavouritesViewModelFactory(smsController: SmsController): FavouritesViewModelFactory {
-        return FavouritesViewModelFactory(smsController)
+    fun provideFavouritesViewModelFactory(smsController: SmsController): FavoritesViewModelFactory {
+        return FavoritesViewModelFactory(smsController)
     }
 }
diff --git a/...port-eta-android/mobile-ui/src/main/java/com/joaquimley/transporteta/home/HomeActivity.kt b/...port-eta-android/mobile-ui/src/main/java/com/joaquimley/transporteta/home/HomeActivity.kt
@@ -45,7 +45,6 @@ class HomeActivity : AppCompatActivity(), HasSupportFragmentInjector/*, BottomNa
         viewModel = ViewModelProviders.of(this).get(HomeViewModel::class.java)
     }
 
-
     /**
      * Runtime permission shenanigans
      */

diff --git a/...le-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavoriteViewDiffCallback.kt b/...le-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavoriteViewDiffCallback.kt
@@ -0,0 +1,14 @@
+package com.joaquimley.transporteta.home.favorite
+
+import android.support.v7.util.DiffUtil
+import com.joaquimley.transporteta.model.FavoriteView
+
+class FavoriteViewDiffCallback : DiffUtil.ItemCallback<FavoriteView>() {
+    override fun areItemsTheSame(oldItem: FavoriteView?, newItem: FavoriteView?): Boolean {
+        return oldItem?.code == newItem?.code
+    }
+
+    override fun areContentsTheSame(oldItem: FavoriteView?, newItem: FavoriteView?): Boolean {
+        return oldItem == newItem
+    }
+}
diff --git a/...d/mobile-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavoritesViewModel.kt b/...d/mobile-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavoritesViewModel.kt
@@ -4,7 +4,7 @@ import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
 import android.util.Log
-import com.joaquimley.transporteta.model.FavouriteView
+import com.joaquimley.transporteta.model.FavoriteView
 import com.joaquimley.transporteta.model.data.Resource
 import com.joaquimley.transporteta.model.data.ResourceState
 import com.joaquimley.transporteta.sms.SmsController
@@ -14,25 +14,25 @@ import com.joaquimley.transporteta.sms.SmsController
  */
 class FavoritesViewModel(val smsController: SmsController) : ViewModel() {
 
-    val favouritesLiveData = MutableLiveData<Resource<List<FavouriteView>>>()
+    val favouritesLiveData = MutableLiveData<Resource<List<FavoriteView>>>()
 
     init {
         smsController.serviceSms.subscribe {
             Log.e("FavoritesViewModel", "SmsController received sms $it")
 
-            // TODO: Make it more 🎨
-            val currentValue = ArrayList<FavouriteView>()
-            currentValue.add(FavouriteView(it.code, it.message))
+            // TODO: remove mocked up shenenigans Make it more 🎨
+            val currentValue = ArrayList<FavoriteView>()
+            currentValue.add(FavoriteView(it.code, it.message))
 
 //            val currentValue = favouritesLiveData.value?.data?.toMutableList()
-//                    ?: emptyList<FavouriteView>()
-//            currentValue.toMutableList().add(FavouriteView(it.code, it.message))
+//                    ?: emptyList<FavoriteView>()
+//            currentValue.toMutableList().add(FavoriteView(it.code, it.message))
 
             favouritesLiveData.setValue(Resource(ResourceState.SUCCESS, currentValue))
         }
     }
 
-    fun getFavourites(): LiveData<Resource<List<FavouriteView>>> {
+    fun getFavourites(): LiveData<Resource<List<FavoriteView>>> {
         return favouritesLiveData
     }
 
@@ -41,7 +41,7 @@ class FavoritesViewModel(val smsController: SmsController) : ViewModel() {
 
     }
 
-    fun onEtaRequested(favourite: FavouriteView) {
+    fun onEtaRequested(favourite: FavoriteView) {
         requestEta(favourite.code)
     }
 

diff --git a/...me/favorite/FavouritesViewModelFactory.kt → ...ome/favorite/FavoritesViewModelFactory.kt b/...me/favorite/FavouritesViewModelFactory.kt → ...ome/favorite/FavoritesViewModelFactory.kt
@@ -4,7 +4,7 @@ import android.arch.lifecycle.ViewModel
 import android.arch.lifecycle.ViewModelProvider
 import com.joaquimley.transporteta.sms.SmsController
 
-class FavouritesViewModelFactory(val smsController: SmsController): ViewModelProvider.Factory {
+class FavoritesViewModelFactory(private val smsController: SmsController): ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         if (modelClass.isAssignableFrom(FavoritesViewModel::class.java)) {
             return FavoritesViewModel(smsController) as T

diff --git a/...id/mobile-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavouritesAdapter.kt b/...id/mobile-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavouritesAdapter.kt
@@ -1,5 +1,6 @@
 package com.joaquimley.transporteta.home.favorite
 
+import android.support.v7.recyclerview.extensions.ListAdapter
 import android.support.v7.widget.AppCompatButton
 import android.support.v7.widget.AppCompatImageView
 import android.support.v7.widget.AppCompatTextView
@@ -9,61 +10,62 @@ import android.view.View
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
 import com.joaquimley.transporteta.R
-import com.joaquimley.transporteta.model.FavouriteView
+import com.joaquimley.transporteta.model.FavoriteView
 import kotterknife.bindView
 
-class FavouritesAdapter(val listener: Listener? = null) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    val dataSet: MutableList<FavouriteView?> = emptyList<FavouriteView?>().toMutableList()
-
-    init {
-        setHasStableIds(true)
-    }
-
-    fun set(favourites: List<FavouriteView>) {
-        dataSet.clear()
-        dataSet.addAll(favourites)
-        notifyDataSetChanged()
-    }
-
-    fun add(favourites: List<FavouriteView>) {
-        val index = dataSet.size
-        dataSet.addAll(favourites)
-        notifyItemRangeInserted(index, favourites.size)
-    }
-
-    fun addLoadingView() {
-        val index = dataSet.size
-        if (dataSet.isEmpty().not() && dataSet[index] != null) {
-            dataSet.add(null)
-            notifyItemInserted(index + 1)
-        }
-    }
-
-    fun removeLoadingView() {
-        val lastIndex = dataSet.size - 1
-        if (dataSet.isEmpty().not() && dataSet[lastIndex] == null) {
-            dataSet.removeAt(lastIndex)
-            notifyItemRemoved(lastIndex)
-        }
-    }
-
+class FavouritesAdapter(private val clickListener: (FavoriteView) -> Unit)
+    : ListAdapter<FavoriteView, RecyclerView.ViewHolder>(FavoriteViewDiffCallback()) {
+
+//    val dataSet: MutableList<FavoriteView?> = emptyList<FavoriteView?>().toMutableList()
+//
+//    init {
+//        setHasStableIds(true)
+//    }
+//
+//    fun set(favourites: List<FavoriteView>) {
+//        dataSet.clear()
+//        dataSet.addAll(favourites)
+//        notifyDataSetChanged()
+//    }
+//
+//    fun add(favourites: List<FavoriteView>) {
+//        val index = dataSet.size
+//        dataSet.addAll(favourites)
+//        notifyItemRangeInserted(index, favourites.size)
+//    }
+//
+//    fun addLoadingView() {
+//        val index = dataSet.size
+//        if (dataSet.isEmpty().not() && dataSet[index] != null) {
+//            dataSet.add(null)
+//            notifyItemInserted(index + 1)
+//        }
+//    }
+//
+//    fun removeLoadingView() {
+//        val lastIndex = dataSet.size - 1
+//        if (dataSet.isEmpty().not() && dataSet[lastIndex] == null) {
+//            dataSet.removeAt(lastIndex)
+//            notifyItemRemoved(lastIndex)
+//        }
+//    }
+//
     fun isEmpty() = itemCount == 0
-
-    override fun getItemCount(): Int {
-        return dataSet.size
-    }
-
-    override fun getItemId(position: Int): Long {
-        return if (dataSet.size >= position) {
-            dataSet[position]?.code?.toLong() ?: View.NO_ID.toLong()
-        } else {
-            View.NO_ID.toLong()
-        }
-    }
+//
+//    override fun getItemCount(): Int {
+//        return dataSet.size
+//    }
+//
+//    override fun getItemId(position: Int): Long {
+//        return if (dataSet.size >= position) {
+//            dataSet[position]?.code?.toLong() ?: View.NO_ID.toLong()
+//        } else {
+//            View.NO_ID.toLong()
+//        }
+//    }
 
     override fun getItemViewType(position: Int): Int {
-        return if (dataSet.size >= position && dataSet[position] != null) {
+        return if (getItem(position) != null) {
             VIEW_TYPE_FAVORITE
         } else {
             VIEW_TYPE_PROGRESS
@@ -73,7 +75,7 @@ class FavouritesAdapter(val listener: Listener? = null) : RecyclerView.Adapter<R
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
             VIEW_TYPE_FAVORITE -> {
-                FavouriteViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.item_favorite, parent, false))
+                FavoriteViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.item_favorite, parent, false))
             }
             else -> {
                 ProgressViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.item_progress, parent, false))
@@ -82,40 +84,40 @@ class FavouritesAdapter(val listener: Listener? = null) : RecyclerView.Adapter<R
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val favourite = dataSet[position]
+        val favourite = getItem(position)
         if (favourite != null) {
-            (holder as? FavouriteViewHolder)?.bind(favourite)
+            (holder as? FavoriteViewHolder)?.bind(favourite)
         }
     }
 
-    inner class FavouriteViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    inner class FavoriteViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
         private val avatarImage: AppCompatImageView by bindView(R.id.image_avatar)
         private val titleTextView: AppCompatTextView by bindView(R.id.text_title)
         private val subtitleTextView: AppCompatTextView by bindView(R.id.text_subtitle)
         private val etaButton: AppCompatButton by bindView(R.id.eta_button)
 
-        fun bind(favourite: FavouriteView) {
+        fun bind(favourite: FavoriteView) {
             Glide.with(itemView.context)
                     .load(R.drawable.station)
                     .into(avatarImage)
 
             titleTextView.text = favourite.code.toString()
             subtitleTextView.text = favourite.latestEta
-            etaButton.setOnClickListener { listener?.onItemClicked(favourite) }
+            etaButton.setOnClickListener { clickListener(favourite) }
         }
     }
 
     class ProgressViewHolder(view: View) : RecyclerView.ViewHolder(view)
 
 
     companion object {
-        const val TAG = "FavouritesAdapter"
+        const val TAG = "FavoritesAdapter"
         const val VIEW_TYPE_PROGRESS = -1
         const val VIEW_TYPE_FAVORITE = -2
     }
 
     interface Listener {
-        fun onItemClicked(favourite: FavouriteView)
+        fun onItemClicked(favourite: FavoriteView)
     }
 }
diff --git a/...d/mobile-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavouritesFragment.kt b/...d/mobile-ui/src/main/java/com/joaquimley/transporteta/home/favorite/FavouritesFragment.kt
@@ -15,7 +15,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
 import com.joaquimley.transporteta.R
-import com.joaquimley.transporteta.model.FavouriteView
+import com.joaquimley.transporteta.model.FavoriteView
 import com.joaquimley.transporteta.model.data.ResourceState
 import com.joaquimley.transporteta.util.setVisible
 import dagger.android.support.AndroidSupportInjection
@@ -33,7 +33,7 @@ class FavouritesFragment : Fragment(), FavouritesAdapter.Listener {
     private val swipeRefreshView: SwipeRefreshLayout by bindView(R.id.swipe_refresh)
 
     @Inject
-    lateinit var viewModelFactory: FavouritesViewModelFactory
+    lateinit var viewModelFactory: FavoritesViewModelFactory
     private lateinit var viewModel: FavoritesViewModel
     private lateinit var adapter: FavouritesAdapter
 
@@ -57,7 +57,7 @@ class FavouritesFragment : Fragment(), FavouritesAdapter.Listener {
     }
 
     private fun showAddFavoriteDialog() {
-        viewModel.onEtaRequested(FavouriteView(System.currentTimeMillis().toInt(), ""))
+        viewModel.onEtaRequested(FavoriteView(System.currentTimeMillis().toInt(), ""))
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -73,11 +73,11 @@ class FavouritesFragment : Fragment(), FavouritesAdapter.Listener {
                 })
     }
 
-    override fun onItemClicked(favourite: FavouriteView) {
+    override fun onItemClicked(favourite: FavoriteView) {
         viewModel.onEtaRequested(favourite)
     }
 
-    private fun handleDataState(resourceState: ResourceState, data: List<FavouriteView>?,
+    private fun handleDataState(resourceState: ResourceState, data: List<FavoriteView>?,
                                 message: String?) {
         when (resourceState) {
             ResourceState.LOADING -> setupScreenForLoadingState(true)
@@ -101,15 +101,15 @@ class FavouritesFragment : Fragment(), FavouritesAdapter.Listener {
         } else {
             swipeRefreshView.isRefreshing = false
             contentLoadingView.visibility = View.GONE
-            adapter.removeLoadingView()
+//            adapter.removeLoadingView()
         }
     }
 
-    private fun setupScreenForSuccess(favouriteViewList: List<FavouriteView>?) {
+    private fun setupScreenForSuccess(favoriteViewList: List<FavoriteView>?) {
         setupScreenForLoadingState(false)
         setupScreenEmptyState(false)
-        if (favouriteViewList != null) {
-            adapter.set(favouriteViewList)
+        if (favoriteViewList != null) {
+            adapter.submitList(favoriteViewList)
         }
     }
 
@@ -133,7 +133,7 @@ class FavouritesFragment : Fragment(), FavouritesAdapter.Listener {
     private fun setupRecyclerView() {
         recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = LinearLayoutManager(context)
-        adapter = FavouritesAdapter(this)
+        adapter = FavouritesAdapter({viewModel.onEtaRequested(it)})
         recyclerView.adapter = adapter
     }
 

diff --git a/transport-eta-android/mobile-ui/src/main/java/com/joaquimley/transporteta/model/Favorite.kt b/transport-eta-android/mobile-ui/src/main/java/com/joaquimley/transporteta/model/Favorite.kt
@@ -0,0 +1,3 @@
+package com.joaquimley.transporteta.model
+
+class Favoritedata (val code: Int = -1, val latestEta: String = "")
diff --git a/...imley/transporteta/model/FavouriteView.kt → ...uimley/transporteta/model/FavoriteView.kt b/...imley/transporteta/model/FavouriteView.kt → ...uimley/transporteta/model/FavoriteView.kt
@@ -3,4 +3,4 @@ package com.joaquimley.transporteta.model
 /**
  * Created by joaquimley on 28/03/2018.
  */
-data class FavouriteView(val code: Int = -1, val latestEta: String = "")
+data class FavoriteView(val code: Int = -1, val latestEta: String = "")
-Original file line number
+Diff line change
@@ Expand Up @@
             viewModel = ViewModelProviders.of(this).get(HomeViewModel::class.java)
         }
         /**
          * Runtime permission shenanigans
          */
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.joaquimley.transporteta.model

		class Favoritedata (val code: Int = -1, val latestEta: String = "")