Skip to content
Snippets Groups Projects
Commit 6dbbc49a authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Updated dependencies

parent db0a2203
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ package de.kuschku.quasseldroid_ng.ui.chat.messages ...@@ -2,7 +2,7 @@ package de.kuschku.quasseldroid_ng.ui.chat.messages
import android.arch.paging.PagedListAdapter import android.arch.paging.PagedListAdapter
import android.content.Context import android.content.Context
import android.support.v7.recyclerview.extensions.DiffCallback import android.support.v7.util.DiffUtil
import android.util.LruCache import android.util.LruCache
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
...@@ -18,14 +18,14 @@ class MessageAdapter( ...@@ -18,14 +18,14 @@ class MessageAdapter(
appearanceSettings: AppearanceSettings, appearanceSettings: AppearanceSettings,
var markerLinePosition: Pair<MsgId, MsgId>? = null var markerLinePosition: Pair<MsgId, MsgId>? = null
) : PagedListAdapter<QuasselDatabase.DatabaseMessage, QuasselMessageViewHolder>( ) : PagedListAdapter<QuasselDatabase.DatabaseMessage, QuasselMessageViewHolder>(
object : DiffCallback<QuasselDatabase.DatabaseMessage>() { object : DiffUtil.ItemCallback<QuasselDatabase.DatabaseMessage>() {
override fun areItemsTheSame(oldItem: QuasselDatabase.DatabaseMessage, override fun areItemsTheSame(oldItem: QuasselDatabase.DatabaseMessage,
newItem: QuasselDatabase.DatabaseMessage) newItem: QuasselDatabase.DatabaseMessage) =
= DatabaseMessage.MessageDiffCallback.areItemsTheSame(oldItem, newItem) DatabaseMessage.MessageDiffCallback.areItemsTheSame(oldItem, newItem)
override fun areContentsTheSame(oldItem: QuasselDatabase.DatabaseMessage, override fun areContentsTheSame(oldItem: QuasselDatabase.DatabaseMessage,
newItem: QuasselDatabase.DatabaseMessage) newItem: QuasselDatabase.DatabaseMessage) =
= DatabaseMessage.MessageDiffCallback.areContentsTheSame(oldItem, newItem) && DatabaseMessage.MessageDiffCallback.areContentsTheSame(oldItem, newItem) &&
oldItem.messageId != markerLinePosition?.first && oldItem.messageId != markerLinePosition?.first &&
oldItem.messageId != markerLinePosition?.second oldItem.messageId != markerLinePosition?.second
} }
...@@ -79,11 +79,10 @@ class MessageAdapter( ...@@ -79,11 +79,10 @@ class MessageAdapter(
return getItem(position)?.messageId?.toLong() ?: 0L return getItem(position)?.messageId?.toLong() ?: 0L
} }
private fun messageType(viewType: Int): Message_Type? private fun messageType(viewType: Int): Message_Type? =
= Message_Type.of(Math.abs(viewType)).enabledValues().firstOrNull() Message_Type.of(Math.abs(viewType)).enabledValues().firstOrNull()
private fun hasHiglight(viewType: Int) private fun hasHiglight(viewType: Int) = viewType < 0
= viewType < 0
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuasselMessageViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuasselMessageViewHolder {
val messageType = messageType(viewType) val messageType = messageType(viewType)
......
...@@ -139,7 +139,7 @@ class MessageListFragment : ServiceBoundFragment() { ...@@ -139,7 +139,7 @@ class MessageListFragment : ServiceBoundFragment() {
lastBuffer = buffer lastBuffer = buffer
adapter.clearCache() adapter.clearCache()
} }
adapter.setList(list) adapter.submitList(list)
if (firstVisibleItemPosition < 2) { if (firstVisibleItemPosition < 2) {
activity?.runOnUiThread { messageList.scrollToPosition(0) } activity?.runOnUiThread { messageList.scrollToPosition(0) }
handler.postDelayed({ activity?.runOnUiThread { messageList.scrollToPosition(0) } }, 16) handler.postDelayed({ activity?.runOnUiThread { messageList.scrollToPosition(0) } }, 16)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment