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

project cleanup 

bug fix
This commit is contained in:
NudeDude 2018-12-19 19:56:38 +01:00
parent 6237855060
commit 3908825227
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/nuclearfog/twidda/adapter/TimelineAdapter.java
View File

@ -18,6 +18,7 @@ import org.nuclearfog.tag.Tagger;
import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.items.Tweet; import org.nuclearfog.twidda.backend.items.Tweet;
import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
@ -28,6 +29,7 @@ public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
private OnItemClickListener mListener; private OnItemClickListener mListener;
private List<Tweet> tweets; private List<Tweet> tweets;
private NumberFormat formatter;
private int highlight = 0xFFFFFFFF; private int highlight = 0xFFFFFFFF;
private int font_color = 0xFFFFFFFF; private int font_color = 0xFFFFFFFF;
private boolean img_ldr = true; private boolean img_ldr = true;
@ -35,6 +37,7 @@ public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
public TimelineAdapter(OnItemClickListener mListener) { public TimelineAdapter(OnItemClickListener mListener) {
tweets = new ArrayList<>(); tweets = new ArrayList<>();
formatter = NumberFormat.getIntegerInstance();
this.mListener = mListener; this.mListener = mListener;
} }
@ -93,8 +96,6 @@ public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
@Override @Override
public void onBindViewHolder(@NonNull ItemHolder vh, int index) { public void onBindViewHolder(@NonNull ItemHolder vh, int index) {
Tweet tweet = tweets.get(index); Tweet tweet = tweets.get(index);
String retweet = Integer.toString(tweet.getRetweetCount());
String favorit = Integer.toString(tweet.getFavorCount());
if (tweet.getEmbeddedTweet() != null) { if (tweet.getEmbeddedTweet() != null) {
String retweeter = "RT " + tweet.getUser().getScreenname(); String retweeter = "RT " + tweet.getUser().getScreenname();
vh.retweeter.setText(retweeter); vh.retweeter.setText(retweeter);
@ -106,8 +107,8 @@ public class TimelineAdapter extends Adapter<TimelineAdapter.ItemHolder> {
vh.username.setText(tweet.getUser().getUsername()); vh.username.setText(tweet.getUser().getUsername());
vh.screenname.setText(tweet.getUser().getScreenname()); vh.screenname.setText(tweet.getUser().getScreenname());
vh.tweet.setText(text); vh.tweet.setText(text);
vh.retweet.setText(retweet); vh.retweet.setText(formatter.format(tweet.getRetweetCount()));
vh.favorite.setText(favorit); vh.favorite.setText(formatter.format(tweet.getFavorCount()));
vh.time.setText(stringTime(tweet.getTime())); vh.time.setText(stringTime(tweet.getTime()));
vh.username.setTextColor(font_color); vh.username.setTextColor(font_color);

9
app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
View File

@ -25,6 +25,7 @@ import org.nuclearfog.twidda.window.UserDetail;
import org.nuclearfog.twidda.window.UserProfile; import org.nuclearfog.twidda.window.UserProfile;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -53,6 +54,7 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
private DatabaseAdapter database; private DatabaseAdapter database;
private TwitterUser user; private TwitterUser user;
private List<Tweet> tweets, favors; private List<Tweet> tweets, favors;
private NumberFormat formatter;
private long homeId; private long homeId;
private int highlight; private int highlight;
private boolean imgEnabled; private boolean imgEnabled;
@ -75,6 +77,7 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
ui = new WeakReference<>(context); ui = new WeakReference<>(context);
mTwitter = TwitterEngine.getInstance(context); mTwitter = TwitterEngine.getInstance(context);
GlobalSettings settings = GlobalSettings.getInstance(context); GlobalSettings settings = GlobalSettings.getInstance(context);
formatter = NumberFormat.getIntegerInstance();
database = new DatabaseAdapter(context); database = new DatabaseAdapter(context);
sdf = settings.getDateFormatter(); sdf = settings.getDateFormatter();
imgEnabled = settings.loadImages(); imgEnabled = settings.loadImages();
@ -195,16 +198,14 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
View link_ico = ui.get().findViewById(R.id.links_ico); View link_ico = ui.get().findViewById(R.id.links_ico);
View date_ico = ui.get().findViewById(R.id.date_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())); String date = sdf.format(new Date(user.getCreatedAt()));
Spanned bio = Tagger.makeText(user.getBio(), highlight, ui.get()); Spanned bio = Tagger.makeText(user.getBio(), highlight, ui.get());
txtBio.setMovementMethod(LinkMovementMethod.getInstance()); txtBio.setMovementMethod(LinkMovementMethod.getInstance());
txtBio.setText(bio); txtBio.setText(bio);
txtUser.setText(user.getUsername()); txtUser.setText(user.getUsername());
txtScrName.setText(user.getScreenname()); txtScrName.setText(user.getScreenname());
txtFollower.setText(follower); txtFollower.setText(formatter.format(user.getFollower()));
txtFollowing.setText(following); txtFollowing.setText(formatter.format(user.getFollowing()));
txtCreated.setText(date); txtCreated.setText(date);
follower_ico.setVisibility(View.VISIBLE); follower_ico.setVisibility(View.VISIBLE);

12
app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -23,6 +23,7 @@ import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.window.TweetDetail; import org.nuclearfog.twidda.window.TweetDetail;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -42,6 +43,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
private TimelineAdapter answerAdapter; private TimelineAdapter answerAdapter;
private DatabaseAdapter database; private DatabaseAdapter database;
private SimpleDateFormat sdf; private SimpleDateFormat sdf;
private NumberFormat formatter;
private List<Tweet> answers; private List<Tweet> answers;
private Tweet tweet; private Tweet tweet;
private int highlight, font_color; private int highlight, font_color;
@ -54,6 +56,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
mTwitter = TwitterEngine.getInstance(context); mTwitter = TwitterEngine.getInstance(context);
GlobalSettings settings = GlobalSettings.getInstance(context); GlobalSettings settings = GlobalSettings.getInstance(context);
sdf = settings.getDateFormatter(); sdf = settings.getDateFormatter();
formatter = NumberFormat.getIntegerInstance();
font_color = settings.getFontColor(); font_color = settings.getFontColor();
highlight = settings.getHighlightColor(); highlight = settings.getHighlightColor();
toggleImg = settings.loadImages(); toggleImg = settings.loadImages();
@ -164,12 +167,9 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
used_api.append(tweet.getSource()); used_api.append(tweet.getSource());
used_api.setTextColor(font_color); used_api.setTextColor(font_color);
String ansStr = Integer.toString(answerAdapter.getItemCount() + answers.size()); txtFav.setText(formatter.format(tweet.getFavorCount()));
String favStr = Integer.toString(tweet.getFavorCount()); txtRet.setText(formatter.format(tweet.getRetweetCount()));
String rtStr = Integer.toString(tweet.getRetweetCount()); txtAns.setText(formatter.format(answerAdapter.getItemCount() + answers.size()));
txtFav.setText(favStr);
txtRet.setText(rtStr);
txtAns.setText(ansStr);
if (tweet.getReplyId() > 1) { if (tweet.getReplyId() > 1) {
String reply = ui.get().getString(R.string.answering); String reply = ui.get().getString(R.string.answering);

2
app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
View File

@ -47,7 +47,7 @@ public class GlobalSettings {
key1 = settings.getString("key1", ""); key1 = settings.getString("key1", "");
key2 = settings.getString("key2", ""); key2 = settings.getString("key2", "");
userId = settings.getLong("userID", -1L); 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) { public static GlobalSettings getInstance(Context context) {