mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Remove notificationMode to userDefinedNotificationMode to match SDK name.
This commit is contained in:
committed by
Benoit Marty
parent
ecb000b8ed
commit
782f73fb7c
+1
-1
@@ -56,6 +56,6 @@ private fun aRoomSummary() = RoomSummary.Filled(
|
|||||||
isDirect = false,
|
isDirect = false,
|
||||||
lastMessage = null,
|
lastMessage = null,
|
||||||
unreadNotificationCount = 0,
|
unreadNotificationCount = 0,
|
||||||
notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
|
userDefinedNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -84,7 +84,7 @@ fun EditDefaultNotificationSettingView(
|
|||||||
if (state.roomsWithUserDefinedMode.isNotEmpty()) {
|
if (state.roomsWithUserDefinedMode.isNotEmpty()) {
|
||||||
PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_edit_custom_settings_section_title)) {
|
PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_edit_custom_settings_section_title)) {
|
||||||
state.roomsWithUserDefinedMode.forEach { summary ->
|
state.roomsWithUserDefinedMode.forEach { summary ->
|
||||||
val subtitle = when (summary.details.notificationMode) {
|
val subtitle = when (summary.details.userDefinedNotificationMode) {
|
||||||
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
|
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
|
||||||
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
|
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
|
||||||
stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
|
stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
|
||||||
|
|||||||
+2
-2
@@ -74,9 +74,9 @@ class EditDefaultNotificationSettingsPresenterTests {
|
|||||||
}.test {
|
}.test {
|
||||||
roomListService.postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
|
roomListService.postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
|
||||||
val loadedState = consumeItemsUntilPredicate { state ->
|
val loadedState = consumeItemsUntilPredicate { state ->
|
||||||
state.roomsWithUserDefinedMode.any { it.details.notificationMode == RoomNotificationMode.ALL_MESSAGES }
|
state.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }
|
||||||
}.last()
|
}.last()
|
||||||
assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.notificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
|
assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -191,7 +191,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
|
|||||||
@Composable
|
@Composable
|
||||||
private fun NotificationIcon(room: RoomListRoomSummary) {
|
private fun NotificationIcon(room: RoomListRoomSummary) {
|
||||||
val tint = if (room.hasUnread) ElementTheme.colors.unreadIndicator else ElementTheme.colors.iconQuaternary
|
val tint = if (room.hasUnread) ElementTheme.colors.unreadIndicator else ElementTheme.colors.iconQuaternary
|
||||||
when (room.notificationMode) {
|
when (room.userDefinedNotificationMode) {
|
||||||
null, RoomNotificationMode.ALL_MESSAGES -> return
|
null, RoomNotificationMode.ALL_MESSAGES -> return
|
||||||
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
|
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
|
||||||
Icon(
|
Icon(
|
||||||
|
|||||||
+1
-1
@@ -160,7 +160,7 @@ class RoomListDataSource @Inject constructor(
|
|||||||
roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
|
roomLastMessageFormatter.format(message.event, roomSummary.details.isDirect)
|
||||||
}.orEmpty(),
|
}.orEmpty(),
|
||||||
avatarData = avatarData,
|
avatarData = avatarData,
|
||||||
notificationMode = roomSummary.details.notificationMode,
|
userDefinedNotificationMode = roomSummary.details.userDefinedNotificationMode,
|
||||||
hasRoomCall = roomSummary.details.hasRoomCall,
|
hasRoomCall = roomSummary.details.hasRoomCall,
|
||||||
isDm = roomSummary.details.isDm,
|
isDm = roomSummary.details.isDm,
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ data class RoomListRoomSummary(
|
|||||||
val lastMessage: CharSequence? = null,
|
val lastMessage: CharSequence? = null,
|
||||||
val avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
|
val avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
|
||||||
val isPlaceholder: Boolean = false,
|
val isPlaceholder: Boolean = false,
|
||||||
val notificationMode: RoomNotificationMode? = null,
|
val userDefinedNotificationMode: RoomNotificationMode? = null,
|
||||||
val hasRoomCall: Boolean = false,
|
val hasRoomCall: Boolean = false,
|
||||||
val isDm: Boolean = false,
|
val isDm: Boolean = false,
|
||||||
)
|
)
|
||||||
|
|||||||
+3
-3
@@ -27,9 +27,9 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
|
|||||||
get() = sequenceOf(
|
get() = sequenceOf(
|
||||||
aRoomListRoomSummary(),
|
aRoomListRoomSummary(),
|
||||||
aRoomListRoomSummary().copy(lastMessage = null),
|
aRoomListRoomSummary().copy(lastMessage = null),
|
||||||
aRoomListRoomSummary().copy(hasUnread = true, notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
|
aRoomListRoomSummary().copy(hasUnread = true, userDefinedNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
|
||||||
aRoomListRoomSummary().copy(timestamp = "88:88", notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
|
aRoomListRoomSummary().copy(timestamp = "88:88", userDefinedNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY),
|
||||||
aRoomListRoomSummary().copy(timestamp = "88:88", notificationMode = RoomNotificationMode.MUTE),
|
aRoomListRoomSummary().copy(timestamp = "88:88", userDefinedNotificationMode = RoomNotificationMode.MUTE),
|
||||||
aRoomListRoomSummary().copy(timestamp = "88:88", hasUnread = true),
|
aRoomListRoomSummary().copy(timestamp = "88:88", hasUnread = true),
|
||||||
aRoomListRoomSummary().copy(isPlaceholder = true, timestamp = "88:88"),
|
aRoomListRoomSummary().copy(isPlaceholder = true, timestamp = "88:88"),
|
||||||
aRoomListRoomSummary().copy(
|
aRoomListRoomSummary().copy(
|
||||||
|
|||||||
+2
-2
@@ -384,11 +384,11 @@ class RoomListPresenterTests {
|
|||||||
notificationSettingsService.setRoomNotificationMode(A_ROOM_ID, userDefinedMode)
|
notificationSettingsService.setRoomNotificationMode(A_ROOM_ID, userDefinedMode)
|
||||||
|
|
||||||
val updatedState = consumeItemsUntilPredicate { state ->
|
val updatedState = consumeItemsUntilPredicate { state ->
|
||||||
state.roomList.any { it.id == A_ROOM_ID.value && it.notificationMode == userDefinedMode }
|
state.roomList.any { it.id == A_ROOM_ID.value && it.userDefinedNotificationMode == userDefinedMode }
|
||||||
}.last()
|
}.last()
|
||||||
|
|
||||||
val room = updatedState.roomList.find { it.id == A_ROOM_ID.value }
|
val room = updatedState.roomList.find { it.id == A_ROOM_ID.value }
|
||||||
assertThat(room?.notificationMode).isEqualTo(userDefinedMode)
|
assertThat(room?.userDefinedNotificationMode).isEqualTo(userDefinedMode)
|
||||||
cancelAndIgnoreRemainingEvents()
|
cancelAndIgnoreRemainingEvents()
|
||||||
scope.cancel()
|
scope.cancel()
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -42,7 +42,7 @@ data class RoomSummaryDetails(
|
|||||||
val lastMessage: RoomMessage?,
|
val lastMessage: RoomMessage?,
|
||||||
val unreadNotificationCount: Int,
|
val unreadNotificationCount: Int,
|
||||||
val inviter: RoomMember? = null,
|
val inviter: RoomMember? = null,
|
||||||
val notificationMode: RoomNotificationMode? = null,
|
val userDefinedNotificationMode: RoomNotificationMode? = null,
|
||||||
val hasRoomCall: Boolean = false,
|
val hasRoomCall: Boolean = false,
|
||||||
val isDm: Boolean = false,
|
val isDm: Boolean = false,
|
||||||
) {
|
) {
|
||||||
|
|||||||
+1
-1
@@ -38,7 +38,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
|
|||||||
unreadNotificationCount = roomInfo.notificationCount.toInt(),
|
unreadNotificationCount = roomInfo.notificationCount.toInt(),
|
||||||
lastMessage = latestRoomMessage,
|
lastMessage = latestRoomMessage,
|
||||||
inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
|
inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
|
||||||
notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
|
userDefinedNotificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
|
||||||
hasRoomCall = roomInfo.hasRoomCall,
|
hasRoomCall = roomInfo.hasRoomCall,
|
||||||
isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L,
|
isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L,
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,7 @@ fun aRoomSummaryDetails(
|
|||||||
avatarUrl = avatarUrl,
|
avatarUrl = avatarUrl,
|
||||||
lastMessage = lastMessage,
|
lastMessage = lastMessage,
|
||||||
unreadNotificationCount = unreadNotificationCount,
|
unreadNotificationCount = unreadNotificationCount,
|
||||||
notificationMode = notificationMode
|
userDefinedNotificationMode = notificationMode
|
||||||
)
|
)
|
||||||
|
|
||||||
fun aRoomMessage(
|
fun aRoomMessage(
|
||||||
|
|||||||
Reference in New Issue
Block a user