Mastodon/mastodon-app-ufficiale-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add update notifications (AND-173)

Browse Source
This commit is contained in:
Grishka 2024-09-21 09:22:41 +03:00
parent 18b5c8ed50
commit de83c1ea96
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/model/NotificationType.java
View File

@ -18,7 +18,9 @@ public enum NotificationType{
@SerializedName("poll") @SerializedName("poll")
POLL, POLL,
@SerializedName("status") @SerializedName("status")
STATUS; STATUS,
@SerializedName("update")
UPDATE;
public boolean canBeGrouped(){ public boolean canBeGrouped(){
return this==REBLOG || this==FAVORITE; return this==REBLOG || this==FAVORITE;

7
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
View File

@ -88,6 +88,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
case FOLLOW_REQUEST -> R.string.user_sent_follow_request; case FOLLOW_REQUEST -> R.string.user_sent_follow_request;
case REBLOG -> R.string.notification_boosted; case REBLOG -> R.string.notification_boosted;
case FAVORITE -> R.string.user_favorited; case FAVORITE -> R.string.user_favorited;
case UPDATE -> R.string.user_edited_post;
default -> throw new IllegalStateException("Unexpected value: "+notification.notification.type); default -> throw new IllegalStateException("Unexpected value: "+notification.notification.type);
}, "{{name}}"); }, "{{name}}");
} }
@ -181,8 +182,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
@Override @Override
public void onBind(NotificationHeaderStatusDisplayItem item){ public void onBind(NotificationHeaderStatusDisplayItem item){
text.setText(item.text); text.setText(item.text);
// avatar.setVisibility(item.notification.notification.type==NotificationType.POLL ? View.GONE : View.VISIBLE); if(item.notification.notification.type==NotificationType.POLL || item.notification.notification.type==NotificationType.UPDATE){
if(item.notification.notification.type==NotificationType.POLL){
avatarsContainer.setVisibility(View.GONE); avatarsContainer.setVisibility(View.GONE);
}else{ }else{
avatarsContainer.setVisibility(View.VISIBLE); avatarsContainer.setVisibility(View.VISIBLE);
@ -200,12 +200,13 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
case REBLOG -> R.drawable.ic_repeat_fill1_24px; case REBLOG -> R.drawable.ic_repeat_fill1_24px;
case FOLLOW, FOLLOW_REQUEST -> R.drawable.ic_person_add_fill1_24px; case FOLLOW, FOLLOW_REQUEST -> R.drawable.ic_person_add_fill1_24px;
case POLL -> R.drawable.ic_insert_chart_fill1_24px; case POLL -> R.drawable.ic_insert_chart_fill1_24px;
case UPDATE -> R.drawable.ic_edit_24px;
default -> throw new IllegalStateException("Unexpected value: "+item.notification.notification.type); default -> throw new IllegalStateException("Unexpected value: "+item.notification.notification.type);
}); });
icon.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(item.parentFragment.getActivity(), switch(item.notification.notification.type){ icon.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(item.parentFragment.getActivity(), switch(item.notification.notification.type){
case FAVORITE -> R.attr.colorFavorite; case FAVORITE -> R.attr.colorFavorite;
case REBLOG -> R.attr.colorBoost; case REBLOG -> R.attr.colorBoost;
case FOLLOW, FOLLOW_REQUEST -> R.attr.colorM3Primary; case FOLLOW, FOLLOW_REQUEST, UPDATE -> R.attr.colorM3Primary;
default -> R.attr.colorM3Outline; default -> R.attr.colorM3Outline;
}))); })));
itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.notification.status==null ? V.dp(12) : 0); itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.notification.status==null ? V.dp(12) : 0);

1
mastodon/src/main/res/values/strings.xml
View File

@ -797,4 +797,5 @@
</plurals> </plurals>
<string name="own_poll_ended">Your poll has ended</string> <string name="own_poll_ended">Your poll has ended</string>
<string name="user_just_posted">%s just posted</string> <string name="user_just_posted">%s just posted</string>
<string name="user_edited_post">%s edited a post you interacted with</string>
</resources> </resources>