mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Animate image from gallery to viewer
This commit is contained in:
@@ -27,6 +27,7 @@ import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.di.appComponent
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.conversation_info_activity.*
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkThemedActivity
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -38,6 +39,7 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
||||
override val deleteIntent by lazy { delete.clicks() }
|
||||
override val confirmDeleteIntent: PublishSubject<Unit> = PublishSubject.create()
|
||||
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
|
||||
@Inject lateinit var mediaAdapter: ConversationMediaAdapter
|
||||
@Inject lateinit var itemDecoration: GridSpacingItemDecoration
|
||||
@@ -57,6 +59,10 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||
|
||||
mediaAdapter.thumbnailClicks
|
||||
.autoDisposable(scope())
|
||||
.subscribe { view -> navigator.showImageAnimated(this, view) }
|
||||
|
||||
recipients.adapter = recipientAdapter
|
||||
|
||||
media.adapter = mediaAdapter
|
||||
|
||||
+7
-6
@@ -21,6 +21,7 @@ package presentation.feature.conversationinfo
|
||||
import android.content.Context
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.moez.QKSMS.R
|
||||
import common.util.Colors
|
||||
@@ -28,18 +29,19 @@ import common.util.GlideApp
|
||||
import data.model.MmsPart
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkAdapter
|
||||
import presentation.common.base.QkViewHolder
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationMediaAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val colors: Colors,
|
||||
private val navigator: Navigator
|
||||
private val colors: Colors
|
||||
) : QkAdapter<MmsPart>() {
|
||||
|
||||
val thumbnailClicks: PublishSubject<View> = PublishSubject.create()
|
||||
|
||||
private val disposables = CompositeDisposable()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
|
||||
@@ -59,9 +61,8 @@ class ConversationMediaAdapter @Inject constructor(
|
||||
.fitCenter()
|
||||
.into(view.thumbnail)
|
||||
|
||||
view.thumbnail.setOnClickListener {
|
||||
navigator.showImage(part.id)
|
||||
}
|
||||
view.thumbnail.transitionName = part.id.toString()
|
||||
view.thumbnail.setOnClickListener { thumbnailClicks.onNext(it) }
|
||||
}
|
||||
|
||||
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) {
|
||||
|
||||
@@ -19,11 +19,15 @@
|
||||
package presentation.feature.gallery
|
||||
|
||||
import android.os.Bundle
|
||||
import android.transition.ChangeBounds
|
||||
import android.transition.ChangeImageTransform
|
||||
import android.transition.TransitionSet
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import common.util.GlideApp
|
||||
import common.util.extensions.setVisible
|
||||
import kotlinx.android.synthetic.main.gallery_activity.*
|
||||
import presentation.common.GlideCompletionListener
|
||||
import presentation.common.base.QkActivity
|
||||
|
||||
class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
|
||||
@@ -34,9 +38,22 @@ class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.gallery_activity)
|
||||
postponeEnterTransition()
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
val transition = TransitionSet().apply {
|
||||
duration = 100
|
||||
|
||||
addTransition(ChangeBounds())
|
||||
addTransition(ChangeImageTransform())
|
||||
}
|
||||
|
||||
window.sharedElementReturnTransition = transition
|
||||
window.sharedElementEnterTransition = transition
|
||||
|
||||
image.transitionName = intent.getLongExtra("partId", 0L).toString()
|
||||
|
||||
// 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
|
||||
// so let's celebrate the invention of reflection!
|
||||
@@ -62,7 +79,13 @@ class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
|
||||
title = state.title
|
||||
|
||||
if (image.drawable == null) {
|
||||
GlideApp.with(this).load(state.imagePath).into(image)
|
||||
GlideApp.with(this)
|
||||
.load(state.imagePath)
|
||||
.dontAnimate()
|
||||
.listener(GlideCompletionListener {
|
||||
startPostponedEnterTransition()
|
||||
})
|
||||
.into(image)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user