kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 06:40:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #5159 from FineFindus/fix/creator-highlight

Browse Source 
fix: properly apply creator highlight
This commit is contained in:
Bnyro 2023-11-15 19:12:36 +01:00 committed by GitHub
commit c86477c32b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
View File

@ -77,7 +77,10 @@ object DatabaseHelper {
} }
} }
suspend fun filterByWatchStatus(streams: List<WatchHistoryItem>, unfinished: Boolean = true): List<WatchHistoryItem> { suspend fun filterByWatchStatus(
streams: List<WatchHistoryItem>,
unfinished: Boolean = true
): List<WatchHistoryItem> {
return streams.filter { return streams.filter {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
val historyItem = Database.watchPositionDao() val historyItem = Database.watchPositionDao()

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

@ -73,9 +73,9 @@ class CommentsAdapter(
val comment = comments[position] val comment = comments[position]
holder.binding.apply { holder.binding.apply {
commentAuthor.text = comment.author commentAuthor.text = comment.author
if (comment.channelOwner) { commentAuthor.setBackgroundResource(
commentAuthor.setBackgroundResource(R.drawable.comment_channel_owner_bg) if (comment.channelOwner) R.drawable.comment_channel_owner_bg else 0
} )
commentInfos.text = TextUtils.SEPARATOR + comment.commentedTime commentInfos.text = TextUtils.SEPARATOR + comment.commentedTime
commentText.movementMethod = LinkMovementMethodCompat.getInstance() commentText.movementMethod = LinkMovementMethodCompat.getInstance()

1
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -37,7 +37,6 @@ import androidx.fragment.app.commit
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.media3.common.C import androidx.media3.common.C
import androidx.media3.common.C.WakeMode
import androidx.media3.common.MediaItem import androidx.media3.common.MediaItem
import androidx.media3.common.MediaItem.SubtitleConfiguration import androidx.media3.common.MediaItem.SubtitleConfiguration
import androidx.media3.common.MimeTypes import androidx.media3.common.MimeTypes

15
app/src/main/java/com/github/libretube/util/PlayingQueue.kt
View File

@ -145,15 +145,16 @@ object PlayingQueue {
} }
} }
private fun fetchMoreFromPlaylist(playlistId: String, nextPage: String?, isMainList: Boolean) = runCatchingIO { private fun fetchMoreFromPlaylist(playlistId: String, nextPage: String?, isMainList: Boolean) =
var playlistNextPage = nextPage runCatchingIO {
while (playlistNextPage != null) { var playlistNextPage = nextPage
RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage).run { while (playlistNextPage != null) {
addToQueueAsync(relatedStreams, isMainList = isMainList) RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage).run {
playlistNextPage = this.nextpage addToQueueAsync(relatedStreams, isMainList = isMainList)
playlistNextPage = this.nextpage
}
} }
} }
}
fun insertPlaylist(playlistId: String, newCurrentStream: StreamItem?) = runCatchingIO { fun insertPlaylist(playlistId: String, newCurrentStream: StreamItem?) = runCatchingIO {
val playlist = PlaylistsHelper.getPlaylist(playlistId) val playlist = PlaylistsHelper.getPlaylist(playlistId)