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

Fix onBack behaviour of media gallery fragment.

Browse source
This commit is contained in:
Alex Hart 2021-09-07 15:33:51 -03:00 • committed by Greyson Parrelli
parent 82e9c620e8
commit 53e110560a
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
View file

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.mediasend.v2.gallery
import android.os.Bundle
import android.view.View
import androidx.activity.OnBackPressedCallback
import androidx.appcompat.widget.Toolbar
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
@ -61,9 +62,7 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
}
toolbar.setNavigationOnClickListener {
if (viewModel.pop()) {
callbacks.onToolbarNavigationClicked()
}
onBack()
}
toolbar.setOnMenuItemClickListener { item ->
@ -132,6 +131,18 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
galleryItemsWithSelection.observe(viewLifecycleOwner) {
galleryAdapter.submitList(it)
}
requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
onBack()
}
})
}
fun onBack() {
if (viewModel.pop()) {
callbacks.onToolbarNavigationClicked()
}
}
fun onViewStateUpdated(state: ViewState) {