Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue #568 - Change colors

This commit is contained in:
stom79 2018-11-18 08:38:33 +01:00
parent 3a1a90f517
commit 4670576318
6 changed files with 90 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -310,11 +310,11 @@ public abstract class BaseMainActivity extends BaseActivity
iconGlobal.setImageResource(R.drawable.ic_public);
if( theme == THEME_LIGHT){
iconHome.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon), PorterDuff.Mode.SRC_IN);
iconNotif.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon), PorterDuff.Mode.SRC_IN);
iconDirect.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon), PorterDuff.Mode.SRC_IN);
iconLocal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon), PorterDuff.Mode.SRC_IN);
iconGlobal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon), PorterDuff.Mode.SRC_IN);
iconHome.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.action_light_header), PorterDuff.Mode.SRC_IN);
iconNotif.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.action_light_header), PorterDuff.Mode.SRC_IN);
iconDirect.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.action_light_header), PorterDuff.Mode.SRC_IN);
iconLocal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.action_light_header), PorterDuff.Mode.SRC_IN);
iconGlobal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.action_light_header), PorterDuff.Mode.SRC_IN);
}else {
iconHome.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);
iconNotif.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);

3
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
View File

@ -492,7 +492,8 @@ public class Status implements Parcelable{
status.setContentSpan(treatment(context, spannableStringContent, status));
if( spannableStringCW.length() > 0)
status.setContentSpanCW(treatment(context, spannableStringCW, status));
SpannableString displayNameSpan = new SpannableString(status.reblog!=null?status.getReblog().getAccount().getDisplay_name():status.getAccount().getDisplay_name());
status.setDisplayNameSpan(displayNameSpan);
status.setClickable(true);
}

105
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -521,20 +521,22 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, R.drawable.video_preview,R.color.white);
if( theme == Helper.THEME_BLACK){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, holder.status_more, R.color.dark_icon);
changeDrawableColor(context, holder.status_privacy, R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.black_text_toot_header);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_plus_one,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_reply,R.color.action_black);
changeDrawableColor(context, holder.status_more, R.color.action_black);
changeDrawableColor(context, holder.status_privacy, R.color.action_black);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.action_black);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.action_black);
changeDrawableColor(context, R.drawable.ic_plus_one,R.color.action_black);
changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_black);
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_black));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_black));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.action_black));
changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.black_text_toot_header);
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
changeDrawableColor(context, R.drawable.ic_fetch_more,R.color.dark_icon);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
@ -545,21 +547,24 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, R.drawable.ic_translate,R.color.black);
}else if( theme == Helper.THEME_DARK ){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, holder.status_more, R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.dark_icon);
changeDrawableColor(context, holder.status_privacy, R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_reply,R.color.action_dark);
changeDrawableColor(context, holder.status_more, R.color.action_dark);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.action_dark);
changeDrawableColor(context, holder.status_privacy, R.color.action_dark);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.action_dark);
changeDrawableColor(context, R.drawable.ic_plus_one,R.color.action_dark);
changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_dark);
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.dark_text_toot_header);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_plus_one,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_photo,R.color.mastodonC4);
changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.mastodonC4);
changeDrawableColor(context, R.drawable.ic_fetch_more,R.color.mastodonC4);
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
@ -569,21 +574,25 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, R.drawable.ic_bookmark_border,R.color.mastodonC1);
changeDrawableColor(context, R.drawable.ic_translate,R.color.mastodonC1);
}else {
changeDrawableColor(context, R.drawable.ic_fetch_more,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_reply,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_more_horiz,R.color.light_black);
changeDrawableColor(context, holder.status_more, R.color.light_black);
changeDrawableColor(context, holder.status_privacy, R.color.light_black);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_plus_one,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.light_black);
changeDrawableColor(context, R.drawable.ic_fetch_more,R.color.action_light);
changeDrawableColor(context, R.drawable.ic_reply,R.color.action_light);
changeDrawableColor(context, R.drawable.ic_more_horiz,R.color.action_light);
changeDrawableColor(context, holder.status_more, R.color.action_light);
changeDrawableColor(context, holder.status_privacy, R.color.action_light);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.action_light);
changeDrawableColor(context, R.drawable.ic_plus_one,R.color.action_light);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.action_light);
changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_light);
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.action_light));
changeDrawableColor(context, R.drawable.ic_photo,R.color.mastodonC4);
changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.mastodonC4);
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_reply.setTextColor(ContextCompat.getColor(context, R.color.light_black));
changeDrawableColor(context, R.drawable.ic_repeat_head_toot,R.color.light_black);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.light_black));
holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.light_black));
@ -790,7 +799,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
int matchEnd = matcherAcct.end();
if( wordtoSpan.length() >= matchEnd && matchStart < matchEnd){
if( theme == THEME_LIGHT)
wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.dark_icon)), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.action_light_header)), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
else if( theme == THEME_DARK)
wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.dark_text_toot_header)), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
else if( theme == THEME_BLACK)
@ -1117,10 +1126,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, R.drawable.ic_star,R.color.marked_icon);
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_star);
}else {
if( theme == THEME_DARK || theme == THEME_BLACK)
changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_star_border,R.color.action_dark);
else if(theme == THEME_BLACK)
changeDrawableColor(context, R.drawable.ic_star_border,R.color.action_black);
else
changeDrawableColor(context, R.drawable.ic_star_border,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_star_border,R.color.action_light);
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_star_border);
}
@ -1128,18 +1139,22 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
changeDrawableColor(context, R.drawable.ic_repeat_boost,R.color.boost_icon);
imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_repeat_boost);
}else {
if( theme == THEME_DARK || theme == THEME_BLACK)
changeDrawableColor(context, R.drawable.ic_repeat,R.color.dark_icon);
if( theme == THEME_DARK )
changeDrawableColor(context, R.drawable.ic_repeat,R.color.action_dark);
else if(theme == THEME_BLACK)
changeDrawableColor(context, R.drawable.ic_repeat,R.color.action_black);
else
changeDrawableColor(context, R.drawable.ic_repeat,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_repeat,R.color.action_light);
imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_repeat);
}
if( theme == THEME_DARK || theme == THEME_BLACK)
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_reply,R.color.action_dark);
else if(theme == THEME_BLACK)
changeDrawableColor(context, R.drawable.ic_reply,R.color.action_black);
else
changeDrawableColor(context, R.drawable.ic_reply,R.color.light_black);
changeDrawableColor(context, R.drawable.ic_reply,R.color.action_light);
imgReply = ContextCompat.getDrawable(context, R.drawable.ic_reply);

2
app/src/main/res/drawable/card_border.xml
View File

@ -3,7 +3,7 @@
<solid android:color="@color/transparent"/>
<stroke android:width="1dp"
android:color="@color/notif_dark_3"
android:color="?attr/cardBorder"
/>
<corners android:bottomRightRadius="3dp" android:bottomLeftRadius="3dp"

15
app/src/main/res/values/colors.xml
View File

@ -81,4 +81,19 @@
<color name="verified_text">#79bd9a</color>
<color name="verified_background">#5579bd9a</color>
<!-- Action icon at the bottom -->
<color name="action_light">#617684</color>
<color name="action_dark">#d9d9d9</color>
<color name="action_black">#d9d9d9</color>
<!-- Header boosted/header -->
<color name="action_light_header">#617684</color>
<!-- Card border -->
<color name="cardBorderLight">#393f4f</color>
<color name="cardBorderDark">#393f4f</color>
<color name="cardBorderBlack">#d9d9d9</color>
</resources>

7
app/src/main/res/values/styles.xml
View File

@ -9,6 +9,7 @@
<attr format="reference" name="borderless"/>
<attr format="reference" name="borderlessColored"/>
<attr format="color" name="textColor"/>
<attr format="color" name="cardBorder"/>
<!-- Light theme -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@ -16,6 +17,7 @@
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="cardBorder">@color/cardBorderLight</item>
<item name="textColor">@color/black</item>
<item name="android:buttonStyle">@style/ButtonColor</item>
<item name="headerbg">@style/Header.Light</item>
@ -53,6 +55,7 @@
<item name="android:textColor">@color/light_black</item>
<item name="android:scrollbarThumbVertical">@color/transparent</item>
<item name="colorPrimary">@color/white</item>
<item name="cardBorder">@color/cardBorderLight</item>
<item name="textColor">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/mastodonC4</item>
@ -161,6 +164,7 @@
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/dark_icon</item>
<item name="cardBorder">@color/cardBorderBlack</item>
<item name="textColor">@color/light_grey</item>
<item name="android:buttonStyle">@style/BlackButtonColor</item>
<item name="headerbg">@style/Header.Black</item>
@ -189,6 +193,7 @@
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/dark_icon</item>
<item name="cardBorder">@color/cardBorderBlack</item>
<item name="textColor">@color/light_grey</item>
<item name="android:buttonStyle">@style/BlackButtonColor</item>
<item name="headerbg">@style/Header.Black</item>
@ -278,6 +283,7 @@
<item name="textColor">@color/light_grey</item>
<item name="android:buttonStyle">@style/DarkButtonColor</item>
<item name="headerbg">@style/Header.Dark</item>
<item name="cardBorder">@color/cardBorderDark</item>
<item name="android:windowBackground">@color/mastodonC1</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
@ -305,6 +311,7 @@
<item name="colorAccent">@color/mastodonC4</item>
<item name="textColor">@color/light_grey</item>
<item name="android:buttonStyle">@style/DarkButtonColor</item>
<item name="cardBorder">@color/cardBorderDark</item>
<item name="headerbg">@style/Header.Dark</item>
<item name="android:windowBackground">@color/mastodonC1</item>
<item name="borderless">@style/borderLessLightStyle</item>