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 f1f4de097..3587e6e28 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 @@ -171,7 +171,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio String type = notification.getType(); String typeString = ""; int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - + Drawable imgH = null; switch (type){ case "mention": holder.status_action_container.setVisibility(View.VISIBLE); @@ -184,6 +184,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio }else { holder.card_status_container.setCardBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_1)); } + imgH = null; break; case "reblog": holder.status_action_container.setVisibility(View.GONE); @@ -196,6 +197,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio }else { holder.card_status_container.setCardBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_2)); } + imgH = ContextCompat.getDrawable(context, R.drawable.ic_retweet_notif_header); break; case "favourite": holder.status_action_container.setVisibility(View.GONE); @@ -208,6 +210,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio }else { holder.card_status_container.setCardBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_3)); } + imgH = ContextCompat.getDrawable(context, R.drawable.ic_fav_notif_header); break; case "follow": holder.status_action_container.setVisibility(View.GONE); @@ -220,10 +223,19 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio }else { holder.card_status_container.setCardBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_4)); } + imgH = ContextCompat.getDrawable(context, R.drawable.ic_follow_notif_header); break; } - + changeDrawableColor(context, R.drawable.ic_retweet_notif_header,R.color.mastodonC4); + changeDrawableColor(context, R.drawable.ic_fav_notif_header,R.color.mastodonC4); + changeDrawableColor(context, R.drawable.ic_follow_notif_header,R.color.mastodonC4); holder.notification_type.setText(typeString); + if( imgH != null) { + holder.notification_type.setCompoundDrawablePadding((int)Helper.convertDpToPixel(5, context)); + imgH.setBounds(0, 0, (int) (20 * iconSizePercent / 100 * scale + 0.5f), (int) (20 * iconSizePercent / 100 * scale + 0.5f)); + } + holder.notification_type.setCompoundDrawables( imgH, null, null, null); + holder.status_privacy.getLayoutParams().height = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context); holder.status_privacy.getLayoutParams().width = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context); holder.status_reply.getLayoutParams().height = (int) Helper.convertDpToPixel((20*iconSizePercent/100), context); diff --git a/app/src/main/res/drawable-hdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-hdpi/ic_fav_notif_header.png new file mode 100644 index 000000000..0e8c7e9a1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_fav_notif_header.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_follow_notif_header.png b/app/src/main/res/drawable-hdpi/ic_follow_notif_header.png new file mode 100644 index 000000000..46cfb9fe8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_follow_notif_header.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_retweet_notif_header.png b/app/src/main/res/drawable-hdpi/ic_retweet_notif_header.png new file mode 100644 index 000000000..8aa0ff8dd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_retweet_notif_header.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_fav_notif_header.png b/app/src/main/res/drawable-ldpi/ic_fav_notif_header.png new file mode 100644 index 000000000..b69764624 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_fav_notif_header.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_follow_notif_header.png b/app/src/main/res/drawable-ldpi/ic_follow_notif_header.png new file mode 100644 index 000000000..805a8d518 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_follow_notif_header.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_retweet_notif_header.png b/app/src/main/res/drawable-ldpi/ic_retweet_notif_header.png new file mode 100644 index 000000000..5ec2cfb26 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_retweet_notif_header.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-mdpi/ic_fav_notif_header.png new file mode 100644 index 000000000..8b4b7ec79 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_fav_notif_header.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_follow_notif_header.png b/app/src/main/res/drawable-mdpi/ic_follow_notif_header.png new file mode 100644 index 000000000..3f6c75c56 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_follow_notif_header.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_retweet_notif_header.png b/app/src/main/res/drawable-mdpi/ic_retweet_notif_header.png new file mode 100644 index 000000000..d12a55f15 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_retweet_notif_header.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-xhdpi/ic_fav_notif_header.png new file mode 100644 index 000000000..71d0bfab0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_fav_notif_header.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_notif_header.png b/app/src/main/res/drawable-xhdpi/ic_follow_notif_header.png new file mode 100644 index 000000000..77c482e5b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_follow_notif_header.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_retweet_notif_header.png b/app/src/main/res/drawable-xhdpi/ic_retweet_notif_header.png new file mode 100644 index 000000000..79c8052c9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_retweet_notif_header.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-xxhdpi/ic_fav_notif_header.png new file mode 100644 index 000000000..70f761c8d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_fav_notif_header.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_notif_header.png b/app/src/main/res/drawable-xxhdpi/ic_follow_notif_header.png new file mode 100644 index 000000000..e1f60cc22 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_follow_notif_header.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_retweet_notif_header.png b/app/src/main/res/drawable-xxhdpi/ic_retweet_notif_header.png new file mode 100644 index 000000000..0fc18c78a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_retweet_notif_header.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-xxxhdpi/ic_fav_notif_header.png new file mode 100644 index 000000000..154f6c446 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_fav_notif_header.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_notif_header.png b/app/src/main/res/drawable-xxxhdpi/ic_follow_notif_header.png new file mode 100644 index 000000000..ffa613901 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_follow_notif_header.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_retweet.png b/app/src/main/res/drawable-xxxhdpi/ic_retweet_notif_header.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_retweet.png rename to app/src/main/res/drawable-xxxhdpi/ic_retweet_notif_header.png diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 389a9820c..93a9ea743 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -136,7 +136,7 @@ #282c37 #313543 #393f4f - #595f6f + #494f5f #efefef #ebf3fa