From 21caa8eb1b01ecb7fcde03a2513a6084d6c80acf Mon Sep 17 00:00:00 2001
From: Jannik <seil0@mosad.xyz>
Date: Sat, 3 Dec 2022 00:05:57 +0100
Subject: [PATCH] update MediaItem to suport dynamic size

* this is needed for dynamic span count to correctly work
* this also fixes issues with poster image cropping when the MediaItem size was < 195dp
---
 .../main/fragments/LibraryFragment.kt         | 32 ++++++++-----------
 .../util/adapter/MediaItemListAdapter.kt      |  2 +-
 app/src/main/res/layout/fragment_home.xml     |  8 ++---
 app/src/main/res/layout/item_media.xml        | 18 +++++------
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/LibraryFragment.kt b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/LibraryFragment.kt
index 58f5ec0..9b14443 100644
--- a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/LibraryFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/LibraryFragment.kt
@@ -13,13 +13,15 @@ import org.mosad.teapod.databinding.FragmentLibraryBinding
 import org.mosad.teapod.parser.crunchyroll.Crunchyroll
 import org.mosad.teapod.util.ItemMedia
 import org.mosad.teapod.util.adapter.MediaItemAdapter
+import org.mosad.teapod.util.adapter.MediaItemListAdapter
 import org.mosad.teapod.util.decoration.MediaItemDecoration
 import org.mosad.teapod.util.showFragment
+import org.mosad.teapod.util.toItemMediaList
 
 class LibraryFragment : Fragment() {
 
     private lateinit var binding: FragmentLibraryBinding
-    private lateinit var adapter: MediaItemAdapter
+    private lateinit var adapter: MediaItemListAdapter
 
     private val itemList = arrayListOf<ItemMedia>()
     private val pageSize = 30
@@ -33,26 +35,23 @@ class LibraryFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.recyclerMediaLibrary.addItemDecoration(MediaItemDecoration(9))
+        // TODO replace with pagination3
+        // https://medium.com/swlh/paging3-recyclerview-pagination-made-easy-333c7dfa8797
+        binding.recyclerMediaLibrary.addOnScrollListener(PaginationScrollListener())
+
         // init async
         lifecycleScope.launch {
             // create and set the adapter, needs context
             context?.let {
-                val initialResults = Crunchyroll.browse(n = pageSize)
-                itemList.addAll(initialResults.items.map { item ->
-                    ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
-                })
+                itemList.addAll(Crunchyroll.browse(n = pageSize).toItemMediaList())
                 nextItemIndex += pageSize
 
-                adapter = MediaItemAdapter(itemList)
-                adapter.onItemClick = { mediaIdStr, _ ->
-                    activity?.showFragment(MediaFragment(mediaIdStr))
-                }
-
+                adapter = MediaItemListAdapter(MediaItemListAdapter.OnClickListener {
+                    activity?.showFragment(MediaFragment(it.id))
+                })
                 binding.recyclerMediaLibrary.adapter = adapter
-                binding.recyclerMediaLibrary.addItemDecoration(MediaItemDecoration(9))
-                // TODO replace with pagination3
-                // https://medium.com/swlh/paging3-recyclerview-pagination-made-easy-333c7dfa8797
-                binding.recyclerMediaLibrary.addOnScrollListener(PaginationScrollListener())
+                adapter.submitList(itemList)
             }
 
         }
@@ -72,10 +71,7 @@ class LibraryFragment : Fragment() {
                     isLoading = true
                     lifecycleScope.launch {
                         val firstNewItemIndex = itemList.lastIndex + 1
-                        val results = Crunchyroll.browse(start = nextItemIndex, n = pageSize)
-                        itemList.addAll(results.items.map { item ->
-                            ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
-                        })
+                        itemList.addAll(Crunchyroll.browse(start = nextItemIndex, n = pageSize).toItemMediaList())
                         nextItemIndex += pageSize
 
                         adapter.notifyItemRangeInserted(firstNewItemIndex, pageSize)
diff --git a/app/src/main/java/org/mosad/teapod/util/adapter/MediaItemListAdapter.kt b/app/src/main/java/org/mosad/teapod/util/adapter/MediaItemListAdapter.kt
index d7763c1..af61a08 100644
--- a/app/src/main/java/org/mosad/teapod/util/adapter/MediaItemListAdapter.kt
+++ b/app/src/main/java/org/mosad/teapod/util/adapter/MediaItemListAdapter.kt
@@ -36,7 +36,7 @@ class MediaItemListAdapter(private val onClickListener: OnClickListener) : ListA
         fun bind(item: ItemMedia) {
             binding.textTitle.text = item.title
 
-            Glide.with(binding.imagePoster)
+            Glide.with(binding.root.context)
                 .load(item.posterUrl)
                 .into(binding.imagePoster)
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 327150c..7cf23e8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -120,7 +120,7 @@
             <LinearLayout
                 android:id="@+id/linear_up_next"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingBottom="7dp">
 
@@ -139,7 +139,7 @@
                 <com.facebook.shimmer.ShimmerFrameLayout
                     android:id="@+id/shimmer_layout_up_next"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     tools:visibility="gone">
 
                     <LinearLayout
@@ -159,7 +159,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_up_next"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:listitem="@layout/item_media" />
@@ -207,7 +207,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_watchlist"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:listitem="@layout/item_media" />
diff --git a/app/src/main/res/layout/item_media.xml b/app/src/main/res/layout/item_media.xml
index e514d56..5d13244 100644
--- a/app/src/main/res/layout/item_media.xml
+++ b/app/src/main/res/layout/item_media.xml
@@ -10,27 +10,27 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintWidth_max="195dp">
+        android:layout_height="wrap_content">
 
         <FrameLayout
             android:id="@+id/frame_image_progress"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/text_title"
             app:layout_constraintDimensionRatio="H,16:9"
+            app:layout_constraintBottom_toTopOf="@+id/text_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth="195dp">
+            app:layout_constrainedWidth="true"
+            app:layout_constraintWidth_max="195dp">
 
             <ImageView
                 android:id="@+id/image_poster"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:contentDescription="@string/media_poster_desc"
-                android:scaleType="centerCrop"
-                tools:srcCompat="@color/imagePlaceholder" />
+                android:scaleType="fitCenter"
+                tools:srcCompat="@drawable/placeholder_image"/>
 
             <ImageView
                 android:id="@+id/image_episode_play"