From f323857ef339179e1fd6d74809fb7b8e03a9fb7c Mon Sep 17 00:00:00 2001 From: tom79 Date: Fri, 18 Aug 2017 09:33:54 +0200 Subject: [PATCH] Fixes text color for buttons with light theme in toots. --- .../etalab/mastodon/drawers/NotificationsListAdapter.java | 4 ++++ .../fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 0f0aa225f..cd8f62e10 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -459,6 +459,10 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio } }); + if( theme == Helper.THEME_LIGHT) { + holder.status_show_more.setTextColor(ContextCompat.getColor(context, R.color.white)); + } + //Profile picture imageLoader.displayImage(notification.getAccount().getAvatar(), holder.notification_account_profile, options); return convertView; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index a08b3d119..5ebbd5252 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -594,6 +594,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_favorite_count.setCompoundDrawables(imgFav, null, null, null); holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null); + if( theme == Helper.THEME_LIGHT) { + holder.status_show_more.setTextColor(ContextCompat.getColor(context, R.color.white)); + holder.status_spoiler_button.setTextColor(ContextCompat.getColor(context, R.color.white)); + } holder.status_show_more.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {