oo, another half-baked patch!

This commit is contained in:
notfire 2024-10-25 21:01:39 -04:00
parent 7aa7a16eb2
commit 81c2e931b0
Signed by: notfire
GPG key ID: 3AFDACAAB4E56B16

View file

@ -0,0 +1,46 @@
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
index 3353eea9c..06bd13619 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
@@ -65,7 +65,9 @@ public class Notification extends BaseModel implements DisplayItemsParent{
@SerializedName("admin.sign_up")
SIGN_UP,
@SerializedName("admin.report")
- REPORT
+ REPORT,
+ @SerializedName("bite")
+ BITE
}
@Parcel
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
index bb90911fd..e8ade22a4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
@@ -75,6 +75,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
case REPORT -> R.string.sk_reported;
case REACTION, PLEROMA_EMOJI_REACTION ->
!TextUtils.isEmpty(notification.emoji) ? R.string.sk_reacted_with : R.string.sk_reacted;
+ case BITE -> R.string.sk_bit_you;
default -> throw new IllegalStateException("Unexpected value: "+notification.type);
});
@@ -170,6 +171,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
case SIGN_UP -> R.drawable.ic_fluent_person_available_24_filled;
case UPDATE -> R.drawable.ic_fluent_edit_24_filled;
case REACTION, PLEROMA_EMOJI_REACTION -> R.drawable.ic_fluent_add_24_filled;
+ case BITE -> R.drawable.ic_fluent_animal_cat_24_regular;
default -> throw new IllegalStateException("Unexpected value: "+item.notification.type);
});
icon.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(item.parentFragment.getActivity(), switch(item.notification.type){
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 9795f7cc9..097816027 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -438,4 +438,5 @@
<string name="sk_poll_multiple_choice">Multiple choices</string>
<string name="sk_poll_show_results">Show results</string>
<string name="sk_poll_hide_results">Hide results</string>
+ <string name="sk_bit_you">%s bit you</string>
</resources>