diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java index 8f5f1511..e3a7ad89 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java @@ -39,6 +39,7 @@ public class MessageLoader extends AsyncTask { if (mAdapter == null) { mAdapter = new MessageAdapter(context); + mAdapter.setColor(settings.getFontColor()); mAdapter.setImageLoad(settings.loadImages()); dm_list.setAdapter(mAdapter); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java index 22a5be68..4828ae6f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java @@ -33,9 +33,6 @@ public class UserLists extends AsyncTask { public UserLists(UserDetail context) { - GlobalSettings settings = GlobalSettings.getInstance(context); - boolean imageLoad = settings.loadImages(); - ui = new WeakReference<>(context); mTwitter = TwitterEngine.getInstance(context); RecyclerView userList = context.findViewById(R.id.userlist); @@ -43,8 +40,10 @@ public class UserLists extends AsyncTask { usrAdp = (UserAdapter) userList.getAdapter(); if (usrAdp == null) { + GlobalSettings settings = GlobalSettings.getInstance(context); usrAdp = new UserAdapter(context); - usrAdp.toggleImage(imageLoad); + usrAdp.toggleImage(settings.loadImages()); + usrAdp.setColor(settings.getFontColor()); userList.setAdapter(usrAdp); } } diff --git a/app/src/main/java/org/nuclearfog/twidda/viewadapter/MessageAdapter.java b/app/src/main/java/org/nuclearfog/twidda/viewadapter/MessageAdapter.java index e7e1ca1c..eae30995 100644 --- a/app/src/main/java/org/nuclearfog/twidda/viewadapter/MessageAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/viewadapter/MessageAdapter.java @@ -25,6 +25,7 @@ public class MessageAdapter extends RecyclerView.Adapter messages; private OnItemSelected mListener; private boolean loadImage = true; + private int color = 0xFFFFFFFF; public MessageAdapter(OnItemSelected listener) { @@ -48,6 +49,11 @@ public class MessageAdapter extends RecyclerView.Adapter { } else { vh.retweeter.setText(""); } - vh.tweet.setTextColor(font_color); + vh.username.setText(tweet.user.username); vh.screenname.setText(tweet.user.screenname); vh.tweet.setText(highlight(tweet.tweet)); vh.retweet.setText(retweet); vh.favorite.setText(favorit); vh.time.setText(stringTime(tweet.time)); + + vh.username.setTextColor(font_color); + vh.screenname.setTextColor(font_color); + vh.tweet.setTextColor(font_color); + vh.time.setTextColor(font_color); + if (img_ldr) { Picasso.get().load(tweet.user.profileImg + "_mini").into(vh.profile); } diff --git a/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserAdapter.java b/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserAdapter.java index 87b470bf..b4474b1a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/viewadapter/UserAdapter.java @@ -23,6 +23,7 @@ public class UserAdapter extends Adapter { private List mUser; private OnItemClicked mListener; + private int font_color = 0xFFFFFFFF; private boolean loadImage = true; @@ -47,6 +48,11 @@ public class UserAdapter extends Adapter { } + public void setColor(int font_color) { + this.font_color = font_color; + } + + @Override public int getItemCount() { return mUser.size(); @@ -80,6 +86,11 @@ public class UserAdapter extends Adapter { TwitterUser user = mUser.get(index); vh.screenname.setText(user.screenname); vh.username.setText(user.username); + + vh.screenname.setTextColor(font_color); + vh.username.setTextColor(font_color); + + if (loadImage) { Picasso.get().load(user.profileImg + "_mini").into(vh.profileImg); } diff --git a/app/src/main/java/org/nuclearfog/twidda/window/DirectMessage.java b/app/src/main/java/org/nuclearfog/twidda/window/DirectMessage.java index 7a708782..6e63b4a5 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/DirectMessage.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/DirectMessage.java @@ -21,6 +21,11 @@ import org.nuclearfog.twidda.viewadapter.MessageAdapter.OnItemSelected; import static android.os.AsyncTask.Status.RUNNING; +/** + * Direct Message page + * + * @see MessageLoader + */ public class DirectMessage extends AppCompatActivity implements OnItemSelected, OnRefreshListener { private MessageLoader mLoader; @@ -32,6 +37,7 @@ public class DirectMessage extends AppCompatActivity implements OnItemSelected, protected void onCreate(Bundle b) { super.onCreate(b); setContentView(R.layout.page_dm); + Toolbar tool = findViewById(R.id.dm_toolbar); setSupportActionBar(tool); if (getSupportActionBar() != null) diff --git a/app/src/main/res/layout/item_dm.xml b/app/src/main/res/layout/item_dm.xml index f6c168a4..38bda8c5 100644 --- a/app/src/main/res/layout/item_dm.xml +++ b/app/src/main/res/layout/item_dm.xml @@ -14,9 +14,11 @@ diff --git a/app/src/main/res/layout/item_tweet.xml b/app/src/main/res/layout/item_tweet.xml index ec540e76..3077bfe1 100644 --- a/app/src/main/res/layout/item_tweet.xml +++ b/app/src/main/res/layout/item_tweet.xml @@ -17,11 +17,13 @@ android:orientation="horizontal"> @@ -31,44 +32,48 @@ + android:visibility="visible" /> + android:visibility="visible" /> diff --git a/app/src/main/res/layout/page_profile.xml b/app/src/main/res/layout/page_profile.xml index 58fe6186..0a1a548b 100644 --- a/app/src/main/res/layout/page_profile.xml +++ b/app/src/main/res/layout/page_profile.xml @@ -40,6 +40,7 @@ android:orientation="horizontal"> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4305ebe7..e5039a06 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,9 +4,9 @@ @color/colorPrimary @color/colorPrimaryDark @color/soylentgreen - @color/DarkBlue - @style/TransactionPending + @android:color/black @android:color/black + @style/TransactionPending @style/RobotoTextView @style/CustomButton @@ -31,6 +31,10 @@ true + +