Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into m3_redesign 

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
This commit is contained in:
Grishka 2023-05-28 20:58:27 +03:00
parent 5c480b37b3 47edc3180b
commit 31c7116a15
2 changed files with 9 additions and 0 deletions
Show Stats 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

@ -98,6 +98,12 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
@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;

3
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;
@ -43,8 +44,10 @@ public class HashtagStatusDisplayItem extends StatusDisplayItem{
numPeople+=item.history.get(1).accounts; numPeople+=item.history.get(1).accounts;
subtitle.setText(itemView.getResources().getQuantityString(R.plurals.x_people_talking, numPeople, numPeople)); subtitle.setText(itemView.getResources().getQuantityString(R.plurals.x_people_talking, numPeople, numPeople));
chart.setData(item.history); chart.setData(item.history);
chart.setVisibility(View.VISIBLE);
}else{ }else{
subtitle.setText(itemView.getResources().getQuantityString(R.plurals.x_posts, item.statusesCount, item.statusesCount)); subtitle.setText(itemView.getResources().getQuantityString(R.plurals.x_posts, item.statusesCount, item.statusesCount));
chart.setVisibility(View.GONE);
} }
} }
} }