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

Changes some colors

This commit is contained in:
tom79 2017-10-15 10:24:38 +02:00
parent 7bf58eead8
commit 4cabc66d7b
5 changed files with 78 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
View File

@ -972,17 +972,17 @@ public class MainActivity extends AppCompatActivity
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_icon);
}else {
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black);

38
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -255,17 +255,17 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
//Manages theme for icon colors
if( theme == Helper.THEME_DARK){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text);
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_delete,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_delete,R.color.dark_icon);
}else {
changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.black);
@ -338,22 +338,22 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
Drawable imgFav, imgReblog;
if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) {
changeDrawableColor(context, R.drawable.ic_favorite,R.color.yellowicon);
changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon);
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite);
}else {
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
else
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite_border);
}
if( status.isReblogged()|| (status.getReblog() != null && status.getReblog().isReblogged())) {
changeDrawableColor(context, R.drawable.ic_boost,R.color.yellowicon);
changeDrawableColor(context, R.drawable.ic_boost,R.color.marked_icon);
imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost);
}else {
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
else
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black);
imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost_border);
@ -363,7 +363,13 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
imgReblog.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
holder.status_favorite_count.setCompoundDrawables(imgFav, null, null, null);
holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null);
if( theme == THEME_DARK){
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
}else {
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black));
}
if( status.getReblog() == null) {
if (status.getMedia_attachments().size() < 1) {

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

@ -349,19 +349,19 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
//Manages theme for icon colors
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_text);
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_translate,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_translate,R.color.dark_icon);
}else {
changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.black);
@ -392,7 +392,13 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
holder.status_account_displayname.setCompoundDrawables( null, null, null, null);
}
if( theme == THEME_DARK){
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
}else {
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black));
}
String content;
final String displayName;
@ -614,31 +620,37 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
Drawable imgFav, imgReblog, imgPinned;
if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) {
changeDrawableColor(context, R.drawable.ic_favorite,R.color.yellowicon);
changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon);
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite);
}else {
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
else
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite_border);
}
if( status.isReblogged()|| (status.getReblog() != null && status.getReblog().isReblogged())) {
changeDrawableColor(context, R.drawable.ic_boost,R.color.yellowicon);
changeDrawableColor(context, R.drawable.ic_boost,R.color.marked_icon);
imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost);
}else {
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
else
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black);
imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost_border);
}
if( status.isPinned()|| (status.getReblog() != null && status.getReblog().isPinned()))
if( status.isPinned()|| (status.getReblog() != null && status.getReblog().isPinned())) {
changeDrawableColor(context, R.drawable.ic_action_pin_yellow,R.color.marked_icon);
imgPinned = ContextCompat.getDrawable(context, R.drawable.ic_action_pin_yellow);
else
}else {
if( theme == THEME_DARK)
changeDrawableColor(context, R.drawable.ic_action_pin_dark,R.color.dark_icon);
else
changeDrawableColor(context, R.drawable.ic_action_pin_dark,R.color.black);
imgPinned = ContextCompat.getDrawable(context, R.drawable.ic_action_pin_dark);
}
imgFav.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
imgReblog.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));

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

@ -20,6 +20,8 @@
<color name="header3D">#607D8B</color>
<color name="dark_text">#f3f3f3</color>
<color name="dark_icon">#66708a</color>
<color name="marked_icon">#ca8f04</color>
<color name="transparent">#00000000</color>
@ -29,8 +31,6 @@
<color name="white">#FFF</color>
<color name="blue_light">#C5CAE9</color>
<color name="light_grey">#E0E0E0</color>
<color name="darkicon">#424242</color>
<color name="yellowicon">#FDD835</color>
<color name="background_image">#282c37</color>

22
app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
View File

@ -980,17 +980,17 @@ public class MainActivity extends AppCompatActivity
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_icon);
}else {
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black);