Fix new events notification bug

brave-people · Jul 10, 2021 · dfc06dd · dfc06dd
1 parent 23ac9a8
commit dfc06dd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/app/src/main/kotlin/team/bravepeople/devevent/receiver/EventReloadReceiver.kt b/app/src/main/kotlin/team/bravepeople/devevent/receiver/EventReloadReceiver.kt
@@ -68,19 +68,31 @@ class EventReloadReceiver : BroadcastReceiver() {
                                 }
                             }
                             val diffEventNames = diffEvents.map { it.name }
-                            NotificationUtil.showInboxStyleNotification(
-                                context = context,
-                                id = Random.nextInt(),
-                                channelId = getString(R.string.notification_channel_name),
-                                title = getString(R.string.receiver_notification_title_new_event),
-                                content = getString(
-                                    R.string.receiver_notification_new_events_size,
-                                    diffEventNames.size
-                                ),
-                                boxText = diffEventNames,
-                                icon = R.drawable.ic_round_event_note_24,
-                                isOnGoing = false
-                            )
+                            if (diffEventNames.isEmpty()) {
+                                NotificationUtil.showNormalNotification(
+                                    context = context,
+                                    id = Random.nextInt(),
+                                    channelId = getString(R.string.notification_channel_name),
+                                    title = getString(R.string.receiver_notification_title_new_event),
+                                    content = getString(R.string.receiver_notification_non_new_events),
+                                    icon = R.drawable.ic_round_event_note_24,
+                                    isOnGoing = false
+                                )
+                            } else {
+                                NotificationUtil.showInboxStyleNotification(
+                                    context = context,
+                                    id = Random.nextInt(),
+                                    channelId = getString(R.string.notification_channel_name),
+                                    title = getString(R.string.receiver_notification_title_new_event),
+                                    content = getString(
+                                        R.string.receiver_notification_new_events_size,
+                                        diffEventNames.size
+                                    ),
+                                    boxText = diffEventNames,
+                                    icon = R.drawable.ic_round_event_note_24,
+                                    isOnGoing = false
+                                )
+                            }
                         }
                     }
                     is EventRepoResult.Error -> {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -52,4 +52,5 @@
     <string name="receiver_notification_title_new_event">새로운 이벤트가 도착했어요 \uD83C\uDF89</string>
     <string name="receiver_notification_new_events_size">총 %d개가 새로 생겼어요</string>
     <string name="receiver_notification_error_when_reload_events">이벤트 갱신중 오류가 발생했어요 \uD83D\uDE22</string>
+    <string name="receiver_notification_non_new_events">새로운 이벤트가 없어요</string>
 </resources>
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -14,8 +14,8 @@ object Application {
     const val targetSdk = 30
     const val compileSdk = 30
     const val jvmTarget = "1.8"
-    const val versionCode = 7
-    const val versionName = "1.0.2"
+    const val versionCode = 8
+    const val versionName = "1.0.3"
 
     val targetCompat = JavaVersion.VERSION_11
     val sourceCompat = JavaVersion.VERSION_11