sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Display comment after entry in grade notifications (#1741)

Browse Source
This commit is contained in:
Mikołaj Pich 2021-12-31 12:36:14 +01:00 committed by GitHub
parent 20673c4ead
commit a03bcf8e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
View File

@ -22,7 +22,10 @@ class NewGradeNotification @Inject constructor(
val notificationDataList = items.map { val notificationDataList = items.map {
NotificationData( NotificationData(
title = context.getPlural(R.plurals.grade_new_items, 1), 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), intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
) )
} }

6
app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt
View File

@ -5,7 +5,7 @@ import java.time.LocalDate
val debugGradeDetailsItems = listOf( val debugGradeDetailsItems = listOf(
generateGrade("Matematyka", "+"), generateGrade("Matematyka", "+"),
generateGrade("Matematyka", "2="), generateGrade("Matematyka", "120", comment = "%"),
generateGrade("Fizyka", "-"), generateGrade("Fizyka", "-"),
generateGrade("Geografia", "4+"), generateGrade("Geografia", "4+"),
generateGrade("Sieci komputerowe", "1"), generateGrade("Sieci komputerowe", "1"),
@ -17,14 +17,14 @@ val debugGradeDetailsItems = listOf(
generateGrade("Wychowanie fizyczne", "5"), generateGrade("Wychowanie fizyczne", "5"),
) )
private fun generateGrade(subject: String, entry: String) = Grade( private fun generateGrade(subject: String, entry: String, comment: String = "") = Grade(
subject = subject, subject = subject,
entry = entry, entry = entry,
semesterId = 0, semesterId = 0,
studentId = 0, studentId = 0,
value = 0.0, value = 0.0,
modifier = 0.0, modifier = 0.0,
comment = "", comment = comment,
color = "", color = "",
gradeSymbol = "", gradeSymbol = "",
description = "", description = "",