kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1456 from Bnyro/master

Browse Source 
improve alternative trending layout
This commit is contained in:
Bnyro 2022-10-02 11:47:49 +02:00 committed by GitHub
commit 712fa75fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/com/github/libretube/ui/adapters/ChannelAdapter.kt
View File

@ -6,6 +6,7 @@ import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.api.obj.StreamItem
import com.github.libretube.databinding.VideoRowBinding import com.github.libretube.databinding.VideoRowBinding
import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.setWatchProgressLength import com.github.libretube.extensions.setWatchProgressLength
@ -16,8 +17,9 @@ import com.github.libretube.util.ImageHelper
import com.github.libretube.util.NavigationHelper import com.github.libretube.util.NavigationHelper
class ChannelAdapter( class ChannelAdapter(
private val videoFeed: MutableList<com.github.libretube.api.obj.StreamItem>, private val videoFeed: MutableList<StreamItem>,
private val childFragmentManager: FragmentManager private val childFragmentManager: FragmentManager,
private val showChannelInfo: Boolean = false
) : ) :
RecyclerView.Adapter<ChannelViewHolder>() { RecyclerView.Adapter<ChannelViewHolder>() {
@ -25,7 +27,7 @@ class ChannelAdapter(
return videoFeed.size return videoFeed.size
} }
fun updateItems(newItems: List<com.github.libretube.api.obj.StreamItem>) { fun updateItems(newItems: List<StreamItem>) {
val feedSize = videoFeed.size val feedSize = videoFeed.size
videoFeed.addAll(newItems) videoFeed.addAll(newItems)
notifyItemRangeInserted(feedSize, newItems.size) notifyItemRangeInserted(feedSize, newItems.size)
@ -39,25 +41,36 @@ class ChannelAdapter(
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun onBindViewHolder(holder: ChannelViewHolder, position: Int) { override fun onBindViewHolder(holder: ChannelViewHolder, position: Int) {
val trending = videoFeed[position] val video = videoFeed[position]
holder.binding.apply { holder.binding.apply {
videoTitle.text = trending.title videoTitle.text = video.title
videoInfo.text = videoInfo.text =
trending.views.formatShort() + " • " + video.views.formatShort() + " • " +
DateUtils.getRelativeTimeSpanString(trending.uploaded!!) DateUtils.getRelativeTimeSpanString(video.uploaded!!)
thumbnailDuration.text = thumbnailDuration.text =
DateUtils.formatElapsedTime(trending.duration!!) DateUtils.formatElapsedTime(video.duration!!)
ImageHelper.loadImage(trending.thumbnail, thumbnail)
root.setOnClickListener { ImageHelper.loadImage(video.thumbnail, thumbnail)
NavigationHelper.navigateVideo(root.context, trending.url)
if (showChannelInfo) {
ImageHelper.loadImage(video.uploaderAvatar, channelImage)
channelName.text = video.uploaderName
} }
val videoId = trending.url!!.toID()
root.setOnClickListener {
NavigationHelper.navigateVideo(root.context, video.url)
}
val videoId = video.url!!.toID()
root.setOnLongClickListener { root.setOnLongClickListener {
VideoOptionsBottomSheet(videoId) VideoOptionsBottomSheet(videoId)
.show(childFragmentManager, VideoOptionsBottomSheet::class.java.name) .show(childFragmentManager, VideoOptionsBottomSheet::class.java.name)
true true
} }
watchProgress.setWatchProgressLength(videoId, trending.duration!!)
watchProgress.setWatchProgressLength(videoId, video.duration!!)
} }
} }
} }

3
app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
View File

@ -115,7 +115,8 @@ class HomeFragment : BaseFragment() {
binding.recview.adapter = ChannelAdapter( binding.recview.adapter = ChannelAdapter(
response.toMutableList(), response.toMutableList(),
childFragmentManager childFragmentManager,
true
) )
} else { } else {
binding.recview.layoutManager = GridLayoutManager( binding.recview.layoutManager = GridLayoutManager(