mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-23 22:39:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

Code cleaning

Browse source
This commit is contained in:
Valere 2020-07-07 10:00:49 +02:00
parent e3c2af2c59
commit 87b1394e98
3 changed files with 30 additions and 9 deletions
vector/src/main/java/im/vector/riotx/features
media
VectorAttachmentViewerActivity.kt
navigation
DefaultNavigator.ktNavigator.kt

21
vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt
View file

@ -30,7 +30,11 @@ import androidx.core.view.isVisible
import androidx.transition.Transition import androidx.transition.Transition
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.attachmentviewer.AttachmentViewerActivity import im.vector.riotx.attachmentviewer.AttachmentViewerActivity
import im.vector.riotx.core.di.* import im.vector.riotx.core.di.ActiveSessionHolder
import im.vector.riotx.core.di.DaggerScreenComponent
import im.vector.riotx.core.di.HasVectorInjector
import im.vector.riotx.core.di.ScreenComponent
import im.vector.riotx.core.di.VectorComponent
import im.vector.riotx.features.themes.ActivityOtherThemes import im.vector.riotx.features.themes.ActivityOtherThemes
import im.vector.riotx.features.themes.ThemeUtils import im.vector.riotx.features.themes.ThemeUtils
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
@ -136,9 +140,9 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), RoomAttachmen
ActivityCompat.finishAfterTransition(this) ActivityCompat.finishAfterTransition(this)
} }
/* ========================================================================================== // ==========================================================================================
* PRIVATE METHODS // PRIVATE METHODS
* ========================================================================================== */ // ==========================================================================================
/** /**
* Try and add a [Transition.TransitionListener] to the entering shared element * Try and add a [Transition.TransitionListener] to the entering shared element
@ -154,8 +158,9 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), RoomAttachmen
// There is an entering shared element transition so add a listener to it // There is an entering shared element transition so add a listener to it
transition.addListener( transition.addListener(
onEnd = { onEnd = {
// The listener is also called when we are exiting
// so we use a boolean to avoid reshowing pager at end of dismiss transition
if (!isAnimatingOut) { if (!isAnimatingOut) {
// The listener is also called when we are exiting
transitionImageContainer.isVisible = false transitionImageContainer.isVisible = false
pager2.isInvisible = false pager2.isInvisible = false
} }
@ -196,7 +201,11 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), RoomAttachmen
const val EXTRA_ARGS = "EXTRA_ARGS" const val EXTRA_ARGS = "EXTRA_ARGS"
const val EXTRA_IMAGE_DATA = "EXTRA_IMAGE_DATA" const val EXTRA_IMAGE_DATA = "EXTRA_IMAGE_DATA"
fun newIntent(context: Context, mediaData: ImageContentRenderer.Data, roomId: String?, eventId: String, sharedTransitionName: String?) = Intent(context, VectorAttachmentViewerActivity::class.java).also { fun newIntent(context: Context,
mediaData: ImageContentRenderer.Data,
roomId: String?,
eventId: String,
sharedTransitionName: String?) = Intent(context, VectorAttachmentViewerActivity::class.java).also {
it.putExtra(EXTRA_ARGS, Args(roomId, eventId, sharedTransitionName)) it.putExtra(EXTRA_ARGS, Args(roomId, eventId, sharedTransitionName))
it.putExtra(EXTRA_IMAGE_DATA, mediaData) it.putExtra(EXTRA_IMAGE_DATA, mediaData)
} }

12
vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
View file

@ -49,7 +49,11 @@ import im.vector.riotx.features.home.room.detail.RoomDetailArgs
import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes
import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity
import im.vector.riotx.features.invite.InviteUsersToRoomActivity import im.vector.riotx.features.invite.InviteUsersToRoomActivity
import im.vector.riotx.features.media.* import im.vector.riotx.features.media.BigImageViewerActivity
import im.vector.riotx.features.media.ImageContentRenderer
import im.vector.riotx.features.media.VectorAttachmentViewerActivity
import im.vector.riotx.features.media.VideoContentRenderer
import im.vector.riotx.features.media.VideoMediaViewerActivity
import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity
import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity
@ -242,7 +246,11 @@ class DefaultNavigator @Inject constructor(
context.startActivity(WidgetActivity.newIntent(context, widgetArgs)) context.startActivity(WidgetActivity.newIntent(context, widgetArgs))
} }
override fun openImageViewer(activity: Activity, roomId: String?, mediaData: ImageContentRenderer.Data, view: View, options: ((MutableList<Pair<View, String>>) -> Unit)?) { override fun openImageViewer(activity: Activity,
roomId: String?,
mediaData: ImageContentRenderer.Data,
view: View,
options: ((MutableList<Pair<View, String>>) -> Unit)?) {
VectorAttachmentViewerActivity.newIntent(activity, mediaData, roomId, mediaData.eventId, ViewCompat.getTransitionName(view)).let { intent -> VectorAttachmentViewerActivity.newIntent(activity, mediaData, roomId, mediaData.eventId, ViewCompat.getTransitionName(view)).let { intent ->
val pairs = ArrayList<Pair<View, String>>() val pairs = ArrayList<Pair<View, String>>()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

6
vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
View file

@ -91,7 +91,11 @@ interface Navigator {
fun openRoomWidget(context: Context, roomId: String, widget: Widget) fun openRoomWidget(context: Context, roomId: String, widget: Widget)
fun openImageViewer(activity: Activity, roomId: String?, mediaData: ImageContentRenderer.Data, view: View, options: ((MutableList<Pair<View, String>>) -> Unit)?) fun openImageViewer(activity: Activity,
roomId: String?,
mediaData: ImageContentRenderer.Data,
view: View,
options: ((MutableList<Pair<View, String>>) -> Unit)?)
fun openVideoViewer(activity: Activity, mediaData: VideoContentRenderer.Data) fun openVideoViewer(activity: Activity, mediaData: VideoContentRenderer.Data)
} }