cleanup

app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt

@@ -1,18 +1,15 @@
 package com.github.libretube.adapters
 
-import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.R
 import com.github.libretube.databinding.VideoChannelRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.formatShort
 
 class ChannelAdapter(
@@ -47,17 +44,7 @@ class ChannelAdapter(
                 DateUtils.formatElapsedTime(trending.duration!!)
             ConnectionHelper.loadImage(trending.thumbnail, channelThumbnail)
             root.setOnClickListener {
-                var bundle = Bundle()
+                NavigationHelper.navigateVideo(root.context, trending.url)
-                bundle.putString("videoId", trending.url!!.replace("/watch?v=", ""))
-                var frag = PlayerFragment()
-                frag.arguments = bundle
-                val activity = root.context as AppCompatActivity
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(PlayerFragment())
-                    .commit()
-                activity.supportFragmentManager.beginTransaction()
-                    .replace(R.id.container, frag)
-                    .commitNow()
             }
             root.setOnLongClickListener {
                 val videoId = trending.url!!.replace("/watch?v=", "")

app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt

@@ -5,16 +5,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.CommentsRowBinding
 import com.github.libretube.obj.Comment
 import com.github.libretube.obj.CommentsPage
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import kotlinx.coroutines.CoroutineScope
@@ -66,19 +64,7 @@ class CommentsAdapter(
                 heartedImageView.visibility = View.VISIBLE
             }
             commentorImage.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, comment.commentorUrl)
-                val bundle = bundleOf("channel_id" to comment.commentorUrl)
-                activity.navController.navigate(R.id.channelFragment, bundle)
-                try {
-                    val mainMotionLayout =
-                        activity.findViewById<MotionLayout>(R.id.mainMotionLayout)
-                    if (mainMotionLayout.progress == 0.toFloat()) {
-                        mainMotionLayout.transitionToEnd()
-                        activity.findViewById<MotionLayout>(R.id.playerMotionLayout)
-                            .transitionToEnd()
-                    }
-                } catch (e: Exception) {
-                }
             }
             repliesRecView.layoutManager = LinearLayoutManager(root.context)
             val repliesAdapter = RepliesAdapter(CommentsPage().comments)

app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt

@@ -1,23 +1,20 @@
 package com.github.libretube.adapters
 
 import android.app.Activity
-import android.os.Bundle
 import android.text.format.DateUtils
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.R
 import com.github.libretube.databinding.PlaylistRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.StreamItem
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.RetrofitInstance
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -57,18 +54,7 @@ class PlaylistAdapter(
             playlistDuration.text = DateUtils.formatElapsedTime(streamItem.duration!!)
             ConnectionHelper.loadImage(streamItem.thumbnail, playlistThumbnail)
             root.setOnClickListener {
-                var bundle = Bundle()
+                NavigationHelper.navigateVideo(root.context, streamItem.url, playlistId)
-                bundle.putString("videoId", streamItem.url!!.replace("/watch?v=", ""))
-                bundle.putString("playlistId", playlistId)
-                var frag = PlayerFragment()
-                frag.arguments = bundle
-                val activity = root.context as AppCompatActivity
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(PlayerFragment())
-                    .commit()
-                activity.supportFragmentManager.beginTransaction()
-                    .replace(R.id.container, frag)
-                    .commitNow()
             }
             root.setOnLongClickListener {
                 val videoId = streamItem.url!!.replace("/watch?v=", "")

app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt

@@ -4,15 +4,14 @@ import android.app.Activity
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.PlaylistsRowBinding
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.Playlists
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
@@ -65,10 +64,7 @@ class PlaylistsAdapter(
                 builder.show()
             }
             root.setOnClickListener {
-                // playlists clicked
+                NavigationHelper.navigatePlaylist(root.context, playlist.id)
-                val activity = root.context as MainActivity
-                val bundle = bundleOf("playlist_id" to playlist.id)
-                activity.navController.navigate(R.id.playlistFragment, bundle)
             }
         }
     }

app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt

@@ -3,14 +3,11 @@ package com.github.libretube.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.RepliesRowBinding
 import com.github.libretube.obj.Comment
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.formatShort
 
 class RepliesAdapter(
@@ -57,19 +54,7 @@ class RepliesAdapter(
                 heartedImageView.visibility = View.VISIBLE
             }
             commentorImage.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateVideo(root.context, reply.commentorUrl)
-                val bundle = bundleOf("channel_id" to reply.commentorUrl)
-                activity.navController.navigate(R.id.channelFragment, bundle)
-                try {
-                    val mainMotionLayout =
-                        activity.findViewById<MotionLayout>(R.id.mainMotionLayout)
-                    if (mainMotionLayout.progress == 0.toFloat()) {
-                        mainMotionLayout.transitionToEnd()
-                        activity.findViewById<MotionLayout>(R.id.playerMotionLayout)
-                            .transitionToEnd()
-                    }
-                } catch (e: Exception) {
-                }
             }
         }
     }

app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt

@@ -1,26 +1,22 @@
 package com.github.libretube.adapters
 
-import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.ChannelSearchRowBinding
 import com.github.libretube.databinding.PlaylistSearchRowBinding
 import com.github.libretube.databinding.VideoSearchRowBinding
 import com.github.libretube.dialogs.PlaylistOptionsDialog
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.SearchItem
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import kotlinx.coroutines.CoroutineScope
@@ -103,17 +99,7 @@ class SearchAdapter(
                 }
             searchChannelName.text = item.uploaderName
             root.setOnClickListener {
-                val bundle = Bundle()
+                NavigationHelper.navigateVideo(root.context, item.url)
-                bundle.putString("videoId", item.url!!.replace("/watch?v=", ""))
-                val frag = PlayerFragment()
-                frag.arguments = bundle
-                val activity = root.context as AppCompatActivity
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(PlayerFragment())
-                    .commit()
-                activity.supportFragmentManager.beginTransaction()
-                    .replace(R.id.container, frag)
-                    .commitNow()
             }
             root.setOnLongClickListener {
                 val videoId = item.url!!.replace("/watch?v=", "")
@@ -122,9 +108,7 @@ class SearchAdapter(
                 true
             }
             searchChannelImage.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, item.uploaderUrl)
-                val bundle = bundleOf("channel_id" to item.uploaderUrl)
-                activity.navController.navigate(R.id.channelFragment, bundle)
             }
         }
     }
@@ -138,9 +122,7 @@ class SearchAdapter(
                 item.subscribers.formatShort()
             ) + " • " + root.context.getString(R.string.videoCount, item.videos.toString())
             root.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, item.url)
-                val bundle = bundleOf("channel_id" to item.url)
-                activity.navController.navigate(R.id.channelFragment, bundle)
             }
             val channelId = item.url?.replace("/channel/", "")!!
             val token = PreferenceHelper.getToken()
@@ -228,10 +210,7 @@ class SearchAdapter(
                     root.context.getString(R.string.videoCount, item.videos.toString())
             }
             root.setOnClickListener {
-                // playlist clicked
+                NavigationHelper.navigatePlaylist(root.context, item.url)
-                val activity = root.context as MainActivity
-                val bundle = bundleOf("playlist_id" to item.url)
-                activity.navController.navigate(R.id.playlistFragment, bundle)
             }
             root.setOnLongClickListener {
                 val playlistId = item.url!!.replace("/playlist?list=", "")

app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt

@@ -1,21 +1,16 @@
 package com.github.libretube.adapters
 
-import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.TrendingRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.formatShort
 
 class SubscriptionAdapter(
@@ -58,34 +53,12 @@ class SubscriptionAdapter(
                 thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark)
             }
             channelImage.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, trending.uploaderUrl)
-                val bundle = bundleOf("channel_id" to trending.uploaderUrl)
-                activity.navController.navigate(R.id.channelFragment, bundle)
-                try {
-                    val mainMotionLayout =
-                        activity.findViewById<MotionLayout>(R.id.mainMotionLayout)
-                    if (mainMotionLayout.progress == 0.toFloat()) {
-                        mainMotionLayout.transitionToEnd()
-                        activity.findViewById<MotionLayout>(R.id.playerMotionLayout)
-                            .transitionToEnd()
-                    }
-                } catch (e: Exception) {
-                }
             }
             ConnectionHelper.loadImage(trending.thumbnail, thumbnail)
             ConnectionHelper.loadImage(trending.uploaderAvatar, channelImage)
             root.setOnClickListener {
-                val bundle = Bundle()
+                NavigationHelper.navigateVideo(root.context, trending.url)
-                bundle.putString("videoId", trending.url!!.replace("/watch?v=", ""))
-                val frag = PlayerFragment()
-                frag.arguments = bundle
-                val activity = root.context as AppCompatActivity
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(PlayerFragment())
-                    .commit()
-                activity.supportFragmentManager.beginTransaction()
-                    .replace(R.id.container, frag)
-                    .commitNow()
             }
             root.setOnLongClickListener {
                 val videoId = trending.url!!.replace("/watch?v=", "")

app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt

@@ -4,15 +4,14 @@ import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.ChannelSubscriptionRowBinding
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.obj.Subscription
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.RetrofitInstance
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -42,9 +41,7 @@ class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscrip
             subscriptionChannelName.text = subscription.name
             ConnectionHelper.loadImage(subscription.avatar, subscriptionChannelImage)
             root.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, subscription.url)
-                val bundle = bundleOf("channel_id" to subscription.url)
-                activity.navController.navigate(R.id.channelFragment, bundle)
             }
             subscriptionSubscribe.setOnClickListener {
                 if (!isLoading) {

app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt

@@ -1,21 +1,16 @@
 package com.github.libretube.adapters
 
-import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.TrendingRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 import com.github.libretube.util.formatShort
 
 class TrendingAdapter(
@@ -49,35 +44,13 @@ class TrendingAdapter(
                 thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark)
             }
             channelImage.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, trending.uploaderUrl)
-                val bundle = bundleOf("channel_id" to trending.uploaderUrl)
-                activity.navController.navigate(R.id.channelFragment, bundle)
-                try {
-                    val mainMotionLayout =
-                        activity.findViewById<MotionLayout>(R.id.mainMotionLayout)
-                    if (mainMotionLayout.progress == 0.toFloat()) {
-                        mainMotionLayout.transitionToEnd()
-                        activity.findViewById<MotionLayout>(R.id.playerMotionLayout)
-                            .transitionToEnd()
-                    }
-                } catch (e: Exception) {
-                }
             }
             ConnectionHelper.loadImage(trending.thumbnail, thumbnail)
             ConnectionHelper.loadImage(trending.uploaderAvatar, channelImage)
 
             root.setOnClickListener {
-                var bundle = Bundle()
+                NavigationHelper.navigateChannel(root.context, trending.url)
-                bundle.putString("videoId", trending.url!!.replace("/watch?v=", ""))
-                var frag = PlayerFragment()
-                frag.arguments = bundle
-                val activity = root.context as AppCompatActivity
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(PlayerFragment())
-                    .commit()
-                activity.supportFragmentManager.beginTransaction()
-                    .replace(R.id.container, frag)
-                    .commitNow()
             }
             root.setOnLongClickListener {
                 val videoId = trending.url!!.replace("/watch?v=", "")

app/src/main/java/com/github/libretube/adapters/WatchHistoryAdapter.kt

@@ -1,21 +1,15 @@
 package com.github.libretube.adapters
 
-import android.os.Bundle
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.WatchHistoryRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.WatchHistoryItem
 import com.github.libretube.util.ConnectionHelper
+import com.github.libretube.util.NavigationHelper
 
 class WatchHistoryAdapter(
     private val watchHistory: MutableList<WatchHistoryItem>,
@@ -47,33 +41,11 @@ class WatchHistoryAdapter(
             ConnectionHelper.loadImage(video.uploaderAvatar, channelImage)
 
             channelImage.setOnClickListener {
-                val activity = root.context as MainActivity
+                NavigationHelper.navigateChannel(root.context, video.uploaderUrl)
-                val bundle = bundleOf("channel_id" to video.uploaderUrl)
-                activity.navController.navigate(R.id.channelFragment, bundle)
-                try {
-                    val mainMotionLayout =
-                        activity.findViewById<MotionLayout>(R.id.mainMotionLayout)
-                    if (mainMotionLayout.progress == 0.toFloat()) {
-                        mainMotionLayout.transitionToEnd()
-                        activity.findViewById<MotionLayout>(R.id.playerMotionLayout)
-                            .transitionToEnd()
-                    }
-                } catch (e: Exception) {
-                }
             }
 
             root.setOnClickListener {
-                var bundle = Bundle()
+                NavigationHelper.navigateVideo(root.context, video.videoId)
-                bundle.putString("videoId", video.videoId)
-                var frag = PlayerFragment()
-                frag.arguments = bundle
-                val activity = root.context as AppCompatActivity
-                activity.supportFragmentManager.beginTransaction()
-                    .remove(PlayerFragment())
-                    .commit()
-                activity.supportFragmentManager.beginTransaction()
-                    .replace(R.id.container, frag)
-                    .commitNow()
             }
             root.setOnLongClickListener {
                 VideoOptionsDialog(video.videoId!!, root.context)

app/src/main/java/com/github/libretube/util/NavigationHelper.kt

@@ -0,0 +1,55 @@
+package com.github.libretube.util
+
+import android.content.Context
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.motion.widget.MotionLayout
+import androidx.core.os.bundleOf
+import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
+import com.github.libretube.fragments.PlayerFragment
+
+object NavigationHelper {
+    fun navigateChannel(context: Context, channelId: String?) {
+        if (channelId != null) {
+            val activity = context as MainActivity
+            val bundle = bundleOf("channel_id" to channelId)
+            activity.navController.navigate(R.id.channelFragment, bundle)
+            try {
+                val mainMotionLayout =
+                    activity.findViewById<MotionLayout>(R.id.mainMotionLayout)
+                if (mainMotionLayout.progress == 0.toFloat()) {
+                    mainMotionLayout.transitionToEnd()
+                    activity.findViewById<MotionLayout>(R.id.playerMotionLayout)
+                        .transitionToEnd()
+                }
+            } catch (e: Exception) {
+            }
+        }
+    }
+
+    fun navigateVideo(context: Context, videoId: String?, playlistId: String? = null) {
+        if (videoId != null) {
+            val bundle = Bundle()
+            bundle.putString("videoId", videoId.replace("/watch?v=", ""))
+            if (playlistId != null) bundle.putString("playlistId", playlistId)
+            val frag = PlayerFragment()
+            frag.arguments = bundle
+            val activity = context as AppCompatActivity
+            activity.supportFragmentManager.beginTransaction()
+                .remove(PlayerFragment())
+                .commit()
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.container, frag)
+                .commitNow()
+        }
+    }
+
+    fun navigatePlaylist(context: Context, playlistId: String?) {
+        if (playlistId != null) {
+            val activity = context as MainActivity
+            val bundle = bundleOf("playlist_id" to playlistId)
+            activity.navController.navigate(R.id.playlistFragment, bundle)
+        }
+    }
+}