From a03bcf8e62a06295d22216e473a8247269b36fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 31 Dec 2021 12:36:14 +0100
Subject: [PATCH] Display comment after entry in grade notifications (#1741)

---
 .../services/sync/notifications/NewGradeNotification.kt     | 5 ++++-
 .../ui/modules/debug/notification/mock/gradeDetails.kt      | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
index 39ecbe33d..32d2ba6a0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
@@ -22,7 +22,10 @@ class NewGradeNotification @Inject constructor(
         val notificationDataList = items.map {
             NotificationData(
                 title = context.getPlural(R.plurals.grade_new_items, 1),
-                content = "${it.subject}: ${it.entry}",
+                content = buildString {
+                    append("${it.subject}: ${it.entry}")
+                    if (it.comment.isNotBlank()) append(" (${it.comment})")
+                },
                 intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
             )
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt
index f9c481e39..77b60188b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt
@@ -5,7 +5,7 @@ import java.time.LocalDate
 
 val debugGradeDetailsItems = listOf(
     generateGrade("Matematyka", "+"),
-    generateGrade("Matematyka", "2="),
+    generateGrade("Matematyka", "120", comment = "%"),
     generateGrade("Fizyka", "-"),
     generateGrade("Geografia", "4+"),
     generateGrade("Sieci komputerowe", "1"),
@@ -17,14 +17,14 @@ val debugGradeDetailsItems = listOf(
     generateGrade("Wychowanie fizyczne", "5"),
 )
 
-private fun generateGrade(subject: String, entry: String) = Grade(
+private fun generateGrade(subject: String, entry: String, comment: String = "") = Grade(
     subject = subject,
     entry = entry,
     semesterId = 0,
     studentId = 0,
     value = 0.0,
     modifier = 0.0,
-    comment = "",
+    comment = comment,
     color = "",
     gradeSymbol = "",
     description = "",