mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-02-18 21:10:02 +03:00
Fix / Shared element transition overlap
Shared element was overlapping top system bars
This commit is contained in:
parent
d47c0f5ebc
commit
8076eab4b5
3 changed files with 36 additions and 27 deletions
|
@ -35,6 +35,7 @@ import androidx.annotation.DrawableRes
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.core.app.ActivityOptionsCompat
|
import androidx.core.app.ActivityOptionsCompat
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.core.util.Pair
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.forEach
|
import androidx.core.view.forEach
|
||||||
import androidx.lifecycle.ViewModelProviders
|
import androidx.lifecycle.ViewModelProviders
|
||||||
|
@ -708,9 +709,15 @@ class RoomDetailFragment :
|
||||||
// TODO Use navigator
|
// TODO Use navigator
|
||||||
|
|
||||||
val intent = ImageMediaViewerActivity.newIntent(vectorBaseActivity, mediaData, ViewCompat.getTransitionName(view))
|
val intent = ImageMediaViewerActivity.newIntent(vectorBaseActivity, mediaData, ViewCompat.getTransitionName(view))
|
||||||
|
val pairs = ArrayList<Pair<View, String>>()
|
||||||
|
requireActivity().window.decorView.findViewById<View>(android.R.id.statusBarBackground)?.let {
|
||||||
|
pairs.add(Pair(it, Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME))
|
||||||
|
}
|
||||||
|
pairs.add(Pair(view, ViewCompat.getTransitionName(view) ?: ""))
|
||||||
|
pairs.add(Pair(roomToolbar, ViewCompat.getTransitionName(roomToolbar) ?: ""))
|
||||||
|
|
||||||
val bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(
|
val bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(
|
||||||
requireActivity(), view, ViewCompat.getTransitionName(view)
|
requireActivity(), *pairs.toTypedArray()).toBundle()
|
||||||
?: "").toBundle()
|
|
||||||
startActivity(intent, bundle)
|
startActivity(intent, bundle)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
android:id="@+id/imageMediaViewerToolbar"
|
android:id="@+id/imageMediaViewerToolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
android:transitionName="toolbar"
|
||||||
android:elevation="4dp" />
|
android:elevation="4dp" />
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
style="@style/VectorToolbarStyle"
|
style="@style/VectorToolbarStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="?actionBarSize"
|
android:layout_height="?actionBarSize"
|
||||||
|
android:transitionName="toolbar"
|
||||||
android:elevation="4dp"
|
android:elevation="4dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|
Loading…
Add table
Reference in a new issue