Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

change (media preview config) : handle loading and failure ui

Browse source
This commit is contained in:
ganfra 2025-06-26 20:53:00 +02:00
parent 0b748aa8cb
commit 42af43ea7a
1 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
View file

@ -7,7 +7,10 @@
package io.element.android.features.preferences.impl.advanced package io.element.android.features.preferences.impl.advanced
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
@ -27,6 +30,10 @@ import io.element.android.libraries.designsystem.theme.components.ListSectionHea
import io.element.android.libraries.designsystem.theme.components.ListSupportingText import io.element.android.libraries.designsystem.theme.components.ListSupportingText
import io.element.android.libraries.designsystem.theme.components.ListSupportingTextDefaults import io.element.android.libraries.designsystem.theme.components.ListSupportingTextDefaults
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
import io.element.android.libraries.matrix.api.media.MediaPreviewValue import io.element.android.libraries.matrix.api.media.MediaPreviewValue
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.services.analytics.compose.LocalAnalyticsService import io.element.android.services.analytics.compose.LocalAnalyticsService
@ -40,10 +47,21 @@ fun AdvancedSettingsView(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val analyticsService = LocalAnalyticsService.current val analyticsService = LocalAnalyticsService.current
val snackbarDispatcher = LocalSnackbarDispatcher.current
val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
val snackbarHostState = rememberSnackbarHostState(snackbarMessage = snackbarMessage)
PreferencePage( PreferencePage(
modifier = modifier, modifier = modifier,
onBackClick = onBackClick, onBackClick = onBackClick,
title = stringResource(id = CommonStrings.common_advanced_settings) title = stringResource(id = CommonStrings.common_advanced_settings),
snackbarHost = {
SnackbarHost(
snackbarHostState,
modifier = Modifier.navigationBarsPadding()
)
}
) { ) {
PreferenceDropdown( PreferenceDropdown(
title = stringResource(id = CommonStrings.common_appearance), title = stringResource(id = CommonStrings.common_appearance),
@ -119,15 +137,18 @@ private fun ModerationAndSafety(
onCheckedChange = { onCheckedChange = {
state.eventSink(AdvancedSettingsEvents.SetHideInviteAvatars(it)) state.eventSink(AdvancedSettingsEvents.SetHideInviteAvatars(it))
}, },
enabled = !state.setHideInviteAvatarsAction.isLoading()
) )
ListSectionHeader( ListSectionHeader(
title = stringResource(R.string.screen_advanced_settings_show_media_timeline_title), title = stringResource(R.string.screen_advanced_settings_show_media_timeline_title),
hasDivider = false, hasDivider = false,
description = { description = {
ListSupportingText( Row {
text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle), ListSupportingText(
contentPadding = ListSupportingTextDefaults.Padding.None, text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle),
) contentPadding = ListSupportingTextDefaults.Padding.None,
)
}
} }
) )
ListItem( ListItem(
@ -136,6 +157,7 @@ private fun ModerationAndSafety(
onClick = { onClick = {
state.eventSink(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.Off)) state.eventSink(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.Off))
}, },
enabled = !state.setTimelineMediaPreviewAction.isLoading()
) )
ListItem( ListItem(
headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_private_rooms)) }, headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_private_rooms)) },
@ -143,6 +165,7 @@ private fun ModerationAndSafety(
onClick = { onClick = {
state.eventSink(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.Private)) state.eventSink(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.Private))
}, },
enabled = !state.setTimelineMediaPreviewAction.isLoading()
) )
ListItem( ListItem(
headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_always_show)) }, headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_always_show)) },
@ -150,6 +173,7 @@ private fun ModerationAndSafety(
onClick = { onClick = {
state.eventSink(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.On)) state.eventSink(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.On))
}, },
enabled = !state.setTimelineMediaPreviewAction.isLoading()
) )
} }
} }