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

Merge branch 'fix/hashtags-crash-akkoma'

Browse Source
This commit is contained in:
sk
2023-05-28 19:54:39 +02:00
parent b7e9380bc4 8053e8bb05
commit 9939d99c4b
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
View File

@@ -105,6 +105,12 @@ public class TrendingHashtagsFragment extends RecyclerFragment<Hashtag> implemen
@Override @Override
public void onBind(Hashtag item){ public void onBind(Hashtag item){
title.setText('#'+item.name); title.setText('#'+item.name);
if (item.history == null || item.history.isEmpty()) {
subtitle.setText(null);
chart.setVisibility(View.GONE);
return;
}
chart.setVisibility(View.VISIBLE);
int numPeople=item.history.get(0).accounts; int numPeople=item.history.get(0).accounts;
if(item.history.size()>1) if(item.history.size()>1)
numPeople+=item.history.get(1).accounts; numPeople+=item.history.get(1).accounts;

7
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
View File

@@ -1,6 +1,7 @@
package org.joinmastodon.android.ui.displayitems; package org.joinmastodon.android.ui.displayitems;
import android.content.Context; import android.content.Context;
import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
@@ -37,6 +38,12 @@ public class HashtagStatusDisplayItem extends StatusDisplayItem{
public void onBind(HashtagStatusDisplayItem _item){ public void onBind(HashtagStatusDisplayItem _item){
Hashtag item=_item.tag; Hashtag item=_item.tag;
title.setText('#'+item.name); title.setText('#'+item.name);
if (item.history == null || item.history.isEmpty()) {
subtitle.setText(null);
chart.setVisibility(View.GONE);
return;
}
chart.setVisibility(View.VISIBLE);
int numPeople=item.history.get(0).accounts; int numPeople=item.history.get(0).accounts;
if(item.history.size()>1) if(item.history.size()>1)
numPeople+=item.history.get(1).accounts; numPeople+=item.history.get(1).accounts;