owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move status list fragment check out of predicate

Browse Source
This commit is contained in:
sk
2023-10-27 16:02:14 +02:00
parent 7902691093
commit 4cab916957
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
View File

@@ -64,11 +64,12 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
} }
top.setClickable(!item.loading); top.setClickable(!item.loading);
bottom.setClickable(!item.loading); bottom.setClickable(!item.loading);
StatusDisplayItem next=getNextVisibleDisplayItem(i->{ StatusDisplayItem next=item.parentFragment instanceof StatusListFragment
if(!(item.parentFragment instanceof StatusListFragment)) return false; ? getNextVisibleDisplayItem(i->{
Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID); Status s=((StatusListFragment) item.parentFragment).getStatusByID(i.parentID);
return s!=null && !s.fromStatusCreated; return s!=null && !s.fromStatusCreated;
}).orElse(null); }).orElse(null)
: null;
bottom.setVisibility(next==null ? View.GONE : View.VISIBLE); bottom.setVisibility(next==null ? View.GONE : View.VISIBLE);
Instant dateBelow=next instanceof HeaderStatusDisplayItem h ? h.status.createdAt Instant dateBelow=next instanceof HeaderStatusDisplayItem h ? h.status.createdAt
: next instanceof ReblogOrReplyLineStatusDisplayItem l ? l.status.createdAt : next instanceof ReblogOrReplyLineStatusDisplayItem l ? l.status.createdAt