From 0214ca66a6883aa68ab09d547e158379b35637f5 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Fri, 11 Aug 2023 14:07:59 +0200
Subject: [PATCH] Fix PR comments

---
 .../roomdetails/impl/RoomDetailsPresenter.kt        |  2 +-
 .../features/roomdetails/impl/RoomDetailsView.kt    |  6 +++++-
 .../RoomNotificationSettingsNode.kt                 |  2 +-
 .../RoomNotificationSettingsOption.kt               | 13 ++++---------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
index 91d11bfc19..79540e4ee4 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -60,9 +60,9 @@ class RoomDetailsPresenter @Inject constructor(
         val scope = rememberCoroutineScope()
         val leaveRoomState = leaveRoomPresenter.present()
         LaunchedEffect(Unit) {
-            room.updateMembers()
             room.updateRoomNotificationSettings()
             observeNotificationSettings()
+            room.updateMembers()
         }
 
         val membersState by room.membersStateFlow.collectAsState()
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 263bb4df12..d5f3c99c43 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -306,7 +306,11 @@ internal fun TopicSection(
 @Composable
 internal fun NotificationSection(state: RoomDetailsState, openRoomNotificationSettings: () -> Unit, modifier: Modifier = Modifier) {
     state.roomNotificationSettings?.let {
-        val subtitle = if (it.isDefault) "Default" else "Custom"
+        val subtitle = if (it.isDefault) {
+            stringResource(R.string.screen_room_details_notification_mode_default)
+        } else {
+            stringResource(R.string.screen_room_details_notification_mode_custom)
+        }
         PreferenceCategory(modifier = modifier) {
             PreferenceText(
                 title = stringResource(R.string.screen_room_details_notification_title),
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
index d6846343dc..224f850e28 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
@@ -51,7 +51,7 @@ class RoomNotificationSettingsNode @AssistedInject constructor(
         RoomNotificationSettingsView(
             state = state,
             modifier = modifier,
-            onBackPressed = { navigateUp() },
+            onBackPressed = this::navigateUp,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
index e0303bf474..bab2558c07 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
@@ -26,10 +26,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import io.element.android.libraries.designsystem.preview.ElementPreviewDark
-import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.preview.DayNightPreviews
+import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.theme.components.RadioButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.toEnabledColor
@@ -78,13 +77,9 @@ fun RoomNotificationSettingsOption(
     }
 }
 
-@Preview
+@DayNightPreviews
 @Composable
-fun RoomPrivacyOptionLightPreview() = ElementPreviewLight { ContentToPreview() }
-
-@Preview
-@Composable
-fun RoomPrivacyOptionDarkPreview() = ElementPreviewDark { ContentToPreview() }
+fun RoomPrivacyOptionLightPreview() = ElementPreview { ContentToPreview() }
 
 @Composable
 private fun ContentToPreview() {