forked from upstream-mirrors/quik
Animate image from gallery to viewer
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.common
|
||||
|
||||
import com.bumptech.glide.load.DataSource
|
||||
import com.bumptech.glide.load.engine.GlideException
|
||||
import com.bumptech.glide.request.RequestListener
|
||||
import com.bumptech.glide.request.target.Target
|
||||
|
||||
class GlideCompletionListener<T>(private val listener: () -> Unit) : RequestListener<T> {
|
||||
|
||||
override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<T>?, isFirstResource: Boolean): Boolean {
|
||||
listener()
|
||||
return false
|
||||
}
|
||||
|
||||
override fun onResourceReady(resource: T, model: Any?, target: Target<T>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
|
||||
listener()
|
||||
return false
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
package presentation.common
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.ActivityOptions
|
||||
import android.arch.lifecycle.ViewModel
|
||||
import android.arch.lifecycle.ViewModelProvider
|
||||
import android.content.Context
|
||||
@@ -27,6 +29,7 @@ import android.os.Build
|
||||
import android.provider.ContactsContract
|
||||
import android.provider.Settings
|
||||
import android.provider.Telephony
|
||||
import android.view.View
|
||||
import common.util.NotificationManager
|
||||
import presentation.feature.compose.ComposeActivity
|
||||
import presentation.feature.compose.ComposeViewModel
|
||||
@@ -106,6 +109,18 @@ class Navigator @Inject constructor(private val context: Context, private val no
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the attachment full-screen
|
||||
* The transitionName for the view should be the id of the image being displayed
|
||||
*/
|
||||
fun showImageAnimated(from: Activity, view: View) {
|
||||
val intent = Intent(context, GalleryActivity::class.java)
|
||||
intent.putExtra("partId", view.transitionName.toLong())
|
||||
|
||||
val options = ActivityOptions.makeSceneTransitionAnimation(from, view, view.transitionName)
|
||||
from.startActivity(intent, options.toBundle())
|
||||
}
|
||||
|
||||
fun showSettings() {
|
||||
val intent = Intent(context, SettingsActivity::class.java)
|
||||
startActivity(intent)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
<style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="android:windowBackground">@color/backgroundLight</item>
|
||||
<item name="android:windowContentTransitions">true</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeLight</item>
|
||||
<item name="colorPrimary">@color/white</item>
|
||||
<item name="colorPrimaryDark">@color/statusBarLight</item>
|
||||
@@ -28,6 +29,7 @@
|
||||
|
||||
<style name="AppThemeDark" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:windowBackground">@color/backgroundDark</item>
|
||||
<item name="android:windowContentTransitions">true</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
|
||||
<item name="colorPrimary">@color/backgroundDark</item>
|
||||
<item name="colorPrimaryDark">@color/statusBarDark</item>
|
||||
@@ -36,6 +38,7 @@
|
||||
|
||||
<style name="AppThemeBlack" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:windowBackground">@color/black</item>
|
||||
<item name="android:windowContentTransitions">true</item>
|
||||
<item name="actionBarPopupTheme">@style/PopupThemeDark</item>
|
||||
<item name="colorPrimary">@color/black</item>
|
||||
<item name="colorPrimaryDark">@color/black</item>
|
||||
|
||||
Reference in New Issue
Block a user