Merge branch 'master' into update-build

gotify · Nov 19, 2023 · 708741a · 708741a
2 parents 3983119 + 0d423c1
commit 708741a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 39 deletions.
diff --git a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
@@ -14,6 +14,8 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.github.gotify.MarkwonFactory
@@ -34,9 +36,8 @@ internal class ListMessageAdapter(
     private val context: Context,
     private val settings: Settings,
     private val picasso: Picasso,
-    var items: List<MessageWithImage>,
     private val delete: Delete
-) : RecyclerView.Adapter<ListMessageAdapter.ViewHolder>() {
+) : ListAdapter<MessageWithImage, ListMessageAdapter.ViewHolder>(DiffCallback) {
     private val prefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
     private val markwon: Markwon = MarkwonFactory.createForMessage(context, picasso)
 
@@ -70,7 +71,7 @@ internal class ListMessageAdapter(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val message = items[position]
+        val message = currentList[position]
         if (Extras.useMarkdown(message.message)) {
             holder.message.autoLinkMask = 0
             markwon.setMarkdown(holder.message, message.message.message)
@@ -92,14 +93,12 @@ internal class ListMessageAdapter(
         holder.date.setOnClickListener { holder.switchTimeFormat() }
 
         holder.delete.setOnClickListener {
-            delete.delete(holder.adapterPosition, message.message, false)
+            delete.delete(message.message)
         }
     }
 
-    override fun getItemCount() = items.size
-
     override fun getItemId(position: Int): Long {
-        val currentItem = items[position]
+        val currentItem = currentList[position]
         return currentItem.message.id
     }
 
@@ -184,7 +183,23 @@ internal class ListMessageAdapter(
         }
     }
 
+    object DiffCallback : DiffUtil.ItemCallback<MessageWithImage>() {
+        override fun areItemsTheSame(
+            oldItem: MessageWithImage,
+            newItem: MessageWithImage
+        ): Boolean {
+            return oldItem.message.id == newItem.message.id
+        }
+
+        override fun areContentsTheSame(
+            oldItem: MessageWithImage,
+            newItem: MessageWithImage
+        ): Boolean {
+            return oldItem == newItem
+        }
+    }
+
     fun interface Delete {
-        fun delete(position: Int, message: Message, listAnimation: Boolean)
+        fun delete(message: Message)
     }
 }
diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
@@ -102,14 +102,9 @@ internal class MessagesActivity :
         listMessageAdapter = ListMessageAdapter(
             this,
             viewModel.settings,
-            viewModel.picassoHandler.get(),
-            emptyList()
-        ) { position, message, listAnimation ->
-            scheduleDeletion(
-                position,
-                message,
-                listAnimation
-            )
+            viewModel.picassoHandler.get()
+        ) { message ->
+            scheduleDeletion(message)
         }
         addBackPressCallback()
 
@@ -334,7 +329,6 @@ internal class MessagesActivity :
                 }
             }
         }
-        listMessageAdapter.notifyDataSetChanged()
         selectAppInMenu(binding.navView.menu.findItem(selectedIndex))
         super.onResume()
     }
@@ -353,16 +347,11 @@ internal class MessagesActivity :
         }
     }
 
-    private fun scheduleDeletion(position: Int, message: Message, listAnimation: Boolean) {
+    private fun scheduleDeletion(message: Message) {
         val adapter = binding.messagesView.adapter as ListMessageAdapter
         val messages = viewModel.messages
         messages.deleteLocal(message)
-        adapter.items = messages[viewModel.appId]
-        if (listAnimation) {
-            adapter.notifyItemRemoved(position)
-        } else {
-            adapter.notifyDataSetChanged()
-        }
+        adapter.updateList(messages[viewModel.appId])
         showDeletionSnackbar()
     }
 
@@ -372,13 +361,7 @@ internal class MessagesActivity :
         if (deletion != null) {
             val adapter = binding.messagesView.adapter as ListMessageAdapter
             val appId = viewModel.appId
-            adapter.items = messages[appId]
-            val insertPosition = if (appId == MessageState.ALL_MESSAGES) {
-                deletion.allPosition
-            } else {
-                deletion.appPosition
-            }
-            adapter.notifyItemInserted(insertPosition)
+            adapter.updateList(messages[appId])
         }
     }
 
@@ -433,8 +416,8 @@ internal class MessagesActivity :
 
         override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
             val position = viewHolder.adapterPosition
-            val message = adapter.items[position]
-            scheduleDeletion(position, message.message, true)
+            val message = adapter.currentList[position]
+            scheduleDeletion(message.message)
         }
 
         override fun onChildDraw(
@@ -650,8 +633,16 @@ internal class MessagesActivity :
             binding.flipper.displayedChild = 0
         }
         val adapter = binding.messagesView.adapter as ListMessageAdapter
-        adapter.items = messageWithImages
-        adapter.notifyDataSetChanged()
+        adapter.updateList(messageWithImages)
+    }
+
+    private fun ListMessageAdapter.updateList(list: List<MessageWithImage>) {
+        this.submitList(if (this.currentList == list) list.toList() else list) {
+            val topChild = binding.messagesView.getChildAt(0)
+            if (topChild != null && topChild.top == 0) {
+                binding.messagesView.scrollToPosition(0)
+            }
+        }
     }
 
     companion object {

diff --git a/app/src/main/res/layout/activity_messages.xml b/app/src/main/res/layout/activity_messages.xml
@@ -90,7 +90,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        app:theme="@style/AppTheme.Nav"
+        android:theme="@style/AppTheme.Nav"
         app:headerLayout="@layout/nav_header_drawer"
         app:menu="@menu/messages_menu" />
 

diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml
@@ -56,7 +56,6 @@
 
     <ImageButton
         android:id="@+id/message_delete"
-        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:background="@null"

diff --git a/app/src/main/res/layout/message_item_compact.xml b/app/src/main/res/layout/message_item_compact.xml
@@ -57,7 +57,6 @@
 
     <ImageButton
         android:id="@+id/message_delete"
-        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:background="@null"

diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml
@@ -62,7 +62,6 @@
 
     <ImageButton
         android:id="@+id/refresh_all"
-        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"