diff --git a/Habitica/res/drawable/badge_gray.xml b/Habitica/res/drawable/badge_gray.xml
new file mode 100644
index 000000000..b350748be
--- /dev/null
+++ b/Habitica/res/drawable/badge_gray.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index af76a967a..7cca95d2b 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -1,34 +1,35 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context=".ui.activities.NotificationsActivity">
-
+
+
+ android:layout_height="wrap_content"
+ android:minHeight="?attr/actionBarSize"
+ android:theme="@style/Toolbar"
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Dark" />
-
+
-
-
+
+
+
-
+ android:orientation="vertical"
+ android:showDividers="middle">
-
\ No newline at end of file
+
diff --git a/Habitica/res/layout/no_notifications.xml b/Habitica/res/layout/no_notifications.xml
index 55e30f61b..9cc429f9c 100644
--- a/Habitica/res/layout/no_notifications.xml
+++ b/Habitica/res/layout/no_notifications.xml
@@ -1,9 +1,8 @@
+ android:paddingLeft="40dp"
+ android:paddingTop="26dp"
+ android:paddingRight="40dp">
-
\ No newline at end of file
+
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
new file mode 100644
index 000000000..8e96795c5
--- /dev/null
+++ b/Habitica/res/layout/notifications_header.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index fe2ad50db..0f12a9006 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -862,6 +862,7 @@
Important Announcements
You’re all caught up!
The notification fairies give you a raucous round of applause! Well done!
+ Dismiss All
Create
Only leader can create Challenges
Create Party
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index 85b522978..1d6803dd3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.activities
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
+import android.widget.TextView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.data.UserRepository
@@ -66,11 +67,16 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
val inflater = getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
if (notifications.isEmpty()) {
- val item = inflater?.inflate(R.layout.no_notifications, notification_items, false)
- notification_items.addView(item)
+ val no_notifications = inflater?.inflate(R.layout.no_notifications, notification_items, false)
+ notification_items.addView(no_notifications)
return
}
+ val header = inflater?.inflate(R.layout.notifications_header, notification_items, false)
+ val badge = header?.findViewById(R.id.notificationsTitleBadge) as? TextView
+ badge?.setText(notifications.count().toString())
+ notification_items.addView(header)
+
//TODO("not implemented")
}
}