letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Rename const for clarity and convention

Browse Source
This commit is contained in:
Benoit Marty
2024-11-22 14:04:21 +01:00
parent 90fd10329f
commit 1049a1584a
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt
View File

@@ -14,17 +14,17 @@ object NotificationConfig {
/** /**
* If set to true, the notification will have a "Mark as read" action. * If set to true, the notification will have a "Mark as read" action.
*/ */
const val SUPPORT_MARK_AS_READ_ACTION = true const val SHOW_MARK_AS_READ_ACTION = true
/** /**
* If set to true, the notification for invitation will have two actions to accept or decline the invite. * If set to true, the notification for invitation will have two actions to accept or decline the invite.
*/ */
const val SUPPORT_JOIN_DECLINE_INVITE = true const val SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS = true
/** /**
* If set to true, the notification will have a "Quick reply" action, allow to compose and send a message to the room. * If set to true, the notification will have a "Quick reply" action, allow to compose and send a message to the room.
*/ */
const val SUPPORT_QUICK_REPLY_ACTION = true const val SHOW_QUICK_REPLY_ACTION = true
@ColorInt @ColorInt
val NOTIFICATION_ACCENT_COLOR: Int = Color.parseColor("#FF0DBD8B") val NOTIFICATION_ACCENT_COLOR: Int = Color.parseColor("#FF0DBD8B")

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
View File

@@ -230,7 +230,7 @@ class DefaultNotificationCreator @Inject constructor(
.setSmallIcon(smallIcon) .setSmallIcon(smallIcon)
.setColor(accentColor) .setColor(accentColor)
.apply { .apply {
if (NotificationConfig.SUPPORT_JOIN_DECLINE_INVITE) { if (NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS) {
addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent)) addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))
addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent)) addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))
} }

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt
View File

@@ -29,7 +29,7 @@ class MarkAsReadActionFactory @Inject constructor(
private val clock: SystemClock, private val clock: SystemClock,
) { ) {
fun create(roomInfo: RoomEventGroupInfo): NotificationCompat.Action? { fun create(roomInfo: RoomEventGroupInfo): NotificationCompat.Action? {
if (!NotificationConfig.SUPPORT_MARK_AS_READ_ACTION) return null if (!NotificationConfig.SHOW_MARK_AS_READ_ACTION) return null
val sessionId = roomInfo.sessionId.value val sessionId = roomInfo.sessionId.value
val roomId = roomInfo.roomId.value val roomId = roomInfo.roomId.value
val intent = Intent(context, NotificationBroadcastReceiver::class.java) val intent = Intent(context, NotificationBroadcastReceiver::class.java)

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt
View File

@@ -34,7 +34,7 @@ class QuickReplyActionFactory @Inject constructor(
private val clock: SystemClock, private val clock: SystemClock,
) { ) {
fun create(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): NotificationCompat.Action? { fun create(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): NotificationCompat.Action? {
if (!NotificationConfig.SUPPORT_QUICK_REPLY_ACTION) return null if (!NotificationConfig.SHOW_QUICK_REPLY_ACTION) return null
val sessionId = roomInfo.sessionId val sessionId = roomInfo.sessionId
val roomId = roomInfo.roomId val roomId = roomInfo.roomId
val replyPendingIntent = buildQuickReplyIntent(sessionId, roomId, threadId) val replyPendingIntent = buildQuickReplyIntent(sessionId, roomId, threadId)

6
libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt
View File

@@ -162,8 +162,8 @@ class DefaultRoomGroupMessageCreatorTest {
val actionTitles = result.actions?.map { it.title } val actionTitles = result.actions?.map { it.title }
assertThat(actionTitles).isEqualTo( assertThat(actionTitles).isEqualTo(
listOfNotNull( listOfNotNull(
markAsReadActionTitle.takeIf { NotificationConfig.SUPPORT_MARK_AS_READ_ACTION }, markAsReadActionTitle.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION },
quickReplyActionTitle.takeIf { NotificationConfig.SUPPORT_QUICK_REPLY_ACTION }, quickReplyActionTitle.takeIf { NotificationConfig.SHOW_QUICK_REPLY_ACTION },
) )
) )
assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0) assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
@@ -188,7 +188,7 @@ class DefaultRoomGroupMessageCreatorTest {
val actionTitles = result.actions?.map { it.title } val actionTitles = result.actions?.map { it.title }
assertThat(actionTitles).isEqualTo( assertThat(actionTitles).isEqualTo(
listOfNotNull( listOfNotNull(
markAsReadActionTitle.takeIf { NotificationConfig.SUPPORT_MARK_AS_READ_ACTION } markAsReadActionTitle.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION }
) )
) )
assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0) assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)