mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-28 11:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused Post fields (#1212)

Browse Source 
* Remove unused isHiddenInRecyclerView Post field

Was used only for reads and was always false

* Remove unused isHiddenManuallyByUser Post field

Was only written to and read for serialization. Never used for any logic
This commit is contained in:
Sergei Kozelko 2022-11-27 20:12:29 +08:00 committed by GitHub
parent d3ccaea2cc
commit 69ba6461ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java
View File

@ -1699,20 +1699,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
mShowAbsoluteNumberOfVotes = showAbsoluteNumberOfVotes; mShowAbsoluteNumberOfVotes = showAbsoluteNumberOfVotes;
} }
public int getNextItemPositionWithoutBeingHidden(int fromPosition) {
int temp = fromPosition;
while (temp >= 0 && temp < super.getItemCount()) {
Post post = getItem(temp);
if (post != null && post.isHiddenInRecyclerView()) {
temp++;
} else {
break;
}
}
return temp;
}
public void setAutoplay(boolean autoplay) { public void setAutoplay(boolean autoplay) {
mAutoplay = autoplay; mAutoplay = autoplay;
} }

20
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
View File

@ -1769,20 +1769,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
mShowAbsoluteNumberOfVotes = showAbsoluteNumberOfVotes; mShowAbsoluteNumberOfVotes = showAbsoluteNumberOfVotes;
} }
public int getNextItemPositionWithoutBeingHidden(int fromPosition) {
int temp = fromPosition;
while (temp >= 0 && temp < super.getItemCount()) {
Post post = getItem(temp);
if (post != null && post.isHiddenInRecyclerView()) {
temp++;
} else {
break;
}
}
return temp;
}
public void setAutoplay(boolean autoplay) { public void setAutoplay(boolean autoplay) {
mAutoplay = autoplay; mAutoplay = autoplay;
} }
@ -2718,7 +2704,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
void markPostRead(Post post, boolean changePostItemColor) { void markPostRead(Post post, boolean changePostItemColor) {
if (mAccessToken != null && !post.isRead() && mMarkPostsAsRead) { if (mAccessToken != null && !post.isRead() && mMarkPostsAsRead) {
post.markAsRead(true); post.markAsRead();
if (changePostItemColor) { if (changePostItemColor) {
if (itemViewIsNotCardView) { if (itemViewIsNotCardView) {
itemView.setBackgroundColor(mReadPostCardViewBackgroundColor); itemView.setBackgroundColor(mReadPostCardViewBackgroundColor);
@ -3993,7 +3979,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
void markPostRead(Post post, boolean changePostItemColor) { void markPostRead(Post post, boolean changePostItemColor) {
if (mAccessToken != null && !post.isRead() && mMarkPostsAsRead) { if (mAccessToken != null && !post.isRead() && mMarkPostsAsRead) {
post.markAsRead(true); post.markAsRead();
if (changePostItemColor) { if (changePostItemColor) {
itemView.setBackgroundColor(mReadPostCardViewBackgroundColor); itemView.setBackgroundColor(mReadPostCardViewBackgroundColor);
titleTextView.setTextColor(mReadPostTitleColor); titleTextView.setTextColor(mReadPostTitleColor);
@ -4259,7 +4245,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
void markPostRead(Post post, boolean changePostItemColor) { void markPostRead(Post post, boolean changePostItemColor) {
if (mAccessToken != null && !post.isRead() && mMarkPostsAsRead) { if (mAccessToken != null && !post.isRead() && mMarkPostsAsRead) {
post.markAsRead(true); post.markAsRead();
if (changePostItemColor) { if (changePostItemColor) {
itemView.setBackgroundTintList(ColorStateList.valueOf(mReadPostCardViewBackgroundColor)); itemView.setBackgroundTintList(ColorStateList.valueOf(mReadPostCardViewBackgroundColor));
titleTextView.setTextColor(mReadPostTitleColor); titleTextView.setTextColor(mReadPostTitleColor);

8
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java
View File

@ -299,16 +299,16 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
int nPosts = mAdapter.getItemCount(); int nPosts = mAdapter.getItemCount();
if (getCurrentPosition() == -1) { if (getCurrentPosition() == -1) {
if (mLinearLayoutManager != null) { if (mLinearLayoutManager != null) {
setCurrentPosition(mAdapter.getNextItemPositionWithoutBeingHidden(mLinearLayoutManager.findFirstVisibleItemPosition())); setCurrentPosition(mLinearLayoutManager.findFirstVisibleItemPosition());
} else { } else {
int[] into = new int[2]; int[] into = new int[2];
setCurrentPosition(mAdapter.getNextItemPositionWithoutBeingHidden(mStaggeredGridLayoutManager.findFirstVisibleItemPositions(into)[1])); setCurrentPosition(mStaggeredGridLayoutManager.findFirstVisibleItemPositions(into)[1]);
} }
} }
if (getCurrentPosition() != RecyclerView.NO_POSITION && nPosts > getCurrentPosition()) { if (getCurrentPosition() != RecyclerView.NO_POSITION && nPosts > getCurrentPosition()) {
incrementCurrentPosition(); incrementCurrentPosition();
smoothScroller.setTargetPosition(mAdapter.getNextItemPositionWithoutBeingHidden(getCurrentPosition())); smoothScroller.setTargetPosition(getCurrentPosition());
if (mLinearLayoutManager != null) { if (mLinearLayoutManager != null) {
mLinearLayoutManager.startSmoothScroll(smoothScroller); mLinearLayoutManager.startSmoothScroll(smoothScroller);
} else { } else {
@ -1029,7 +1029,7 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
post.setFlair(event.post.getFlair()); post.setFlair(event.post.getFlair());
post.setSaved(event.post.isSaved()); post.setSaved(event.post.isSaved());
if (event.post.isRead()) { if (event.post.isRead()) {
post.markAsRead(true); post.markAsRead();
} }
mAdapter.notifyItemChanged(event.positionInList); mAdapter.notifyItemChanged(event.positionInList);
} }

8
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
View File

@ -361,16 +361,16 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
int nPosts = mAdapter.getItemCount(); int nPosts = mAdapter.getItemCount();
if (getCurrentPosition() == -1) { if (getCurrentPosition() == -1) {
if (mLinearLayoutManager != null) { if (mLinearLayoutManager != null) {
setCurrentPosition(mAdapter.getNextItemPositionWithoutBeingHidden(mLinearLayoutManager.findFirstVisibleItemPosition())); setCurrentPosition(mLinearLayoutManager.findFirstVisibleItemPosition());
} else { } else {
int[] into = new int[2]; int[] into = new int[2];
setCurrentPosition(mAdapter.getNextItemPositionWithoutBeingHidden(mStaggeredGridLayoutManager.findFirstVisibleItemPositions(into)[1])); setCurrentPosition(mStaggeredGridLayoutManager.findFirstVisibleItemPositions(into)[1]);
} }
} }
if (getCurrentPosition() != RecyclerView.NO_POSITION && nPosts > getCurrentPosition()) { if (getCurrentPosition() != RecyclerView.NO_POSITION && nPosts > getCurrentPosition()) {
incrementCurrentPosition(); incrementCurrentPosition();
smoothScroller.setTargetPosition(mAdapter.getNextItemPositionWithoutBeingHidden(getCurrentPosition())); smoothScroller.setTargetPosition(getCurrentPosition());
if (mLinearLayoutManager != null) { if (mLinearLayoutManager != null) {
mLinearLayoutManager.startSmoothScroll(smoothScroller); mLinearLayoutManager.startSmoothScroll(smoothScroller);
} else { } else {
@ -1777,7 +1777,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
post.setFlair(event.post.getFlair()); post.setFlair(event.post.getFlair());
post.setSaved(event.post.isSaved()); post.setSaved(event.post.isSaved());
if (event.post.isRead()) { if (event.post.isRead()) {
post.markAsRead(true); post.markAsRead();
} }
mAdapter.notifyItemChanged(event.positionInList); mAdapter.notifyItemChanged(event.positionInList);
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java
View File

@ -1189,7 +1189,7 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
private void tryMarkingPostAsRead() { private void tryMarkingPostAsRead() {
if (mMarkPostsAsRead && mPost != null && !mPost.isRead()) { if (mMarkPostsAsRead && mPost != null && !mPost.isRead()) {
mPost.markAsRead(true); mPost.markAsRead();
InsertReadPost.insertReadPost(mRedditDataRoomDatabase, mExecutor, mAccountName, mPost.getId()); InsertReadPost.insertReadPost(mRedditDataRoomDatabase, mExecutor, mAccountName, mPost.getId());
EventBus.getDefault().post(new PostUpdateEventToPostList(mPost, postListPosition)); EventBus.getDefault().post(new PostUpdateEventToPostList(mPost, postListPosition));
} }

2
app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
View File

@ -51,7 +51,7 @@ public class ParsePost {
JSONObject data = allData.getJSONObject(i).getJSONObject(JSONUtils.DATA_KEY); JSONObject data = allData.getJSONObject(i).getJSONObject(JSONUtils.DATA_KEY);
Post post = parseBasicData(data); Post post = parseBasicData(data);
if (readPostHashSet != null && readPostHashSet.contains(post.getId())) { if (readPostHashSet != null && readPostHashSet.contains(post.getId())) {
post.markAsRead(false); post.markAsRead();
} }
if (PostFilter.isPostAllowed(post, postFilter)) { if (PostFilter.isPostAllowed(post, postFilter)) {
newPosts.add(post); newPosts.add(post);

21
app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java
View File

@ -76,8 +76,6 @@ public class Post implements Parcelable {
private boolean saved; private boolean saved;
private boolean isCrosspost; private boolean isCrosspost;
private boolean isRead; private boolean isRead;
private boolean isHiddenInRecyclerView = false;
private boolean isHiddenManuallyByUser = false;
private String crosspostParentId; private String crosspostParentId;
private ArrayList<Preview> previews = new ArrayList<>(); private ArrayList<Preview> previews = new ArrayList<>();
private ArrayList<Gallery> gallery = new ArrayList<>(); private ArrayList<Gallery> gallery = new ArrayList<>();
@ -199,8 +197,6 @@ public class Post implements Parcelable {
saved = in.readByte() != 0; saved = in.readByte() != 0;
isCrosspost = in.readByte() != 0; isCrosspost = in.readByte() != 0;
isRead = in.readByte() != 0; isRead = in.readByte() != 0;
isHiddenInRecyclerView = in.readByte() != 0;
isHiddenManuallyByUser = in.readByte() != 0;
crosspostParentId = in.readString(); crosspostParentId = in.readString();
in.readTypedList(previews, Preview.CREATOR); in.readTypedList(previews, Preview.CREATOR);
in.readTypedList(gallery, Gallery.CREATOR); in.readTypedList(gallery, Gallery.CREATOR);
@ -496,27 +492,14 @@ public class Post implements Parcelable {
return isCrosspost; return isCrosspost;
} }
public void markAsRead(boolean isHiddenManuallyByUser) { public void markAsRead() {
isRead = true; isRead = true;
this.isHiddenManuallyByUser = isHiddenManuallyByUser;
} }
public boolean isRead() { public boolean isRead() {
return isRead; return isRead;
} }
public boolean isHiddenInRecyclerView() {
return isHiddenInRecyclerView;
}
public void hidePostInRecyclerView() {
isHiddenInRecyclerView = true;
}
public boolean isHiddenManuallyByUser() {
return isHiddenManuallyByUser;
}
public String getCrosspostParentId() { public String getCrosspostParentId() {
return crosspostParentId; return crosspostParentId;
} }
@ -586,8 +569,6 @@ public class Post implements Parcelable {
parcel.writeByte((byte) (saved ? 1 : 0)); parcel.writeByte((byte) (saved ? 1 : 0));
parcel.writeByte((byte) (isCrosspost ? 1 : 0)); parcel.writeByte((byte) (isCrosspost ? 1 : 0));
parcel.writeByte((byte) (isRead ? 1 : 0)); parcel.writeByte((byte) (isRead ? 1 : 0));
parcel.writeByte((byte) (isHiddenInRecyclerView ? 1 : 0));
parcel.writeByte((byte) (isHiddenManuallyByUser ? 1 : 0));
parcel.writeString(crosspostParentId); parcel.writeString(crosspostParentId);
parcel.writeTypedList(previews); parcel.writeTypedList(previews);
parcel.writeTypedList(gallery); parcel.writeTypedList(gallery);