Merge pull request #4379 from Bnyro/master

chore: simplify RecyclerView.Adapter#getItemCount where possible

app/src/main/java/com/github/libretube/ui/adapters/BottomSheetAdapter.kt

@@ -35,7 +35,5 @@ class BottomSheetAdapter(
         }
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = items.size
-        return items.size
-    }
 }

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

@@ -134,7 +134,5 @@ class CommentsAdapter(
         }
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = comments.size
-        return comments.size
-    }
 }

app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt

@@ -141,7 +141,5 @@ class DownloadsAdapter(
         notifyItemInserted(position)
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = downloads.size
-        return downloads.size
-    }
 }

app/src/main/java/com/github/libretube/ui/adapters/IconsSheetAdapter.kt

@@ -18,9 +18,7 @@ class IconsSheetAdapter : RecyclerView.Adapter<IconsSheetViewHolder>() {
         return IconsSheetViewHolder(binding)
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = availableIcons.size
-        return availableIcons.size
-    }
 
     override fun onBindViewHolder(holder: IconsSheetViewHolder, position: Int) {
         val appIcon = availableIcons[position]

app/src/main/java/com/github/libretube/ui/adapters/LegacySubscriptionAdapter.kt

@@ -47,7 +47,5 @@ class LegacySubscriptionAdapter(
         }
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = subscriptions.size
-        return subscriptions.size
-    }
 }

app/src/main/java/com/github/libretube/ui/adapters/NavBarOptionsAdapter.kt

@@ -22,9 +22,7 @@ class NavBarOptionsAdapter(
         return NavBarOptionsViewHolder(binding)
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = items.size
-        return items.size
-    }
 
     override fun onBindViewHolder(holder: NavBarOptionsViewHolder, position: Int) {
         val item = items[position]

app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt

@@ -24,9 +24,7 @@ class PlayingQueueAdapter : RecyclerView.Adapter<PlayingQueueViewHolder>() {
         return PlayingQueueViewHolder(binding)
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = PlayingQueue.size()
-        return PlayingQueue.size()
-    }
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: PlayingQueueViewHolder, position: Int) {

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

@@ -18,9 +18,7 @@ class PlaylistsAdapter(
     private val playlistType: PlaylistType
 ) : RecyclerView.Adapter<PlaylistsViewHolder>() {
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = playlists.size
-        return playlists.size
-    }
 
     fun updateItems(newItems: List<Playlists>) {
         val oldSize = playlists.size

app/src/main/java/com/github/libretube/ui/adapters/SearchHistoryAdapter.kt

@@ -18,9 +18,7 @@ class SearchHistoryAdapter(
 ) :
     RecyclerView.Adapter<SuggestionsViewHolder>() {
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = historyList.size
-        return historyList.size
-    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SuggestionsViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)

app/src/main/java/com/github/libretube/ui/adapters/SearchSuggestionsAdapter.kt

@@ -13,9 +13,7 @@ class SearchSuggestionsAdapter(
 ) :
     RecyclerView.Adapter<SuggestionsViewHolder>() {
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = suggestionsList.size
-        return suggestionsList.size
-    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SuggestionsViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)

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

@@ -17,9 +17,7 @@ class SubscriptionChannelAdapter(
     private val subscriptions: MutableList<Subscription>
 ) : RecyclerView.Adapter<SubscriptionChannelViewHolder>() {
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = subscriptions.size
-        return subscriptions.size
-    }
 
     override fun onCreateViewHolder(
         parent: ViewGroup,

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

@@ -24,7 +24,7 @@ class WatchHistoryAdapter(
 
     private var visibleCount = minOf(10, watchHistory.size)
 
-    override fun getItemCount(): Int = visibleCount
+    override fun getItemCount() = visibleCount
 
     fun removeFromWatchHistory(position: Int) {
         val history = watchHistory[position]