Upgrade to ViewPager2

Should hopefully address #1340
This commit is contained in:
moezbhatti
2019-03-05 00:57:26 -05:00
parent d707cb30b5
commit 16b949d89b
6 changed files with 69 additions and 87 deletions
+1
View File
@@ -7,6 +7,7 @@ buildscript {
ext.androidx_emoji_version = '1.0.0' ext.androidx_emoji_version = '1.0.0'
ext.androidx_exifinterface_version = '1.0.0' ext.androidx_exifinterface_version = '1.0.0'
ext.androidx_testrunner_version = '1.1.0-alpha3' ext.androidx_testrunner_version = '1.1.0-alpha3'
ext.androidx_viewpager_version = '1.0.0-alpha01'
ext.autodispose_version = '0.7.0' ext.autodispose_version = '0.7.0'
ext.conductor_version = '2.1.5' ext.conductor_version = '2.1.5'
ext.dagger_version = "2.16" ext.dagger_version = "2.16"
+2 -1
View File
@@ -113,8 +113,9 @@ dependencies {
implementation "androidx.appcompat:appcompat:$androidx_appcompat_version" implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version" implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version"
implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.core:core-ktx:$androidx_core_version"
implementation "com.google.android.material:material:$material_version"
implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version" implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version"
implementation "androidx.viewpager2:viewpager2:$androidx_viewpager_version"
implementation "com.google.android.material:material:$material_version"
// conductor // conductor
implementation "com.bluelinelabs:conductor:$conductor_version" implementation "com.bluelinelabs:conductor:$conductor_version"
@@ -24,8 +24,11 @@ import android.view.MenuItem
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager2.widget.ViewPager2
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.QkActivity import com.moez.QKSMS.common.base.QkActivity
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.addOnPageChangeListener import com.moez.QKSMS.common.util.extensions.addOnPageChangeListener
import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.model.MmsPart import com.moez.QKSMS.model.MmsPart
@@ -38,9 +41,12 @@ import javax.inject.Inject
class GalleryActivity : QkActivity(), GalleryView { class GalleryActivity : QkActivity(), GalleryView {
@Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@Inject lateinit var pagerAdapter: GalleryPagerAdapter @Inject lateinit var pagerAdapter: GalleryPagerAdapter
val partId by lazy { intent.getLongExtra("partId", 0L) }
private val optionsItemSubject: Subject<Int> = PublishSubject.create() private val optionsItemSubject: Subject<Int> = PublishSubject.create()
private val pageChangedSubject: Subject<MmsPart> = PublishSubject.create() private val pageChangedSubject: Subject<MmsPart> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] }
@@ -52,20 +58,29 @@ class GalleryActivity : QkActivity(), GalleryView {
showBackButton(true) showBackButton(true)
viewModel.bindView(this) viewModel.bindView(this)
pagerAdapter.setInitialPositionHandler = { position ->
pager.setCurrentItem(position, false)
// The ViewPager's page change listener isn't called if the initial position is 0
if (position == 0) {
pageChanged(0)
}
}
pager.adapter = pagerAdapter pager.adapter = pagerAdapter
pager.addOnPageChangeListener(this::pageChanged) pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
this@GalleryActivity.onPageSelected(position)
}
})
pagerAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
override fun onChanged() {
pagerAdapter.data?.takeIf { pagerAdapter.itemCount > 0 }
?.indexOfFirst { part -> part.id == partId }
?.let { index ->
onPageSelected(index)
pager.setCurrentItem(index, false)
pagerAdapter.unregisterAdapterDataObserver(this)
}
}
})
} }
private fun pageChanged(position: Int) { fun onPageSelected(position: Int) {
toolbarSubtitle.text = pagerAdapter.getPageTitle(position) toolbarSubtitle.text = pagerAdapter.getItem(position)?.messages?.firstOrNull()?.date
?.let(dateFormatter::getDetailedTimestamp)
toolbarSubtitle.isVisible = toolbarTitle.text.isNotBlank() toolbarSubtitle.isVisible = toolbarTitle.text.isNotBlank()
pagerAdapter.getItem(position)?.run(pageChangedSubject::onNext) pagerAdapter.getItem(position)?.run(pageChangedSubject::onNext)
@@ -75,7 +90,7 @@ class GalleryActivity : QkActivity(), GalleryView {
toolbar.setVisible(state.navigationVisible) toolbar.setVisible(state.navigationVisible)
title = state.title title = state.title
pagerAdapter.parts = state.parts pagerAdapter.updateData(state.parts)
} }
override fun optionsItemSelected(): Observable<Int> = optionsItemSubject override fun optionsItemSelected(): Observable<Int> = optionsItemSubject
@@ -34,7 +34,7 @@ class GalleryActivityModule {
@Provides @Provides
@Named("partId") @Named("partId")
fun providePartId(activity: GalleryActivity): Long = activity.intent.getLongExtra("partId", 0L) fun providePartId(activity: GalleryActivity): Long = activity.partId
@Provides @Provides
@IntoMap @IntoMap
@@ -22,7 +22,6 @@ import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.viewpager.widget.PagerAdapter
import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.ExoPlayerFactory import com.google.android.exoplayer2.ExoPlayerFactory
import com.google.android.exoplayer2.source.ExtractorMediaSource import com.google.android.exoplayer2.source.ExtractorMediaSource
@@ -32,57 +31,36 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
import com.google.android.exoplayer2.util.Util import com.google.android.exoplayer2.util.Util
import com.google.android.mms.ContentType import com.google.android.mms.ContentType
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.base.QkRealmAdapter
import com.moez.QKSMS.common.base.QkViewHolder
import com.moez.QKSMS.extensions.isImage import com.moez.QKSMS.extensions.isImage
import com.moez.QKSMS.extensions.isVideo import com.moez.QKSMS.extensions.isVideo
import com.moez.QKSMS.model.MmsPart import com.moez.QKSMS.model.MmsPart
import com.moez.QKSMS.util.GlideApp import com.moez.QKSMS.util.GlideApp
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import io.realm.RealmResults
import kotlinx.android.synthetic.main.gallery_image_page.view.* import kotlinx.android.synthetic.main.gallery_image_page.view.*
import kotlinx.android.synthetic.main.gallery_video_page.view.* import kotlinx.android.synthetic.main.gallery_video_page.view.*
import java.util.* import java.util.*
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Named
class GalleryPagerAdapter @Inject constructor( class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter<MmsPart>() {
context: Context,
@Named("partId") private val partId: Long,
private val dateFormatter: DateFormatter
) : PagerAdapter() {
var parts: RealmResults<MmsPart>? = null companion object {
set(value) { private const val VIEW_TYPE_INVALID = 0
if (field === value) return private const val VIEW_TYPE_IMAGE = 1
field = value private const val VIEW_TYPE_VIDEO = 2
}
field?.asFlowable()
?.filter { it.isLoaded }
?.subscribe { notifyDataSetChanged() }
?.run(disposables::add)
}
val clicks: Subject<View> = PublishSubject.create() val clicks: Subject<View> = PublishSubject.create()
/**
* The Adapter isn't able to set the position itself, so it's owner must apply the initial
* position once the data is loaded
*/
var setInitialPositionHandler: ((Int) -> Unit)? = null
private var loaded = false
private val contentResolver = context.contentResolver private val contentResolver = context.contentResolver
private val disposables = CompositeDisposable()
private val exoPlayers = Collections.newSetFromMap(WeakHashMap<ExoPlayer?, Boolean>()) private val exoPlayers = Collections.newSetFromMap(WeakHashMap<ExoPlayer?, Boolean>())
override fun instantiateItem(container: ViewGroup, position: Int): Any { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val part = getItem(position) val inflater = LayoutInflater.from(parent.context)
val inflater = LayoutInflater.from(container.context) return QkViewHolder(when (viewType) {
return when { VIEW_TYPE_IMAGE -> inflater.inflate(R.layout.gallery_image_page, parent, false).apply {
part?.isImage() == true -> inflater.inflate(R.layout.gallery_image_page, container, false).apply {
// When calling the public setter, it doesn't allow the midscale to be the same as the // When calling the public setter, it doesn't allow the midscale to be the same as the
// maxscale or the minscale. We don't want 3 levels and we don't want to modify the library // maxscale or the minscale. We don't want 3 levels and we don't want to modify the library
@@ -101,72 +79,59 @@ class GalleryPagerAdapter @Inject constructor(
setFloat(image.attacher, 3f) setFloat(image.attacher, 3f)
} }
} }
}
VIEW_TYPE_VIDEO -> inflater.inflate(R.layout.gallery_video_page, parent, false)
else -> inflater.inflate(R.layout.gallery_invalid_page, parent, false)
}.apply { setOnClickListener(clicks::onNext) })
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val part = getItem(position)!!
val view = holder.containerView
when (getItemViewType(position)) {
VIEW_TYPE_IMAGE -> {
// We need to explicitly request a gif from glide for animations to work // We need to explicitly request a gif from glide for animations to work
when (part.getUri().let(contentResolver::getType)) { when (part.getUri().let(contentResolver::getType)) {
ContentType.IMAGE_GIF -> GlideApp.with(context) ContentType.IMAGE_GIF -> GlideApp.with(context)
.asGif() .asGif()
.load(part.getUri()) .load(part.getUri())
.into(image) .into(view.image)
else -> GlideApp.with(context) else -> GlideApp.with(context)
.asBitmap() .asBitmap()
.load(part.getUri()) .load(part.getUri())
.into(image) .into(view.image)
} }
container.addView(this)
} }
part?.isVideo() == true -> inflater.inflate(R.layout.gallery_video_page, container, false).apply { VIEW_TYPE_VIDEO -> {
val videoTrackSelectionFactory = AdaptiveTrackSelection.Factory(null) val videoTrackSelectionFactory = AdaptiveTrackSelection.Factory(null)
val trackSelector = DefaultTrackSelector(videoTrackSelectionFactory) val trackSelector = DefaultTrackSelector(videoTrackSelectionFactory)
val exoPlayer = ExoPlayerFactory.newSimpleInstance(context, trackSelector) val exoPlayer = ExoPlayerFactory.newSimpleInstance(context, trackSelector)
video.player = exoPlayer view.video.player = exoPlayer
exoPlayers.add(exoPlayer) exoPlayers.add(exoPlayer)
val dataSourceFactory = DefaultDataSourceFactory(context, Util.getUserAgent(context, "QKSMS")) val dataSourceFactory = DefaultDataSourceFactory(context, Util.getUserAgent(context, "QKSMS"))
val videoSource = ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(part.getUri()) val videoSource = ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(part.getUri())
exoPlayer?.prepare(videoSource) exoPlayer?.prepare(videoSource)
container.addView(this)
} }
}
else -> inflater.inflate(R.layout.gallery_invalid_page, container, false).apply {
container.addView(this)
}
}.apply { setOnClickListener(clicks::onNext) }
} }
override fun getPageTitle(position: Int): CharSequence? { override fun getItemViewType(position: Int): Int {
return getItem(position)?.messages?.firstOrNull()?.date?.let(dateFormatter::getDetailedTimestamp) val part = getItem(position)
} return when {
part?.isImage() == true -> VIEW_TYPE_IMAGE
override fun isViewFromObject(view: View, `object`: Any): Boolean { part?.isVideo() == true -> VIEW_TYPE_VIDEO
return view == `object` else -> VIEW_TYPE_INVALID
}
override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
container.removeView(`object` as? View)
}
override fun getCount() = parts?.size ?: 0
fun getItem(position: Int): MmsPart? = parts?.get(position)
override fun notifyDataSetChanged() {
super.notifyDataSetChanged()
if (!loaded && parts?.isLoaded == true) {
loaded = true
parts?.indexOfFirst { it.id == partId }
?.let { setInitialPositionHandler?.invoke(it) }
} }
} }
fun destroy() { fun destroy() {
disposables.dispose()
exoPlayers.forEach { exoPlayer -> exoPlayer?.release() } exoPlayers.forEach { exoPlayer -> exoPlayer?.release() }
} }
} }
@@ -25,7 +25,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.moez.QKSMS.feature.gallery.GalleryActivity"> tools:context="com.moez.QKSMS.feature.gallery.GalleryActivity">
<androidx.viewpager.widget.ViewPager <androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />