some code cleanup
This commit is contained in:
parent
f333051073
commit
f70ce39fb7
1 changed files with 12 additions and 17 deletions
|
@ -387,31 +387,26 @@ class MediaAdaptor(
|
||||||
if ((mediaList?.size ?: 0) > position && position != -1) {
|
if ((mediaList?.size ?: 0) > position && position != -1) {
|
||||||
val media = mediaList?.get(position)
|
val media = mediaList?.get(position)
|
||||||
if (bitmap != null) MediaSingleton.bitmap = bitmap
|
if (bitmap != null) MediaSingleton.bitmap = bitmap
|
||||||
if (itemCompactImage != null) {
|
|
||||||
ContextCompat.startActivity(
|
ContextCompat.startActivity(
|
||||||
activity,
|
activity,
|
||||||
Intent(activity, MediaDetailsActivity::class.java).putExtra(
|
Intent(activity, MediaDetailsActivity::class.java).putExtra(
|
||||||
"media",
|
"media",
|
||||||
media as Serializable
|
media as Serializable
|
||||||
), ActivityOptionsCompat.makeSceneTransitionAnimation(
|
), if (itemCompactImage != null) {
|
||||||
|
ActivityOptionsCompat.makeSceneTransitionAnimation(
|
||||||
activity,
|
activity,
|
||||||
Pair.create(
|
Pair.create(
|
||||||
itemCompactImage,
|
itemCompactImage,
|
||||||
ViewCompat.getTransitionName(activity.findViewById(R.id.itemCompactImage))!!
|
ViewCompat.getTransitionName(activity.findViewById(R.id.itemCompactImage))!!
|
||||||
),
|
),
|
||||||
).toBundle()
|
).toBundle()
|
||||||
)
|
|
||||||
} else {
|
} else {
|
||||||
ContextCompat.startActivity(
|
null
|
||||||
activity,
|
}
|
||||||
Intent(activity, MediaDetailsActivity::class.java).putExtra(
|
|
||||||
"media",
|
|
||||||
media as Serializable
|
|
||||||
), null
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fun longClicked(position: Int): Boolean {
|
fun longClicked(position: Int): Boolean {
|
||||||
if ((mediaList?.size ?: 0) > position && position != -1) {
|
if ((mediaList?.size ?: 0) > position && position != -1) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue