mirror of
https://github.com/nextcloud/talk-android
synced 2025-03-06 14:27:24 +00:00
Merge remote-tracking branch 'origin/Share' into Share
This commit is contained in:
commit
ab64a30957
@ -36,7 +36,6 @@ import androidx.annotation.OptIn
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.FileProvider
|
import androidx.core.content.FileProvider
|
||||||
import androidx.media3.common.MediaItem
|
import androidx.media3.common.MediaItem
|
||||||
import androidx.media3.common.Player
|
|
||||||
import androidx.media3.common.util.UnstableApi
|
import androidx.media3.common.util.UnstableApi
|
||||||
import androidx.media3.exoplayer.ExoPlayer
|
import androidx.media3.exoplayer.ExoPlayer
|
||||||
import androidx.media3.ui.PlayerView
|
import androidx.media3.ui.PlayerView
|
||||||
@ -49,7 +48,7 @@ import com.nextcloud.talk.utils.Mimetype.VIDEO_PREFIX_GENERIC
|
|||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
@AutoInjector(NextcloudTalkApplication::class)
|
@AutoInjector(NextcloudTalkApplication::class)
|
||||||
class FullScreenMediaActivity : AppCompatActivity(), Player.Listener {
|
class FullScreenMediaActivity : AppCompatActivity() {
|
||||||
lateinit var binding: ActivityFullScreenMediaBinding
|
lateinit var binding: ActivityFullScreenMediaBinding
|
||||||
|
|
||||||
private lateinit var path: String
|
private lateinit var path: String
|
||||||
@ -138,7 +137,6 @@ class FullScreenMediaActivity : AppCompatActivity(), Player.Listener {
|
|||||||
private fun initializePlayer() {
|
private fun initializePlayer() {
|
||||||
player = ExoPlayer.Builder(applicationContext).build()
|
player = ExoPlayer.Builder(applicationContext).build()
|
||||||
binding.playerView.player = player
|
binding.playerView.player = player
|
||||||
player?.addListener(this)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun preparePlayer() {
|
private fun preparePlayer() {
|
||||||
|
Loading…
Reference in New Issue
Block a user