Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapter fix, added comments

Browse Source 
Signed-off-by: nuclearfog <hatespirit666@gmail.com>
This commit is contained in:
nuclearfog 2021-04-04 16:20:26 +02:00
parent 0d456bb2b2
commit b1ff3c7c35
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
5 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/nuclearfog/twidda/adapter/FontAdapter.java
View File

@ -50,7 +50,9 @@ public class FontAdapter extends BaseAdapter {
private GlobalSettings settings;
/**
* @param settings app settings for background and font color
*/
public FontAdapter(GlobalSettings settings) {
this.settings = settings;
}

15
app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java
View File

@ -52,14 +52,21 @@ public class ListAdapter extends Adapter<ViewHolder> {
*/
private static final int ITEM_LIST = 1;
/**
* locale specific number format
*/
private static final NumberFormat NUM_FORMAT = NumberFormat.getIntegerInstance();
private ListClickListener listener;
private GlobalSettings settings;
private NumberFormat formatter = NumberFormat.getIntegerInstance();
private UserLists data = new UserLists();
private int loadingIndex = NO_LOADING;
/**
* @param settings app settings for theme
* @param listener item click listener
*/
public ListAdapter(GlobalSettings settings, ListClickListener listener) {
this.listener = listener;
this.settings = settings;
@ -202,8 +209,8 @@ public class ListAdapter extends Adapter<ViewHolder> {
vh.textViews[2].setText(owner.getUsername());
vh.textViews[3].setText(owner.getScreenname());
vh.textViews[4].setText(formatCreationTime(item.getCreatedAt()));
vh.textViews[5].setText(formatter.format(item.getMemberCount()));
vh.textViews[6].setText(formatter.format(item.getSubscriberCount()));
vh.textViews[5].setText(NUM_FORMAT.format(item.getMemberCount()));
vh.textViews[6].setText(NUM_FORMAT.format(item.getSubscriberCount()));
if (settings.getImageLoad() && owner.hasProfileImage()) {
String pbLink = owner.getImageLink();
if (!owner.hasDefaultProfileImage())

21
app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java
View File

@ -30,12 +30,23 @@ import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
*/
public class TrendAdapter extends Adapter<ViewHolder> {
/**
* Max trend count Twitter API returns
*/
private static final int INIT_COUNT = 50;
/**
* Locale specific number format
*/
private static final NumberFormat NUM_FORMAT = NumberFormat.getIntegerInstance();
private TrendClickListener itemClickListener;
private List<Trend> trends = new ArrayList<>(INIT_COUNT);
private NumberFormat formatter = NumberFormat.getIntegerInstance();
private List<Trend> trends = new ArrayList<>();
/**
* @param itemClickListener Listener for item click
*/
public TrendAdapter(TrendClickListener itemClickListener) {
this.itemClickListener = itemClickListener;
}
@ -102,7 +113,7 @@ public class TrendAdapter extends Adapter<ViewHolder> {
holder.textViews[1].setText(trend.getName());
if (trend.hasRangeInfo()) {
Resources resources = holder.textViews[2].getContext().getResources();
String trendVol = formatter.format(trend.getRange()) + " " + resources.getString(R.string.trend_range);
String trendVol = NUM_FORMAT.format(trend.getRange()) + " " + resources.getString(R.string.trend_range);
holder.textViews[2].setText(trendVol);
holder.textViews[2].setVisibility(VISIBLE);
} else {

20
app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
View File

@ -22,7 +22,7 @@ import org.nuclearfog.twidda.backend.items.User;
import org.nuclearfog.twidda.database.GlobalSettings;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation;
@ -63,14 +63,22 @@ public class TweetAdapter extends Adapter<ViewHolder> {
*/
private static final int MIN_COUNT = 2;
/**
* Locale specific number format
*/
private static final NumberFormat NUM_FORMAT = NumberFormat.getIntegerInstance();
private TweetClickListener itemClickListener;
private GlobalSettings settings;
private final List<Tweet> tweets = new ArrayList<>();
private NumberFormat formatter = NumberFormat.getIntegerInstance();
private final List<Tweet> tweets = new LinkedList<>();
private int loadingIndex = NO_LOADING;
/**
* @param settings App settings for theme
* @param itemClickListener listener for item click
*/
public TweetAdapter(GlobalSettings settings, TweetClickListener itemClickListener) {
this.itemClickListener = itemClickListener;
this.settings = settings;
@ -272,8 +280,8 @@ public class TweetAdapter extends Adapter<ViewHolder> {
tweetItem.textViews[2].setText(text);
tweetItem.textViews[0].setText(user.getUsername());
tweetItem.textViews[1].setText(user.getScreenname());
tweetItem.textViews[3].setText(formatter.format(tweet.getRetweetCount()));
tweetItem.textViews[4].setText(formatter.format(tweet.getFavoriteCount()));
tweetItem.textViews[3].setText(NUM_FORMAT.format(tweet.getRetweetCount()));
tweetItem.textViews[4].setText(NUM_FORMAT.format(tweet.getFavoriteCount()));
tweetItem.textViews[6].setText(formatCreationTime(tweet.getTime()));
if (tweet.retweeted()) {

8
app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
View File

@ -51,9 +51,9 @@ public class UserAdapter extends Adapter<ViewHolder> {
private static final int ITEM_GAP = 1;
/**
* Number formatter
* locale specific number formatter
*/
private static final NumberFormat FORMATTER = NumberFormat.getIntegerInstance();
private static final NumberFormat NUM_FORMAT = NumberFormat.getIntegerInstance();
private UserClickListener listener;
private GlobalSettings settings;
@ -214,8 +214,8 @@ public class UserAdapter extends Adapter<ViewHolder> {
UserHolder userholder = (UserHolder) holder;
userholder.textViews[0].setText(user.getUsername());
userholder.textViews[1].setText(user.getScreenname());
userholder.textViews[2].setText(FORMATTER.format(user.getFollowing()));
userholder.textViews[3].setText(FORMATTER.format(user.getFollower()));
userholder.textViews[2].setText(NUM_FORMAT.format(user.getFollowing()));
userholder.textViews[3].setText(NUM_FORMAT.format(user.getFollower()));
if (user.isVerified()) {
userholder.verifyIcon.setVisibility(VISIBLE);
} else {