add watchlist to MyListsFragment

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/LibraryFragment.kt

@@ -46,13 +46,11 @@ class LibraryFragment : Fragment() {
 
         binding.searchText.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
-                println("onQueryTextSubmit: $query")
                 query?.let { model.search(it) }
                 return false // return false to dismiss the keyboard
             }
 
             override fun onQueryTextChange(newText: String?): Boolean {
-                println("onQueryTextChange: $newText")
                 newText?.let { model.search(it) }
                 return false // return false to dismiss the keyboard
             }

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MyListsFragment.kt

@@ -6,24 +6,20 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
+import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.launch
+import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentMyListsBinding
 import org.mosad.teapod.parser.crunchyroll.Crunchyroll
-import org.mosad.teapod.util.ItemMedia
-import org.mosad.teapod.util.adapter.MediaItemListAdapter
-import org.mosad.teapod.util.showFragment
 import org.mosad.teapod.util.toItemMediaList
 
 class MyListsFragment : Fragment() {
 
     private lateinit var binding: FragmentMyListsBinding
-    private lateinit var adapter: MediaItemListAdapter
+    private lateinit var pagerAdapter: FragmentStateAdapter
 
-    private val itemList = arrayListOf<ItemMedia>()
+    private val fragments = arrayListOf<Fragment>()
-    private val pageSize = 30
-    private var nextItemIndex = 0
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentMyListsBinding.inflate(inflater, container, false)
@@ -33,50 +29,39 @@ class MyListsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // TODO replace with pagination3
+        // tab layout and pager
-        // https://medium.com/swlh/paging3-recyclerview-pagination-made-easy-333c7dfa8797
+        pagerAdapter = ScreenSlidePagerAdapter(this)
-        binding.recyclerMediaLibrary.addOnScrollListener(PaginationScrollListener())
+        binding.pagerMyLists.adapter = pagerAdapter
 
-        // init async
+        // TODO is position 0 always episodes? (and 1 always similar titles)
-        lifecycleScope.launch {
+        TabLayoutMediator(binding.tabMyLists, binding.pagerMyLists) { tab, position ->
-            // create and set the adapter, needs context
+            tab.text = when(position) {
-            context?.let {
+                0 -> getString(R.string.my_list)
-                itemList.addAll(Crunchyroll.browse(n = pageSize).toItemMediaList())
+                1 -> getString(R.string.crunchylists)
-                nextItemIndex += pageSize
+                2 -> getString(R.string.downloads)
-
+                else -> ""
-                adapter = MediaItemListAdapter(MediaItemListAdapter.OnClickListener {
-                    activity?.showFragment(MediaFragment(it.id))
-                })
-                binding.recyclerMediaLibrary.adapter = adapter
-                adapter.submitList(itemList)
             }
+        }.attach()
 
+        lifecycleScope.launch {
+            val items = Crunchyroll.watchlist(50).items
+
+            MediaFragmentSimilar(items.toItemMediaList()).also {
+                fragments.add(it)
+                pagerAdapter.notifyItemInserted(fragments.indexOf(it))
+            }
         }
+
     }
 
-    inner class PaginationScrollListener: RecyclerView.OnScrollListener() {
+    /**
-        private var isLoading = false
+     * A simple pager adapter
+     * TODO also present in MediaFragment
+     */
+    private inner class ScreenSlidePagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+        override fun getItemCount(): Int = fragments.size
 
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+        override fun createFragment(position: Int): Fragment = fragments[position]
-            super.onScrolled(recyclerView, dx, dy)
-            val layoutManager = recyclerView.layoutManager as GridLayoutManager?
-
-            if (!isLoading) layoutManager?.let {
-                // itemList.size - 5 to start loading a bit earlier than the actual end
-                if (layoutManager.findLastCompletelyVisibleItemPosition() >= (itemList.size - 5)) {
-                    // load new browse results async
-                    isLoading = true
-                    lifecycleScope.launch {
-                        val firstNewItemIndex = itemList.lastIndex + 1
-                        itemList.addAll(Crunchyroll.browse(start = nextItemIndex, n = pageSize).toItemMediaList())
-                        nextItemIndex += pageSize
-
-                        adapter.notifyItemRangeInserted(firstNewItemIndex, pageSize)
-                        isLoading = false
-                    }
-                }
-            }
-        }
     }
 
 }

app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/MediaFragmentViewModel.kt

@@ -98,7 +98,6 @@ class MediaFragmentViewModel(application: Application) : AndroidViewModel(applic
             MediaType.TVSHOW -> tmdbApiController.searchTVShow(seriesCrunchy.title)
             else -> NoneTMDBSearch
         }
-//        println(tmdbSearchResult)
 
         tmdbResult = if (tmdbSearchResult.results.isNotEmpty()) {
             when (val result = tmdbSearchResult.results.first()) {
@@ -107,7 +106,6 @@ class MediaFragmentViewModel(application: Application) : AndroidViewModel(applic
                 else -> NoneTMDB
             }
         } else NoneTMDB
-//        println(tmdbResult)
 
         // currently not used
 //        tmdbTVSeason = if (tmdbResult is TMDBTVShow) {

app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt

@@ -66,7 +66,6 @@ class LanguageSettingsDialogFragment : DialogFragment() {
 
         // scroll to the position of the view, if it's the selected language
         binding.scrollLanguages.post {
-            println("top: ${selectedView?.top}")
             binding.scrollLanguages.scrollTo(0, selectedView?.top ?: 0)
         }
     }

app/src/main/res/layout/fragment_my_lists.xml

@@ -7,19 +7,40 @@
     android:background="?themePrimary"
     tools:context=".ui.activity.main.fragments.MyListsFragment">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/recycler_media_library"
+        android:id="@+id/tab_my_lists"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:clipToPadding="false"
+        android:background="@android:color/transparent"
-        android:orientation="vertical"
-        android:padding="3dp"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:spanCount="@integer/item_media_columns"
+        app:tabMode="fixed"
-        tools:listitem="@layout/item_media" />
+        app:tabSelectedTextColor="?textPrimary"
+        app:tabTextColor="?textSecondary">
 
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/my_list" />
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/crunchylists" />
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/downloads" />
+    </com.google.android.material.tabs.TabLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager_my_lists"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tab_my_lists" />
 </androidx.constraintlayout.widget.ConstraintLayout>