mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Fix PR comments
This commit is contained in:
+1
-1
@@ -60,9 +60,9 @@ class RoomDetailsPresenter @Inject constructor(
|
|||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
val leaveRoomState = leaveRoomPresenter.present()
|
val leaveRoomState = leaveRoomPresenter.present()
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
room.updateMembers()
|
|
||||||
room.updateRoomNotificationSettings()
|
room.updateRoomNotificationSettings()
|
||||||
observeNotificationSettings()
|
observeNotificationSettings()
|
||||||
|
room.updateMembers()
|
||||||
}
|
}
|
||||||
|
|
||||||
val membersState by room.membersStateFlow.collectAsState()
|
val membersState by room.membersStateFlow.collectAsState()
|
||||||
|
|||||||
+5
-1
@@ -306,7 +306,11 @@ internal fun TopicSection(
|
|||||||
@Composable
|
@Composable
|
||||||
internal fun NotificationSection(state: RoomDetailsState, openRoomNotificationSettings: () -> Unit, modifier: Modifier = Modifier) {
|
internal fun NotificationSection(state: RoomDetailsState, openRoomNotificationSettings: () -> Unit, modifier: Modifier = Modifier) {
|
||||||
state.roomNotificationSettings?.let {
|
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) {
|
PreferenceCategory(modifier = modifier) {
|
||||||
PreferenceText(
|
PreferenceText(
|
||||||
title = stringResource(R.string.screen_room_details_notification_title),
|
title = stringResource(R.string.screen_room_details_notification_title),
|
||||||
|
|||||||
+1
-1
@@ -51,7 +51,7 @@ class RoomNotificationSettingsNode @AssistedInject constructor(
|
|||||||
RoomNotificationSettingsView(
|
RoomNotificationSettingsView(
|
||||||
state = state,
|
state = state,
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
onBackPressed = { navigateUp() },
|
onBackPressed = this::navigateUp,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-9
@@ -26,10 +26,9 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.semantics.Role
|
import androidx.compose.ui.semantics.Role
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
import io.element.android.libraries.designsystem.preview.DayNightPreviews
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
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.RadioButton
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
import io.element.android.libraries.designsystem.toEnabledColor
|
import io.element.android.libraries.designsystem.toEnabledColor
|
||||||
@@ -78,13 +77,9 @@ fun RoomNotificationSettingsOption(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Preview
|
@DayNightPreviews
|
||||||
@Composable
|
@Composable
|
||||||
fun RoomPrivacyOptionLightPreview() = ElementPreviewLight { ContentToPreview() }
|
fun RoomPrivacyOptionLightPreview() = ElementPreview { ContentToPreview() }
|
||||||
|
|
||||||
@Preview
|
|
||||||
@Composable
|
|
||||||
fun RoomPrivacyOptionDarkPreview() = ElementPreviewDark { ContentToPreview() }
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun ContentToPreview() {
|
private fun ContentToPreview() {
|
||||||
|
|||||||
Reference in New Issue
Block a user