Code cleanup

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt

@@ -281,7 +281,7 @@ class VideoDetailFragment :
 
         pageAdapter = TabAdapter(childFragmentManager)
         binding.viewPager.setAdapter(pageAdapter)
-        binding.tabLayout.setupWithViewPager(this@VideoDetailFragment.binding.viewPager)
+        binding.tabLayout.setupWithViewPager(binding.viewPager)
 
         binding.detailThumbnailRootLayout.requestFocus()
 
@@ -318,8 +318,10 @@ class VideoDetailFragment :
                                 }
                                 if (stack.peek()?.playQueue != viewModel.playQueue) {
                                     // also if stack empty (!)
-                                    val item = StackItem(viewModel.serviceId, viewModel.url,
-                                        viewModel.title, viewModel.playQueue)
+                                    val item = StackItem(
+                                        viewModel.serviceId, viewModel.url,
+                                        viewModel.title, viewModel.playQueue
+                                    )
                                     stack.push(item)
                                 }
                             }
@@ -679,8 +681,7 @@ class VideoDetailFragment :
         setAutoPlay(false)
         hideMainPlayerOnLoadingNewStream()
 
-        viewModel.updateData(item.serviceId, item.url, item.title.orEmpty(),
-            item.playQueue)
+        viewModel.updateData(item.serviceId, item.url, item.title.orEmpty(), item.playQueue)
         viewModel.startLoading(false)
 
         // Maybe an item was deleted in background activity

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt

@@ -4,14 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.compose.material3.Surface
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.compose.content
 import androidx.lifecycle.viewmodel.compose.viewModel
 import org.schabi.newpipe.ui.components.video.comment.CommentSection
 import org.schabi.newpipe.ui.theme.AppTheme
-import org.schabi.newpipe.util.KEY_SERVICE_ID
-import org.schabi.newpipe.util.KEY_URL
 
 class CommentsFragment : Fragment() {
     override fun onCreateView(
@@ -25,11 +22,4 @@ class CommentsFragment : Fragment() {
             }
         }
     }
-
-    companion object {
-        @JvmStatic
-        fun getInstance(serviceId: Int, url: String?) = CommentsFragment().apply {
-            arguments = bundleOf(KEY_SERVICE_ID to serviceId, KEY_URL to url)
-        }
-    }
 }

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.kt

@@ -4,14 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.compose.material3.Surface
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.compose.content
 import androidx.lifecycle.viewmodel.compose.viewModel
-import org.schabi.newpipe.extractor.stream.StreamInfo
 import org.schabi.newpipe.ui.components.video.RelatedItems
 import org.schabi.newpipe.ui.theme.AppTheme
-import org.schabi.newpipe.util.KEY_INFO
 
 class RelatedItemsFragment : Fragment() {
     override fun onCreateView(
@@ -25,11 +22,4 @@ class RelatedItemsFragment : Fragment() {
             }
         }
     }
-
-    companion object {
-        @JvmStatic
-        fun getInstance(info: StreamInfo) = RelatedItemsFragment().apply {
-            arguments = bundleOf(KEY_INFO to info)
-        }
-    }
 }

app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt

@@ -38,16 +38,16 @@ import org.schabi.newpipe.viewmodels.VideoDetailViewModel
 import org.schabi.newpipe.viewmodels.util.Resource
 
 @Composable
-fun CommentSection(videoDetailViewModel: VideoDetailViewModel) {
-    val streamState by videoDetailViewModel.streamState.collectAsStateWithLifecycle()
-    val commentState by videoDetailViewModel.commentState.collectAsStateWithLifecycle()
+fun CommentSection(viewModel: VideoDetailViewModel) {
+    val streamState by viewModel.streamState.collectAsStateWithLifecycle()
+    val commentState by viewModel.commentState.collectAsStateWithLifecycle()
     val avatars = (streamState as? Resource.Success)?.data?.uploaderAvatars.orEmpty()
     val uploaderAvatarUrl = ImageStrategy.choosePreferredImage(avatars)
 
     CommentSection(
         commentState,
         uploaderAvatarUrl,
-        videoDetailViewModel.comments,
+        viewModel.comments,
     )
 }