Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed chat rooms list position in fragment not restored when coming back from a chat room

Browse source
This commit is contained in:
Sylvain Berfini 2021-03-12 10:08:45 +01:00
parent b5aab5b417
commit 392a404157
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -38,6 +38,7 @@ import androidx.appcompat.view.menu.MenuPopupHelper
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -89,7 +90,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
requireActivity().onBackPressedDispatcher.addCallback(this) { requireActivity().onBackPressedDispatcher.addCallback(this) {
navigateToChatRooms() goBack()
} }
} }
@ -229,7 +230,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
}) })
binding.setBackClickListener { binding.setBackClickListener {
navigateToChatRooms() goBack()
} }
binding.back.visibility = if (resources.getBoolean(R.bool.isTablet)) View.INVISIBLE else View.VISIBLE binding.back.visibility = if (resources.getBoolean(R.bool.isTablet)) View.INVISIBLE else View.VISIBLE
@ -356,6 +357,12 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
} }
} }
private fun goBack() {
if (!findNavController().popBackStack(R.id.masterChatRoomsFragment, false)) {
navigateToChatRooms()
}
}
private fun enterEditionMode() { private fun enterEditionMode() {
listSelectionViewModel.isEditionEnabled.value = true listSelectionViewModel.isEditionEnabled.value = true
} }