Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'main' into jvm-alt

Simon Marquise629d5e4bfb3
diff --cc core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
index 38d905ad1,1c9e7ab63..5da88102a
--- a/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
+++ b/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
@@@ -65,20 -61,20 +61,18 @@@ internal class SystemTrayNotifier @Inje
return
}
- val truncatedNewsResources = newsResources
- .take(MAX_NUM_NOTIFICATIONS)
+ val truncatedNewsResources = newsResources.take(MAX_NUM_NOTIFICATIONS)
- val newsNotifications = truncatedNewsResources
- .map { newsResource ->
- createNewsNotification {
- setSmallIcon(R.drawable.core_notifications_ic_nia_notification)
- .setContentTitle(newsResource.title)
- .setContentText(newsResource.content)
- .setContentIntent(newsPendingIntent(newsResource))
- .setGroup(NEWS_NOTIFICATION_GROUP)
- .setAutoCancel(true)
- }
+ val newsNotifications = truncatedNewsResources.map { newsResource ->
+ createNewsNotification {
- setSmallIcon(
- com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
- )
++ setSmallIcon(R.drawable.core_notifications_ic_nia_notification)
+ .setContentTitle(newsResource.title)
+ .setContentText(newsResource.content)
+ .setContentIntent(newsPendingIntent(newsResource))
+ .setGroup(NEWS_NOTIFICATION_GROUP)
+ .setAutoCancel(true)
}
+ }
val summaryNotification = createNewsNotification {
val title = getString(
R.string.core_notifications_news_notification_group_summary,