From 1808bbceee798d20be861dbe8551687c982115d9 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 6 Nov 2022 10:27:53 +0100
Subject: [PATCH] fix warnings

---
 .../libretube/ui/adapters/CommentsAdapter.kt  | 62 ++++++++++---------
 .../libretube/ui/sheets/PlaybackSpeedSheet.kt |  4 +-
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
index 941b1ded9..1c612dd39 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -71,8 +72,7 @@ class CommentsAdapter(
             if (comment.hearted == true) heartedImageView.visibility = View.VISIBLE
             if (comment.repliesPage != null) repliesAvailable.visibility = View.VISIBLE
             if ((comment.replyCount ?: -1L) > 0L) {
-                repliesCount.text =
-                    comment.replyCount?.formatShort()
+                repliesCount.text = comment.replyCount?.formatShort()
             }
 
             commentorImage.setOnClickListener {
@@ -89,33 +89,7 @@ class CommentsAdapter(
             repliesRecView.adapter = repliesAdapter
             if (!isRepliesAdapter && comment.repliesPage != null) {
                 root.setOnClickListener {
-                    when {
-                        repliesAdapter.itemCount.equals(0) -> {
-                            fetchReplies(comment.repliesPage) {
-                                repliesAdapter.updateItems(it.comments)
-                                if (repliesPage.nextpage == null) {
-                                    showMore.visibility = View.GONE
-                                    return@fetchReplies
-                                }
-                                showMore.visibility = View.VISIBLE
-                                showMore.setOnClickListener {
-                                    if (repliesPage.nextpage == null) {
-                                        it.visibility = View.GONE
-                                        return@setOnClickListener
-                                    }
-                                    fetchReplies(
-                                        repliesPage.nextpage!!
-                                    ) {
-                                        repliesAdapter.updateItems(repliesPage.comments)
-                                    }
-                                }
-                            }
-                        }
-                        else -> {
-                            repliesAdapter.clear()
-                            showMore.visibility = View.GONE
-                        }
-                    }
+                    showMoreReplies(comment.repliesPage, showMore, repliesAdapter)
                 }
             }
 
@@ -127,6 +101,36 @@ class CommentsAdapter(
         }
     }
 
+    private fun showMoreReplies(nextPage: String, showMoreBtn: Button, repliesAdapter: CommentsAdapter) {
+        when {
+            repliesAdapter.itemCount.equals(0) -> {
+                fetchReplies(nextPage) {
+                    repliesAdapter.updateItems(it.comments)
+                    if (repliesPage.nextpage == null) {
+                        showMoreBtn.visibility = View.GONE
+                        return@fetchReplies
+                    }
+                    showMoreBtn.visibility = View.VISIBLE
+                    showMoreBtn.setOnClickListener {
+                        if (repliesPage.nextpage == null) {
+                            it.visibility = View.GONE
+                            return@setOnClickListener
+                        }
+                        fetchReplies(
+                            repliesPage.nextpage!!
+                        ) {
+                            repliesAdapter.updateItems(repliesPage.comments)
+                        }
+                    }
+                }
+            }
+            else -> {
+                repliesAdapter.clear()
+                showMoreBtn.visibility = View.GONE
+            }
+        }
+    }
+
     override fun getItemCount(): Int {
         return comments.size
     }
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/PlaybackSpeedSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/PlaybackSpeedSheet.kt
index 6583fca95..0e5149316 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/PlaybackSpeedSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/PlaybackSpeedSheet.kt
@@ -30,11 +30,11 @@ class PlaybackSpeedSheet(
         binding.speed.value = player.playbackParameters.speed
         binding.pitch.value = player.playbackParameters.pitch
 
-        binding.speed.addOnChangeListener { _, value, _ ->
+        binding.speed.addOnChangeListener { _, _, _ ->
             onChange()
         }
 
-        binding.pitch.addOnChangeListener { _, value, _ ->
+        binding.pitch.addOnChangeListener { _, _, _ ->
             onChange()
         }