patrick-elmquist · November 25, 2018 19:27 · Nov 25, 2018 · Nov 21, 2018 · Nov 21, 2018 · Nov 21, 2018
diff --git a/ShowAdapter.kt b/ShowAdapter.kt
@@ -1,10 +1,9 @@
-class ShowAdapter(tvShows: List<Show>) : RecyclerView.Adapter<ShowViewHolder>() {
-    private val items = tvShows.toList()
+class ShowAdapter(private val items: List<Show>) : RecyclerView.Adapter<ShowViewHolder>() {
     init {
         setHasStableIds(true)
     }
     override fun getItemCount() = items.size
     override fun getItemId(position: Int) = items[position].hashCode().toLong()
-    override fun onCreateViewHolder(parent: ViewGroup, vt: Int) = ShowViewHolder(parent.inflate(layout.item_tv_show))
+    override fun onCreateViewHolder(parent: ViewGroup, vt: Int) = ShowViewHolder(parent.inflate(R.layout.item_show))
     override fun onBindViewHolder(holder: ShowViewHolder, position: Int) = holder.bind(items[position])
 }
diff --git a/ShowAdapter.kt b/ShowAdapter.kt
@@ -1,11 +1,8 @@
 class ShowAdapter(tvShows: List<Show>) : RecyclerView.Adapter<ShowViewHolder>() {
-
     private val items = tvShows.toList()
-
     init {
         setHasStableIds(true)
     }
-
     override fun getItemCount() = items.size
     override fun getItemId(position: Int) = items[position].hashCode().toLong()
     override fun onCreateViewHolder(parent: ViewGroup, vt: Int) = ShowViewHolder(parent.inflate(layout.item_tv_show))

diff --git a/ShowViewHolder.kt b/ShowViewHolder.kt
@@ -1,33 +0,0 @@
-class ShowViewHolder(view: View) : ViewHolder(view) {
-    private val title = itemView.title
-    private val description = itemView.description
-    private val thumb = itemView.thumb
-    private val poster = itemView.poster
-
-    private val interpolator = FastOutLinearInInterpolator()
-
-    /**
-     * Offset the thumb and text with a factor [-1, 1] of the total width
-     */
-    var offset: Float = 0f
-        set(v) {
-            field = v
-            val unsigned = abs(v)
-            val translation = if (v < 0) {
-                interpolator.getInterpolation(unsigned) * itemView.measuredWidth
-            } else {
-                interpolator.getInterpolation(unsigned) * -itemView.measuredWidth
-            }
-            title.translationX = translation
-            description.translationX = translation
-            thumb.translationX = translation
-        }
-
-    fun bind(viewModel: Show) {
-        title.setText(viewModel.title)
-        description.setText(viewModel.description)
-        thumb.setImageResource(viewModel.image)
-        poster.setImageResource(viewModel.image)
-        // ...
-    }
-}

diff --git a/SeriesAdapter.kt b/SeriesAdapter.kt
@@ -1,13 +0,0 @@
-class SeriesAdapter(series: List<Series>) : RecyclerView.Adapter<SeriesViewHolder>() {
-
-    private val items = series.toList()
-
-    init {
-        setHasStableIds(true)
-    }
-
-    override fun getItemCount() = items.size
-    override fun getItemId(position: Int) = items[position].hashCode().toLong()
-    override fun onCreateViewHolder(parent: ViewGroup, vt: Int) = SeriesViewHolder(parent.inflate(layout.item_series))
-    override fun onBindViewHolder(holder: SeriesViewHolder, position: Int) = holder.bind(items[position])
-}

diff --git a/ShowAdapter.kt b/ShowAdapter.kt
@@ -0,0 +1,13 @@
+class ShowAdapter(tvShows: List<Show>) : RecyclerView.Adapter<ShowViewHolder>() {
+
+    private val items = tvShows.toList()
+
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun getItemCount() = items.size
+    override fun getItemId(position: Int) = items[position].hashCode().toLong()
+    override fun onCreateViewHolder(parent: ViewGroup, vt: Int) = ShowViewHolder(parent.inflate(layout.item_tv_show))
+    override fun onBindViewHolder(holder: ShowViewHolder, position: Int) = holder.bind(items[position])
+}
diff --git a/SeriesViewHolder.kt → ShowViewHolder.kt b/SeriesViewHolder.kt → ShowViewHolder.kt
@@ -1,4 +1,4 @@
-class SeriesViewHolder(view: View) : ViewHolder(view) {
+class ShowViewHolder(view: View) : ViewHolder(view) {
     private val title = itemView.title
     private val description = itemView.description
     private val thumb = itemView.thumb
@@ -23,10 +23,11 @@ class SeriesViewHolder(view: View) : ViewHolder(view) {
             thumb.translationX = translation
         }
 
-    fun bind(viewModel: Series) {
+    fun bind(viewModel: Show) {
         title.setText(viewModel.title)
         description.setText(viewModel.description)
         thumb.setImageResource(viewModel.image)
         poster.setImageResource(viewModel.image)
+        // ...
     }
 }
diff --git a/SeriesAdapter.kt b/SeriesAdapter.kt
@@ -0,0 +1,13 @@
+class SeriesAdapter(series: List<Series>) : RecyclerView.Adapter<SeriesViewHolder>() {
+
+    private val items = series.toList()
+
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun getItemCount() = items.size
+    override fun getItemId(position: Int) = items[position].hashCode().toLong()
+    override fun onCreateViewHolder(parent: ViewGroup, vt: Int) = SeriesViewHolder(parent.inflate(layout.item_series))
+    override fun onBindViewHolder(holder: SeriesViewHolder, position: Int) = holder.bind(items[position])
+}
diff --git a/SeriesViewHolder.kt b/SeriesViewHolder.kt
@@ -0,0 +1,32 @@
+class SeriesViewHolder(view: View) : ViewHolder(view) {
+    private val title = itemView.title
+    private val description = itemView.description
+    private val thumb = itemView.thumb
+    private val poster = itemView.poster
+
+    private val interpolator = FastOutLinearInInterpolator()
+
+    /**
+     * Offset the thumb and text with a factor [-1, 1] of the total width
+     */
+    var offset: Float = 0f
+        set(v) {
+            field = v
+            val unsigned = abs(v)
+            val translation = if (v < 0) {
+                interpolator.getInterpolation(unsigned) * itemView.measuredWidth
+            } else {
+                interpolator.getInterpolation(unsigned) * -itemView.measuredWidth
+            }
+            title.translationX = translation
+            description.translationX = translation
+            thumb.translationX = translation
+        }
+
+    fun bind(viewModel: Series) {
+        title.setText(viewModel.title)
+        description.setText(viewModel.description)
+        thumb.setImageResource(viewModel.image)
+        poster.setImageResource(viewModel.image)
+    }
+}