#1076 - Video playback support

This commit is contained in:
Moez Bhatti
2018-06-06 15:52:19 -04:00
parent d6fa04f56d
commit b2b4e140e2
12 changed files with 102 additions and 25 deletions
@@ -97,19 +97,12 @@ class Navigator @Inject constructor(private val context: Context, private val no
startActivity(intent)
}
fun showImage(partId: Long) {
fun showMedia(partId: Long) {
val intent = Intent(context, GalleryActivity::class.java)
intent.putExtra("partId", partId)
startActivity(intent)
}
fun showVideo(uri: Uri, type: String) {
val intent = Intent(Intent.ACTION_VIEW, uri)
.setDataAndType(uri, type)
startActivityExternal(intent)
}
/**
* Shows the attachment full-screen
* The transitionName for the view should be the id of the image being displayed
@@ -272,10 +272,7 @@ class MessagesAdapter @Inject constructor(
mediaView.video.setVisible(part.isVideo())
mediaView.forwardTouches(view)
mediaView.clicks().subscribe {
when {
part.isImage() -> navigator.showImage(part.id)
part.isVideo() -> navigator.showVideo(part.getUri(), part.type)
}
if (part.isImage() || part.isVideo()) navigator.showMedia(part.id)
}
val canMediaGroupWithPrevious = canGroup(message, previous) || index > 0
@@ -24,17 +24,22 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.moez.QKSMS.R
import common.Navigator
import common.base.QkRealmAdapter
import common.base.QkViewHolder
import common.util.GlideApp
import common.util.extensions.setVisible
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
import model.MmsPart
import util.extensions.isImage
import util.extensions.isVideo
import javax.inject.Inject
class ConversationMediaAdapter @Inject constructor(
private val context: Context
private val context: Context,
private val navigator: Navigator
) : QkRealmAdapter<MmsPart>() {
val thumbnailClicks: PublishSubject<View> = PublishSubject.create()
@@ -55,8 +60,11 @@ class ConversationMediaAdapter @Inject constructor(
.fitCenter()
.into(view.thumbnail)
view.video.setVisible(part.isVideo())
view.thumbnail.transitionName = part.id.toString()
view.thumbnail.setOnClickListener { thumbnailClicks.onNext(it) }
view.thumbnail.setOnClickListener {
if (part.isImage()) thumbnailClicks.onNext(it) else navigator.showMedia(part.id)
}
}
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
@@ -20,12 +20,21 @@ package feature.gallery
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.net.Uri
import android.os.Bundle
import android.transition.ChangeBounds
import android.transition.ChangeImageTransform
import android.transition.TransitionSet
import android.view.Menu
import android.view.MenuItem
import com.google.android.exoplayer2.ExoPlayerFactory
import com.google.android.exoplayer2.SimpleExoPlayer
import com.google.android.exoplayer2.source.ExtractorMediaSource
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
import com.google.android.exoplayer2.util.Util
import com.google.android.mms.ContentType
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import common.GlideCompletionListener
@@ -38,6 +47,7 @@ import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.gallery_activity.*
import javax.inject.Inject
class GalleryActivity : QkActivity(), GalleryView {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -47,6 +57,8 @@ class GalleryActivity : QkActivity(), GalleryView {
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] }
private var exoPlayer: SimpleExoPlayer? = null
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
@@ -91,9 +103,19 @@ class GalleryActivity : QkActivity(), GalleryView {
title = state.title
when {
ContentType.isImageType(state.type) -> showImage(state.uri)
ContentType.isVideoType(state.type) -> showVideo(state.uri)
else -> hideMedia()
}
}
private fun showImage(uri: Uri?) {
image.setVisible(true)
video.setVisible(false)
if (image.drawable == null) {
GlideApp.with(this)
.load(state.imageUri)
.load(uri)
.dontAnimate()
.listener(GlideCompletionListener {
startPostponedEnterTransition()
@@ -102,6 +124,27 @@ class GalleryActivity : QkActivity(), GalleryView {
}
}
private fun showVideo(uri: Uri?) {
image.setVisible(false)
video.setVisible(true)
if (video.player == null) {
val videoTrackSelectionFactory = AdaptiveTrackSelection.Factory(null)
val trackSelector = DefaultTrackSelector(videoTrackSelectionFactory)
exoPlayer = ExoPlayerFactory.newSimpleInstance(this, trackSelector)
video.player = exoPlayer
val dataSourceFactory = DefaultDataSourceFactory(this, Util.getUserAgent(this, "QKSMS"))
val videoSource = ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(uri)
exoPlayer?.prepare(videoSource)
}
}
private fun hideMedia() {
image.setVisible(false)
video.setVisible(false)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.gallery, menu)
return super.onCreateOptionsMenu(menu)
@@ -115,4 +158,9 @@ class GalleryActivity : QkActivity(), GalleryView {
return true
}
override fun onDestroy() {
super.onDestroy()
exoPlayer?.release()
}
}
@@ -23,5 +23,6 @@ import android.net.Uri
data class GalleryState(
val navigationVisible: Boolean = true,
val title: String = "",
val imageUri: Uri? = null
val uri: Uri? = null,
val type: String = ""
)
@@ -47,8 +47,7 @@ class GalleryViewModel @Inject constructor(
init {
disposables += partIdFlowable
.mapNotNull { partId -> messageRepo.getPart(partId) }
.mapNotNull { part -> part.getUri() }
.subscribe { uri -> newState { copy(imageUri = uri) } }
.subscribe { part -> newState { copy(uri = part.getUri(), type = part.type) } }
disposables += partIdFlowable
.mapNotNull { partId -> messageRepo.getMessageForPart(partId) }