From 36335a93484ac3d5fb2dd128fbea51dc387a3e23 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 13 May 2025 15:34:32 +0300 Subject: fix case for diffutil callback --- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 6 ++-- .../fox/ttrss/util/HeadlinesDiffUtilCallback.java | 35 ++++++++++++++++++++++ .../fox/ttrss/util/HeadlinesDiffutilCallback.java | 35 ---------------------- 3 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffUtilCallback.java delete mode 100644 org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffutilCallback.java (limited to 'org.fox.ttrss/src/main') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 986bc6d7..6e6cb472 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -75,7 +75,7 @@ import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Attachment; import org.fox.ttrss.types.Feed; -import org.fox.ttrss.util.HeadlinesDiffutilCallback; +import org.fox.ttrss.util.HeadlinesDiffUtilCallback; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -121,7 +121,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment implements tmp.add(new Article(Article.TYPE_AMR_FOOTER)); } - DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new HeadlinesDiffutilCallback(m_articles, tmp)); + DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new HeadlinesDiffUtilCallback(m_articles, tmp)); m_articles.clear(); m_articles.addAll(tmp); @@ -1551,7 +1551,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment implements tmp.add(new Article(Article.TYPE_AMR_FOOTER)); - DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new HeadlinesDiffutilCallback(m_articles, tmp)); + DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new HeadlinesDiffUtilCallback(m_articles, tmp)); diffResult.dispatchUpdatesTo(m_adapter); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffUtilCallback.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffUtilCallback.java new file mode 100644 index 00000000..80265758 --- /dev/null +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffUtilCallback.java @@ -0,0 +1,35 @@ +package org.fox.ttrss.util; + +import androidx.recyclerview.widget.DiffUtil; + +import org.fox.ttrss.types.ArticleList; + +public class HeadlinesDiffUtilCallback extends DiffUtil.Callback { + private ArticleList m_oldList; + private ArticleList m_newList; + + public HeadlinesDiffUtilCallback(ArticleList oldList, ArticleList newList) { + m_oldList = oldList; + m_newList = newList; + } + + @Override + public int getOldListSize() { + return m_oldList != null ? m_oldList.size() : 0; + } + + @Override + public int getNewListSize() { + return m_newList != null ? m_newList.size() : 0; + } + + @Override + public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) { + return m_newList.get(newItemPosition).id == m_oldList.get(oldItemPosition).id; + } + + @Override + public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) { + return false; + } + } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffutilCallback.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffutilCallback.java deleted file mode 100644 index b968e285..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesDiffutilCallback.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.fox.ttrss.util; - -import androidx.recyclerview.widget.DiffUtil; - -import org.fox.ttrss.types.ArticleList; - -public class HeadlinesDiffutilCallback extends DiffUtil.Callback { - private ArticleList m_oldList; - private ArticleList m_newList; - - public HeadlinesDiffutilCallback(ArticleList oldList, ArticleList newList) { - m_oldList = oldList; - m_newList = newList; - } - - @Override - public int getOldListSize() { - return m_oldList != null ? m_oldList.size() : 0; - } - - @Override - public int getNewListSize() { - return m_newList != null ? m_newList.size() : 0; - } - - @Override - public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) { - return m_newList.get(newItemPosition).id == m_oldList.get(oldItemPosition).id; - } - - @Override - public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) { - return false; - } - } -- cgit v1.2.3-54-g00ecf