Skip to content

refactor(thumbnail-loader): to player thumbnail loader #17564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Sep 7, 2026
+15 −15
Merged

refactor(thumbnail-loader): to player thumbnail loader #17564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/com/nextcloud/client/player/media3/session/MediaSessionBitmapLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import androidx.media3.datasource.DataSourceBitmapLoader
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.ListeningExecutorService
import com.google.common.util.concurrent.MoreExecutors
import com.nextcloud.client.player.model.ThumbnailLoader
import com.nextcloud.client.player.model.PlayerThumbnailLoader
import com.nextcloud.client.player.model.file.PlaybackFile
import com.nextcloud.client.player.util.PlayerUtil.playbackFile
import com.owncloud.android.R
Expand All @@ -32,7 +32,7 @@ import javax.inject.Inject
@UnstableApi
class MediaSessionBitmapLoader @Inject constructor(
private val context: Context,
private val thumbnailLoader: ThumbnailLoader
private val playerThumbnailLoader: PlayerThumbnailLoader
) : BitmapLoader by DataSourceBitmapLoader.Builder(context).build() {

companion object {
Expand Down Expand Up @@ -82,14 +82,14 @@ class MediaSessionBitmapLoader @Inject constructor(
private fun getBitmapFromMetadata(metadata: MediaMetadata, fileId: String?): Bitmap? {
val model = metadata.artworkData ?: metadata.artworkUri ?: return null
return runCatching {
thumbnailLoader.load(model, fileId, thumbnailSize, thumbnailSize).get()
playerThumbnailLoader.load(model, fileId, thumbnailSize, thumbnailSize).get()
}.getOrElse {
null
}
}

private fun getBitmapForFile(file: PlaybackFile): Bitmap? = runCatching {
thumbnailLoader.load(file, thumbnailSize, thumbnailSize).get()
playerThumbnailLoader.load(file, thumbnailSize, thumbnailSize).get()
}.getOrElse {
null
}
Expand Down
2 changes: 1 addition & 1 deletion ...ud/client/player/model/ThumbnailLoader.kt → ...ent/player/model/PlayerThumbnailLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import java.util.concurrent.Future
import javax.inject.Inject
import kotlin.coroutines.resume

class ThumbnailLoader @Inject constructor(
class PlayerThumbnailLoader @Inject constructor(
context: Context,
clientFactory: ClientFactory,
userAccountManager: UserAccountManager
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/nextcloud/client/player/ui/audio/AudioFileFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.nextcloud.client.player.media3.PlaybackModel
import com.nextcloud.client.player.model.ThumbnailLoader
import com.nextcloud.client.player.model.PlayerThumbnailLoader
import com.nextcloud.client.player.model.file.PlaybackFile
import com.nextcloud.client.player.model.state.PlaybackItemMetadata
import com.nextcloud.client.player.model.state.PlaybackState
Expand Down Expand Up @@ -45,7 +45,7 @@ open class AudioFileFragment :
lateinit var playbackModel: PlaybackModel

@Inject
lateinit var thumbnailLoader: ThumbnailLoader
lateinit var playerThumbnailLoader: PlayerThumbnailLoader

private var _binding: PlayerAudioFileFragmentBinding? = null
private val binding get() = checkNotNull(_binding) { "Binding accessed outside of the view lifecycle" }
Expand Down Expand Up @@ -120,15 +120,15 @@ open class AudioFileFragment :
private fun loadFileThumbnail(): Job = viewLifecycleOwner.lifecycleScope.launch {
val context = context ?: return@launch
val thumbnailSize = context.resources.getDimensionPixelSize(R.dimen.player_album_cover_size)
val thumbnail = thumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
val thumbnail = playerThumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
val albumCover = _binding?.albumCover ?: return@launch
albumCover.setImageBitmap(thumbnail)
isFileThumbnailLoaded = true
}

private fun loadMetadataArtwork(metadata: PlaybackItemMetadata) {
val source = metadata.artworkData ?: metadata.artworkUri ?: return
thumbnailLoader.load(binding.albumCover, source, file.id)
playerThumbnailLoader.load(binding.albumCover, source, file.id)
}

private fun PlaybackFile.getDetailsText(): String = listOfNotNull(
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/nextcloud/client/player/ui/video/VideoFileFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.nextcloud.client.player.media3.PlaybackModel
import com.nextcloud.client.player.model.ThumbnailLoader
import com.nextcloud.client.player.model.PlayerThumbnailLoader
import com.nextcloud.client.player.model.file.PlaybackFile
import com.nextcloud.client.player.model.state.PlaybackState
import com.nextcloud.client.player.model.state.VideoSize
Expand Down Expand Up @@ -47,7 +47,7 @@ class VideoFileFragment :
lateinit var playerModel: PlaybackModel

@Inject
lateinit var thumbnailLoader: ThumbnailLoader
lateinit var playerThumbnailLoader: PlayerThumbnailLoader

private var _binding: PlayerVideoFileFragmentBinding? = null
private val binding get() = checkNotNull(_binding) { "Binding accessed outside of the view lifecycle" }
Expand Down Expand Up @@ -105,7 +105,7 @@ class VideoFileFragment :
private fun loadFileThumbnail() = viewLifecycleOwner.lifecycleScope.launch {
val context = context ?: return@launch
val thumbnailSize = context.resources.getDimensionPixelSize(R.dimen.player_album_cover_size)
val thumbnail = thumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
val thumbnail = playerThumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
_binding?.thumbnail?.setImageBitmap(thumbnail)
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.nextcloud.client.player.media3.PlaybackModel
import com.nextcloud.client.player.model.ThumbnailLoader
import com.nextcloud.client.player.model.PlayerThumbnailLoader
import com.nextcloud.client.player.model.file.PlaybackCollection
import com.nextcloud.client.player.model.file.PlaybackFile
import com.nextcloud.client.player.util.PlayerUtil.toPlaybackFile
Expand Down Expand Up @@ -79,7 +79,7 @@ class PreviewPlaybackFragment :
lateinit var playerLauncher: PlayerLauncher

@Inject
lateinit var thumbnailLoader: ThumbnailLoader
lateinit var playerThumbnailLoader: PlayerThumbnailLoader

private lateinit var binding: PreviewPlaybackFragmentBinding
private lateinit var file: OCFile
Expand Down Expand Up @@ -207,7 +207,7 @@ class PreviewPlaybackFragment :
viewLifecycleOwner.lifecycleScope.launch {
val context = context ?: return@launch
val size = context.resources.getDimension(R.dimen.player_album_cover_size).toInt()
thumbnailLoader.await(playbackFile, size, size)?.let(binding.thumbnail::setImageBitmap)
playerThumbnailLoader.await(playbackFile, size, size)?.let(binding.thumbnail::setImageBitmap)
}
}

Expand Down
Loading