From 6dbbc49a0bdc7fe3c101a5aa75d70d6c7cc16661 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 7 Mar 2018 17:21:09 +0100
Subject: [PATCH] Updated dependencies
---
.../ui/chat/messages/MessageAdapter.kt | 23 +++++++++----------
.../ui/chat/messages/MessageListFragment.kt | 2 +-
gradle.properties | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt
index 0d9ea45bb..f02013c80 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt
@@ -2,7 +2,7 @@ package de.kuschku.quasseldroid_ng.ui.chat.messages
import android.arch.paging.PagedListAdapter
import android.content.Context
-import android.support.v7.recyclerview.extensions.DiffCallback
+import android.support.v7.util.DiffUtil
import android.util.LruCache
import android.view.LayoutInflater
import android.view.ViewGroup
@@ -18,16 +18,16 @@ class MessageAdapter(
appearanceSettings: AppearanceSettings,
var markerLinePosition: Pair<MsgId, MsgId>? = null
) : PagedListAdapter<QuasselDatabase.DatabaseMessage, QuasselMessageViewHolder>(
- object : DiffCallback<QuasselDatabase.DatabaseMessage>() {
+ object : DiffUtil.ItemCallback<QuasselDatabase.DatabaseMessage>() {
override fun areItemsTheSame(oldItem: QuasselDatabase.DatabaseMessage,
- newItem: QuasselDatabase.DatabaseMessage)
- = DatabaseMessage.MessageDiffCallback.areItemsTheSame(oldItem, newItem)
+ newItem: QuasselDatabase.DatabaseMessage) =
+ DatabaseMessage.MessageDiffCallback.areItemsTheSame(oldItem, newItem)
override fun areContentsTheSame(oldItem: QuasselDatabase.DatabaseMessage,
- newItem: QuasselDatabase.DatabaseMessage)
- = DatabaseMessage.MessageDiffCallback.areContentsTheSame(oldItem, newItem) &&
- oldItem.messageId != markerLinePosition?.first &&
- oldItem.messageId != markerLinePosition?.second
+ newItem: QuasselDatabase.DatabaseMessage) =
+ DatabaseMessage.MessageDiffCallback.areContentsTheSame(oldItem, newItem) &&
+ oldItem.messageId != markerLinePosition?.first &&
+ oldItem.messageId != markerLinePosition?.second
}
) {
private val messageRenderer: MessageRenderer = QuasselMessageRenderer(
@@ -79,11 +79,10 @@ class MessageAdapter(
return getItem(position)?.messageId?.toLong() ?: 0L
}
- private fun messageType(viewType: Int): Message_Type?
- = Message_Type.of(Math.abs(viewType)).enabledValues().firstOrNull()
+ private fun messageType(viewType: Int): Message_Type? =
+ Message_Type.of(Math.abs(viewType)).enabledValues().firstOrNull()
- private fun hasHiglight(viewType: Int)
- = viewType < 0
+ private fun hasHiglight(viewType: Int) = viewType < 0
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuasselMessageViewHolder {
val messageType = messageType(viewType)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt
index 309c5d24f..4af1ef6d7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt
@@ -139,7 +139,7 @@ class MessageListFragment : ServiceBoundFragment() {
lastBuffer = buffer
adapter.clearCache()
}
- adapter.setList(list)
+ adapter.submitList(list)
if (firstVisibleItemPosition < 2) {
activity?.runOnUiThread { messageList.scrollToPosition(0) }
handler.postDelayed({ activity?.runOnUiThread { messageList.scrollToPosition(0) } }, 16)
diff --git a/gradle.properties b/gradle.properties
index 3084e11b1..bc84d8ebf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ org.gradle.jvmargs=-Xmx2048m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-org.gradle.parallel=true
+org.gradle.parallel=true
\ No newline at end of file
--
GitLab