From 39088252273cc05e88b6ed78a645fe9d480eefcf Mon Sep 17 00:00:00 2001 From: NudeDude Date: Wed, 19 Dec 2018 19:56:38 +0100 Subject: [PATCH] project cleanup bug fix --- .../nuclearfog/twidda/adapter/TimelineAdapter.java | 9 +++++---- .../org/nuclearfog/twidda/backend/ProfileLoader.java | 9 +++++---- .../org/nuclearfog/twidda/backend/StatusLoader.java | 12 ++++++------ .../nuclearfog/twidda/database/GlobalSettings.java | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TimelineAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TimelineAdapter.java index 84c4fb8c..ced0199a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/TimelineAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TimelineAdapter.java @@ -18,6 +18,7 @@ import org.nuclearfog.tag.Tagger; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.backend.items.Tweet; +import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -28,6 +29,7 @@ public class TimelineAdapter extends Adapter { private OnItemClickListener mListener; private List tweets; + private NumberFormat formatter; private int highlight = 0xFFFFFFFF; private int font_color = 0xFFFFFFFF; private boolean img_ldr = true; @@ -35,6 +37,7 @@ public class TimelineAdapter extends Adapter { public TimelineAdapter(OnItemClickListener mListener) { tweets = new ArrayList<>(); + formatter = NumberFormat.getIntegerInstance(); this.mListener = mListener; } @@ -93,8 +96,6 @@ public class TimelineAdapter extends Adapter { @Override public void onBindViewHolder(@NonNull ItemHolder vh, int index) { Tweet tweet = tweets.get(index); - String retweet = Integer.toString(tweet.getRetweetCount()); - String favorit = Integer.toString(tweet.getFavorCount()); if (tweet.getEmbeddedTweet() != null) { String retweeter = "RT " + tweet.getUser().getScreenname(); vh.retweeter.setText(retweeter); @@ -106,8 +107,8 @@ public class TimelineAdapter extends Adapter { vh.username.setText(tweet.getUser().getUsername()); vh.screenname.setText(tweet.getUser().getScreenname()); vh.tweet.setText(text); - vh.retweet.setText(retweet); - vh.favorite.setText(favorit); + vh.retweet.setText(formatter.format(tweet.getRetweetCount())); + vh.favorite.setText(formatter.format(tweet.getFavorCount())); vh.time.setText(stringTime(tweet.getTime())); vh.username.setTextColor(font_color); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java index eff6b6fe..c735f6de 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -25,6 +25,7 @@ import org.nuclearfog.twidda.window.UserDetail; import org.nuclearfog.twidda.window.UserProfile; import java.lang.ref.WeakReference; +import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -53,6 +54,7 @@ public class ProfileLoader extends AsyncTask { private DatabaseAdapter database; private TwitterUser user; private List tweets, favors; + private NumberFormat formatter; private long homeId; private int highlight; private boolean imgEnabled; @@ -75,6 +77,7 @@ public class ProfileLoader extends AsyncTask { ui = new WeakReference<>(context); mTwitter = TwitterEngine.getInstance(context); GlobalSettings settings = GlobalSettings.getInstance(context); + formatter = NumberFormat.getIntegerInstance(); database = new DatabaseAdapter(context); sdf = settings.getDateFormatter(); imgEnabled = settings.loadImages(); @@ -195,16 +198,14 @@ public class ProfileLoader extends AsyncTask { View link_ico = ui.get().findViewById(R.id.links_ico); View date_ico = ui.get().findViewById(R.id.date_ico); - String follower = Integer.toString(user.getFollower()); - String following = Integer.toString(user.getFollowing()); String date = sdf.format(new Date(user.getCreatedAt())); Spanned bio = Tagger.makeText(user.getBio(), highlight, ui.get()); txtBio.setMovementMethod(LinkMovementMethod.getInstance()); txtBio.setText(bio); txtUser.setText(user.getUsername()); txtScrName.setText(user.getScreenname()); - txtFollower.setText(follower); - txtFollowing.setText(following); + txtFollower.setText(formatter.format(user.getFollower())); + txtFollowing.setText(formatter.format(user.getFollowing())); txtCreated.setText(date); follower_ico.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index 9a90a18b..64e66699 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -23,6 +23,7 @@ import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.window.TweetDetail; import java.lang.ref.WeakReference; +import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -42,6 +43,7 @@ public class StatusLoader extends AsyncTask { private TimelineAdapter answerAdapter; private DatabaseAdapter database; private SimpleDateFormat sdf; + private NumberFormat formatter; private List answers; private Tweet tweet; private int highlight, font_color; @@ -54,6 +56,7 @@ public class StatusLoader extends AsyncTask { mTwitter = TwitterEngine.getInstance(context); GlobalSettings settings = GlobalSettings.getInstance(context); sdf = settings.getDateFormatter(); + formatter = NumberFormat.getIntegerInstance(); font_color = settings.getFontColor(); highlight = settings.getHighlightColor(); toggleImg = settings.loadImages(); @@ -164,12 +167,9 @@ public class StatusLoader extends AsyncTask { used_api.append(tweet.getSource()); used_api.setTextColor(font_color); - String ansStr = Integer.toString(answerAdapter.getItemCount() + answers.size()); - String favStr = Integer.toString(tweet.getFavorCount()); - String rtStr = Integer.toString(tweet.getRetweetCount()); - txtFav.setText(favStr); - txtRet.setText(rtStr); - txtAns.setText(ansStr); + txtFav.setText(formatter.format(tweet.getFavorCount())); + txtRet.setText(formatter.format(tweet.getRetweetCount())); + txtAns.setText(formatter.format(answerAdapter.getItemCount() + answers.size())); if (tweet.getReplyId() > 1) { String reply = ui.get().getString(R.string.answering); diff --git a/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java b/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java index 9c1c6a33..0107ec58 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java @@ -47,7 +47,7 @@ public class GlobalSettings { key1 = settings.getString("key1", ""); key2 = settings.getString("key2", ""); userId = settings.getLong("userID", -1L); - sdf = new SimpleDateFormat("dd.MM.yyyy, HH:mm:ss", Locale.GERMANY); + sdf = new SimpleDateFormat("dd.MM.yyyy, HH:mm:ss", Locale.getDefault()); } public static GlobalSettings getInstance(Context context) {