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

Keep position in calls history & chat rooms lists when going back

Browse source
This commit is contained in:
Sylvain Berfini 2020-10-20 21:28:42 +02:00
parent 23dc18d41a
commit f34a2f65c9
4 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
View file

@ -42,10 +42,6 @@ class ChatRoomsListAdapter(
MutableLiveData<Event<ChatRoom>>() MutableLiveData<Event<ChatRoom>>()
} }
val toggledPositionForSelectionEvent: MutableLiveData<Event<Int>> by lazy {
MutableLiveData<Event<Int>>()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding: ChatRoomListCellBinding = DataBindingUtil.inflate( val binding: ChatRoomListCellBinding = DataBindingUtil.inflate(
LayoutInflater.from(parent.context), LayoutInflater.from(parent.context),

10
app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
View file

@ -53,7 +53,9 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
scrollToTop() scrollToTop()
} }
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
scrollToTop() if (positionStart == 0 && itemCount == 1) {
scrollToTop()
}
} }
override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) { override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
scrollToTop() scrollToTop()
@ -144,12 +146,6 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
} }
}) })
adapter.toggledPositionForSelectionEvent.observe(viewLifecycleOwner, {
it.consume { position ->
listSelectionViewModel.onToggleSelect(position)
}
})
binding.setEditClickListener { binding.setEditClickListener {
listSelectionViewModel.isEditionEnabled.value = true listSelectionViewModel.isEditionEnabled.value = true
} }

14
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
View file

@ -99,7 +99,7 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() {
private var chatRoomsToDeleteCount = 0 private var chatRoomsToDeleteCount = 0
init { init {
chatRooms.value = getChatRooms() updateChatRooms()
coreContext.core.addListener(listener) coreContext.core.addListener(listener)
coreContext.contactsManager.addListener(contactsUpdatedListener) coreContext.contactsManager.addListener(contactsUpdatedListener)
} }
@ -144,16 +144,10 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() {
} }
private fun updateChatRooms() { private fun updateChatRooms() {
chatRooms.value = getChatRooms() var list = arrayListOf<ChatRoom>()
}
private fun getChatRooms(): ArrayList<ChatRoom> { list.addAll(coreContext.core.chatRooms)
val list = arrayListOf<ChatRoom>()
for (room in coreContext.core.chatRooms) { chatRooms.value = list
list.add(room)
}
return list
} }
} }

4
app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
View file

@ -49,7 +49,9 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
private val observer = object : RecyclerView.AdapterDataObserver() { private val observer = object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
scrollToTop() if (positionStart == 0 && itemCount == 1) {
scrollToTop()
}
} }
} }