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

feat(notifications): readd account card for follow notifications

Browse Source
This commit is contained in:
LucasGGamerM
2023-09-28 08:31:21 -03:00
parent 9f17f1600a
commit 56a83e66cd
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
View File

@@ -38,6 +38,7 @@ import org.parceler.Parcels;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -93,7 +94,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
}else{ }else{
titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID); titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID);
} }
if (n.type == Notification.Type.FOLLOW_REQUEST) { if (n.type == Notification.Type.FOLLOW_REQUEST || n.type == Notification.Type.FOLLOW) {
ArrayList<StatusDisplayItem> items = new ArrayList<>(); ArrayList<StatusDisplayItem> items = new ArrayList<>();
items.add(titleItem); items.add(titleItem);
items.add(new AccountCardStatusDisplayItem(n.id, this, accountID, n.account, n)); items.add(new AccountCardStatusDisplayItem(n.id, this, accountID, n.account, n));
@@ -134,6 +135,13 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
public void onSuccess(PaginatedResponse<List<Notification>> result){ public void onSuccess(PaginatedResponse<List<Notification>> result){
if(getActivity()==null) if(getActivity()==null)
return; return;
Set<String> needRelationships=result.items.stream()
.filter(ntf->ntf.status==null && !relationships.containsKey(ntf.account.id))
.map(ntf->ntf.account.id)
.collect(Collectors.toSet());
loadRelationships(needRelationships);
maxID=result.maxID; maxID=result.maxID;
onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty()); onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
reloadingFromCache=false; reloadingFromCache=false;
@@ -144,6 +152,17 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
}); });
} }
@Override
protected void onRelationshipsLoaded(){
if(getActivity()==null)
return;
for(int i=0;i<list.getChildCount();i++){
RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
if(holder instanceof AccountCardStatusDisplayItem.Holder accountHolder)
accountHolder.rebind();
}
}
@Override @Override
protected void onShown(){ protected void onShown(){
super.onShown(); super.onShown();