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

Fixed used of deprecated adapterPosition API

Browse source
This commit is contained in:
Sylvain Berfini 2022-01-10 10:43:34 +01:00
parent 2ed6fa3246
commit 9395ea88a5
9 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
View file

@ -213,13 +213,13 @@ class ChatMessagesListAdapter(
selectionViewModel.isEditionEnabled.observe( selectionViewModel.isEditionEnabled.observe(
viewLifecycleOwner, viewLifecycleOwner,
{ {
position = adapterPosition position = bindingAdapterPosition
} }
) )
setClickListener { setClickListener {
if (selectionViewModel.isEditionEnabled.value == true) { if (selectionViewModel.isEditionEnabled.value == true) {
selectionViewModel.onToggleSelect(adapterPosition) selectionViewModel.onToggleSelect(bindingAdapterPosition)
} }
} }
@ -234,8 +234,8 @@ class ChatMessagesListAdapter(
var hasPrevious = false var hasPrevious = false
var hasNext = false var hasNext = false
if (adapterPosition > 0) { if (bindingAdapterPosition > 0) {
val previousItem = getItem(adapterPosition - 1) val previousItem = getItem(bindingAdapterPosition - 1)
if (previousItem.eventLog.type == EventLog.Type.ConferenceChatMessage) { if (previousItem.eventLog.type == EventLog.Type.ConferenceChatMessage) {
val previousMessage = previousItem.eventLog.chatMessage val previousMessage = previousItem.eventLog.chatMessage
if (previousMessage != null && previousMessage.fromAddress.weakEqual(chatMessage.fromAddress)) { if (previousMessage != null && previousMessage.fromAddress.weakEqual(chatMessage.fromAddress)) {
@ -246,8 +246,8 @@ class ChatMessagesListAdapter(
} }
} }
if (adapterPosition >= 0 && adapterPosition < itemCount - 1) { if (bindingAdapterPosition >= 0 && bindingAdapterPosition < itemCount - 1) {
val nextItem = getItem(adapterPosition + 1) val nextItem = getItem(bindingAdapterPosition + 1)
if (nextItem.eventLog.type == EventLog.Type.ConferenceChatMessage) { if (nextItem.eventLog.type == EventLog.Type.ConferenceChatMessage) {
val nextMessage = nextItem.eventLog.chatMessage val nextMessage = nextItem.eventLog.chatMessage
if (nextMessage != null && nextMessage.fromAddress.weakEqual(chatMessage.fromAddress)) { if (nextMessage != null && nextMessage.fromAddress.weakEqual(chatMessage.fromAddress)) {
@ -346,7 +346,7 @@ class ChatMessagesListAdapter(
private fun resendMessage() { private fun resendMessage() {
val chatMessage = binding.data?.chatMessage val chatMessage = binding.data?.chatMessage
if (chatMessage != null) { if (chatMessage != null) {
chatMessage.userData = adapterPosition chatMessage.userData = bindingAdapterPosition
resendMessageEvent.value = Event(chatMessage) resendMessageEvent.value = Event(chatMessage)
} }
} }
@ -388,7 +388,7 @@ class ChatMessagesListAdapter(
private fun deleteMessage() { private fun deleteMessage() {
val chatMessage = binding.data?.chatMessage val chatMessage = binding.data?.chatMessage
if (chatMessage != null) { if (chatMessage != null) {
chatMessage.userData = adapterPosition chatMessage.userData = bindingAdapterPosition
deleteMessageEvent.value = Event(chatMessage) deleteMessageEvent.value = Event(chatMessage)
} }
} }
@ -418,13 +418,13 @@ class ChatMessagesListAdapter(
selectionViewModel.isEditionEnabled.observe( selectionViewModel.isEditionEnabled.observe(
viewLifecycleOwner, viewLifecycleOwner,
{ {
position = adapterPosition position = bindingAdapterPosition
} }
) )
binding.setClickListener { binding.setClickListener {
if (selectionViewModel.isEditionEnabled.value == true) { if (selectionViewModel.isEditionEnabled.value == true) {
selectionViewModel.onToggleSelect(adapterPosition) selectionViewModel.onToggleSelect(bindingAdapterPosition)
} }
} }

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

@ -75,7 +75,7 @@ class ChatRoomsListAdapter(
selectionViewModel.isEditionEnabled.observe( selectionViewModel.isEditionEnabled.observe(
viewLifecycleOwner, viewLifecycleOwner,
{ {
position = adapterPosition position = bindingAdapterPosition
} }
) )
@ -83,7 +83,7 @@ class ChatRoomsListAdapter(
setClickListener { setClickListener {
if (selectionViewModel.isEditionEnabled.value == true) { if (selectionViewModel.isEditionEnabled.value == true) {
selectionViewModel.onToggleSelect(adapterPosition) selectionViewModel.onToggleSelect(bindingAdapterPosition)
} else { } else {
selectedChatRoomEvent.value = Event(chatRoomViewModel.chatRoom) selectedChatRoomEvent.value = Event(chatRoomViewModel.chatRoom)
} }

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

@ -174,9 +174,9 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
) )
val swipeListener = object : RecyclerViewSwipeListener { val swipeListener = object : RecyclerViewSwipeListener {
override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) { override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {
val chatRoomViewModel = adapter.currentList[viewHolder.adapterPosition] val chatRoomViewModel = adapter.currentList[viewHolder.bindingAdapterPosition]
chatRoomViewModel.chatRoom.markAsRead() chatRoomViewModel.chatRoom.markAsRead()
adapter.notifyItemChanged(viewHolder.adapterPosition) adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
} }
override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) { override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
@ -184,13 +184,13 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel) val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
viewModel.showCancelButton { viewModel.showCancelButton {
adapter.notifyItemChanged(viewHolder.adapterPosition) adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
dialog.dismiss() dialog.dismiss()
} }
viewModel.showDeleteButton( viewModel.showDeleteButton(
{ {
val deletedChatRoom = adapter.currentList[viewHolder.adapterPosition].chatRoom val deletedChatRoom = adapter.currentList[viewHolder.bindingAdapterPosition].chatRoom
listViewModel.deleteChatRoom(deletedChatRoom) listViewModel.deleteChatRoom(deletedChatRoom)
if (!binding.slidingPane.isSlideable && if (!binding.slidingPane.isSlideable &&
deletedChatRoom == sharedViewModel.selectedChatRoom.value deletedChatRoom == sharedViewModel.selectedChatRoom.value

4
app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
View file

@ -73,13 +73,13 @@ class ContactsListAdapter(
selectionViewModel.isEditionEnabled.observe( selectionViewModel.isEditionEnabled.observe(
viewLifecycleOwner, viewLifecycleOwner,
{ {
position = adapterPosition position = bindingAdapterPosition
} }
) )
setClickListener { setClickListener {
if (selectionViewModel.isEditionEnabled.value == true) { if (selectionViewModel.isEditionEnabled.value == true) {
selectionViewModel.onToggleSelect(adapterPosition) selectionViewModel.onToggleSelect(bindingAdapterPosition)
} else { } else {
selectedContactEvent.value = Event(contactViewModel.contactInternal) selectedContactEvent.value = Event(contactViewModel.contactInternal)
} }

4
app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
View file

@ -175,13 +175,13 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel) val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
viewModel.showCancelButton { viewModel.showCancelButton {
adapter.notifyItemChanged(viewHolder.adapterPosition) adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
dialog.dismiss() dialog.dismiss()
} }
viewModel.showDeleteButton( viewModel.showDeleteButton(
{ {
val deletedContact = adapter.currentList[viewHolder.adapterPosition].contactInternal val deletedContact = adapter.currentList[viewHolder.bindingAdapterPosition].contactInternal
listViewModel.deleteContact(deletedContact) listViewModel.deleteContact(deletedContact)
if (!binding.slidingPane.isSlideable && if (!binding.slidingPane.isSlideable &&
deletedContact == sharedViewModel.selectedContact.value deletedContact == sharedViewModel.selectedContact.value

4
app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
View file

@ -75,13 +75,13 @@ class CallLogsListAdapter(
selectionViewModel.isEditionEnabled.observe( selectionViewModel.isEditionEnabled.observe(
viewLifecycleOwner, viewLifecycleOwner,
{ {
position = adapterPosition position = bindingAdapterPosition
} }
) )
setClickListener { setClickListener {
if (selectionViewModel.isEditionEnabled.value == true) { if (selectionViewModel.isEditionEnabled.value == true) {
selectionViewModel.onToggleSelect(adapterPosition) selectionViewModel.onToggleSelect(bindingAdapterPosition)
} else { } else {
startCallToEvent.value = Event(callLogGroup) startCallToEvent.value = Event(callLogGroup)
} }

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

@ -160,13 +160,13 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel) val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
viewModel.showCancelButton { viewModel.showCancelButton {
adapter.notifyItemChanged(viewHolder.adapterPosition) adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
dialog.dismiss() dialog.dismiss()
} }
viewModel.showDeleteButton( viewModel.showDeleteButton(
{ {
val deletedCallGroup = adapter.currentList[viewHolder.adapterPosition] val deletedCallGroup = adapter.currentList[viewHolder.bindingAdapterPosition]
listViewModel.deleteCallLogGroup(deletedCallGroup) listViewModel.deleteCallLogGroup(deletedCallGroup)
if (!binding.slidingPane.isSlideable && if (!binding.slidingPane.isSlideable &&
deletedCallGroup.lastCallLog.callId == sharedViewModel.selectedCallLogGroup.value?.lastCallLog?.callId deletedCallGroup.lastCallLog.callId == sharedViewModel.selectedCallLogGroup.value?.lastCallLog?.callId

4
app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
View file

@ -69,12 +69,12 @@ class RecordingsListAdapter(
lifecycleOwner = viewLifecycleOwner lifecycleOwner = viewLifecycleOwner
// This is for item selection through ListTopBarFragment // This is for item selection through ListTopBarFragment
position = adapterPosition position = bindingAdapterPosition
selectionListViewModel = selectionViewModel selectionListViewModel = selectionViewModel
setClickListener { setClickListener {
if (selectionViewModel.isEditionEnabled.value == true) { if (selectionViewModel.isEditionEnabled.value == true) {
selectionViewModel.onToggleSelect(adapterPosition) selectionViewModel.onToggleSelect(bindingAdapterPosition)
} }
} }

2
app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
View file

@ -36,7 +36,7 @@ class RecyclerViewHeaderDecoration(private val context: Context, private val ada
parent: RecyclerView, parent: RecyclerView,
state: RecyclerView.State state: RecyclerView.State
) { ) {
val position = (view.layoutParams as RecyclerView.LayoutParams).viewAdapterPosition val position = (view.layoutParams as RecyclerView.LayoutParams).bindingAdapterPosition
if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) { if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) {
val headerView: View = adapter.getHeaderViewForPosition(view.context, position) val headerView: View = adapter.getHeaderViewForPosition(view.context, position)