diff --git a/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt b/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt index 7adcb533..9d75a9fa 100644 --- a/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt @@ -87,7 +87,8 @@ class NotificationsFragment : CachedFeedFragment() { val intent: Intent = when (type) { Notification.NotificationType.mention, Notification.NotificationType.favourite, - Notification.NotificationType.poll, Notification.NotificationType.reblog -> { + Notification.NotificationType.poll, Notification.NotificationType.reblog, + Notification.NotificationType.comment -> { openPostFromNotification() } Notification.NotificationType.follow -> { @@ -113,39 +114,38 @@ class NotificationsFragment : CachedFeedFragment() { ) { val context = textView.context val (format: String, drawable: Drawable?) = when (type) { - Notification.NotificationType.follow -> { + Notification.NotificationType.follow -> getStringAndDrawable( context, R.string.followed_notification, R.drawable.ic_follow ) - } - Notification.NotificationType.mention -> { + Notification.NotificationType.mention -> getStringAndDrawable( context, R.string.mention_notification, R.drawable.mention_at_24dp ) - } - - Notification.NotificationType.reblog -> { + Notification.NotificationType.comment -> + getStringAndDrawable( + context, + R.string.comment_notification, + R.drawable.ic_comment_empty + ) + Notification.NotificationType.reblog -> getStringAndDrawable( context, R.string.shared_notification, R.drawable.ic_reblog_blue ) - } - - Notification.NotificationType.favourite -> { + Notification.NotificationType.favourite -> getStringAndDrawable( context, R.string.liked_notification, R.drawable.ic_like_full ) - } - Notification.NotificationType.poll -> { + Notification.NotificationType.poll -> getStringAndDrawable(context, R.string.poll_notification, R.drawable.poll) - } } textView.text = format.format(username) textView.setCompoundDrawablesWithIntrinsicBounds( diff --git a/app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt index 03b3dacc..94b73733 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt @@ -38,6 +38,6 @@ data class Notification( override var instance_uri: String, ): FeedContent, FeedContentDatabase { enum class NotificationType: Serializable { - follow, mention, reblog, favourite, poll + follow, mention, reblog, favourite, poll, comment } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 34cacd40..65c565cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,6 +50,12 @@ "%1$s's poll has ended" + + %1$s commented on your post + + + "Notification from %1$s" + "What's an instance?" "You might be confused by the text field asking for the domain of your 'instance'.