diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/FontAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/FontAdapter.java index b92c25ef..213c1fb4 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/FontAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/FontAdapter.java @@ -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; } diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java index 7ca314f0..9914d626 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java @@ -52,14 +52,21 @@ public class ListAdapter extends Adapter { */ 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 { 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()) diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java index b97969e0..20efd959 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java @@ -30,12 +30,23 @@ import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; */ public class TrendAdapter extends Adapter { + /** + * 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 trends = new ArrayList<>(INIT_COUNT); - private NumberFormat formatter = NumberFormat.getIntegerInstance(); - private List 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 { 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 { diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java index c0252b1b..d8bd6c3c 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java @@ -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 { */ 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 tweets = new ArrayList<>(); - private NumberFormat formatter = NumberFormat.getIntegerInstance(); + private final List 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 { 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()) { diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java index 5263933e..9aa4de93 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java @@ -51,9 +51,9 @@ public class UserAdapter extends Adapter { 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 { 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 {