Hide view once for story first sending.

fork-5.53.8
Alex Hart 2022-03-30 10:20:08 -03:00 zatwierdzone przez Cody Henthorne
rodzic f17f45f277
commit ae28df901f
4 zmienionych plików z 9 dodań i 5 usunięć

Wyświetl plik

@ -77,7 +77,7 @@ class MediaSelectionActivity :
val message: CharSequence? = intent.getCharSequenceExtra(MESSAGE)
val isReply: Boolean = intent.getBooleanExtra(IS_REPLY, false)
val factory = MediaSelectionViewModel.Factory(destination, transportOption, initialMedia, message, isReply, MediaSelectionRepository(this))
val factory = MediaSelectionViewModel.Factory(destination, transportOption, initialMedia, message, isReply, isStory, MediaSelectionRepository(this))
viewModel = ViewModelProvider(this, factory)[MediaSelectionViewModel::class.java]
val textStoryToggle: ConstraintLayout = findViewById(R.id.switch_widget)

Wyświetl plik

@ -21,7 +21,8 @@ data class MediaSelectionState(
val isPreUploadEnabled: Boolean = false,
val isMeteredConnection: Boolean = false,
val editorStateMap: Map<Uri, Any> = mapOf(),
val cameraFirstCapture: Media? = null
val cameraFirstCapture: Media? = null,
val isStory: Boolean
) {
val maxSelection = if (transportOption.isSms) {

Wyświetl plik

@ -34,13 +34,15 @@ class MediaSelectionViewModel(
initialMedia: List<Media>,
initialMessage: CharSequence?,
val isReply: Boolean,
isStory: Boolean,
private val repository: MediaSelectionRepository
) : ViewModel() {
private val store: Store<MediaSelectionState> = Store(
MediaSelectionState(
transportOption = transportOption,
message = initialMessage
message = initialMessage,
isStory = isStory
)
)
@ -420,10 +422,11 @@ class MediaSelectionViewModel(
private val initialMedia: List<Media>,
private val initialMessage: CharSequence?,
private val isReply: Boolean,
private val isStory: Boolean,
private val repository: MediaSelectionRepository
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return requireNotNull(modelClass.cast(MediaSelectionViewModel(destination, transportOption, initialMedia, initialMessage, isReply, repository)))
return requireNotNull(modelClass.cast(MediaSelectionViewModel(destination, transportOption, initialMedia, initialMessage, isReply, isStory, repository)))
}
}
}

Wyświetl plik

@ -367,7 +367,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment) {
}
private fun computeViewOnceButtonAnimators(state: MediaSelectionState): List<Animator> {
return if (state.isTouchEnabled && state.selectedMedia.size == 1) {
return if (state.isTouchEnabled && state.selectedMedia.size == 1 && !state.isStory) {
listOf(MediaReviewAnimatorController.getFadeInAnimator(viewOnceButton))
} else {
listOf(MediaReviewAnimatorController.getFadeOutAnimator(viewOnceButton))