empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add polish to story crossfader when exiting viewer.

Browse source
This commit is contained in:
Alex Hart 2022-09-27 14:57:39 -03:00 • committed by Cody Henthorne
parent c652d83f81
commit f4d0bf900c
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt
View file

@ -145,6 +145,11 @@ class StoryViewerFragment :
viewModel.addHiddenAndRefresh(setOf(recipientId)) viewModel.addHiddenAndRefresh(setOf(recipientId))
} }
override fun onContentTranslation(x: Float, y: Float) {
storyCrossfader.translationX = x
storyCrossfader.translationY = y
}
override fun onReadyToAnimate() { override fun onReadyToAnimate() {
} }

19
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
View file

@ -214,6 +214,7 @@ class StoryViewerPageFragment :
viewModel::goToNextPost, viewModel::goToNextPost,
viewModel::goToPreviousPost, viewModel::goToPreviousPost,
this::startReply, this::startReply,
requireListener<Callback>()::onContentTranslation,
sharedViewModel = sharedViewModel sharedViewModel = sharedViewModel
) )
) )
@ -252,6 +253,8 @@ class StoryViewerPageFragment :
.setDuration(100) .setDuration(100)
.translationX(0f) .translationX(0f)
.translationY(0f) .translationY(0f)
requireListener<Callback>().onContentTranslation(0f, 0f)
} }
} }
@ -1144,6 +1147,7 @@ class StoryViewerPageFragment :
private val onGoToNext: () -> Unit, private val onGoToNext: () -> Unit,
private val onGoToPrevious: () -> Unit, private val onGoToPrevious: () -> Unit,
private val onReplyToPost: () -> Unit, private val onReplyToPost: () -> Unit,
private val onContentTranslation: (Float, Float) -> Unit,
private val viewToTranslate: View = container.parent as View, private val viewToTranslate: View = container.parent as View,
private val sharedViewModel: StoryViewerViewModel private val sharedViewModel: StoryViewerViewModel
) : GestureDetector.SimpleOnGestureListener() { ) : GestureDetector.SimpleOnGestureListener() {
@ -1194,6 +1198,8 @@ class StoryViewerPageFragment :
viewToTranslate.animate().cancel() viewToTranslate.animate().cancel()
viewToTranslate.translationX = distance viewToTranslate.translationX = distance
onContentTranslation(viewToTranslate.translationX, viewToTranslate.translationY)
return true return true
} }
@ -1303,12 +1309,6 @@ class StoryViewerPageFragment :
sharedViewModel.setContentIsReady() sharedViewModel.setContentIsReady()
} }
interface Callback {
fun onGoToPreviousStory(recipientId: RecipientId)
fun onFinishedPosts(recipientId: RecipientId)
fun onStoryHidden(recipientId: RecipientId)
}
override fun userHasSeenFirstNavigationView(): Boolean { override fun userHasSeenFirstNavigationView(): Boolean {
return SignalStore.storyValues().userHasSeenFirstNavView return SignalStore.storyValues().userHasSeenFirstNavView
} }
@ -1333,4 +1333,11 @@ class StoryViewerPageFragment :
override fun onCanceled() { override fun onCanceled() {
viewModel.setIsDisplayingPartialSendDialog(false) viewModel.setIsDisplayingPartialSendDialog(false)
} }
interface Callback {
fun onGoToPreviousStory(recipientId: RecipientId)
fun onFinishedPosts(recipientId: RecipientId)
fun onStoryHidden(recipientId: RecipientId)
fun onContentTranslation(x: Float, y: Float)
}
} }