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

Migrate AdvancedSettingsView items from PreferenceSwitch to ListItem.

Browse source
This commit is contained in:
Benoit Marty 2023-11-24 17:03:57 +01:00
parent 47e29c2fb3
commit 85aaf9f54d
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import io.element.android.libraries.designsystem.components.dialogs.ListOption
import io.element.android.libraries.designsystem.components.dialogs.SingleSelectionDialog import io.element.android.libraries.designsystem.components.dialogs.SingleSelectionDialog
import io.element.android.libraries.designsystem.components.list.ListItemContent import io.element.android.libraries.designsystem.components.list.ListItemContent
import io.element.android.libraries.designsystem.components.preferences.PreferencePage import io.element.android.libraries.designsystem.components.preferences.PreferencePage
import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.ListItem import io.element.android.libraries.designsystem.theme.components.ListItem
@ -49,9 +48,7 @@ fun AdvancedSettingsView(
) { ) {
ListItem( ListItem(
headlineContent = { headlineContent = {
Text( Text(text = stringResource(id = CommonStrings.common_appearance))
text = stringResource(id = CommonStrings.common_appearance)
)
}, },
trailingContent = ListItemContent.Text( trailingContent = ListItemContent.Text(
state.theme.toHumanReadable() state.theme.toHumanReadable()
@ -60,17 +57,29 @@ fun AdvancedSettingsView(
state.eventSink(AdvancedSettingsEvents.ChangeTheme) state.eventSink(AdvancedSettingsEvents.ChangeTheme)
} }
) )
PreferenceSwitch( ListItem(
title = stringResource(id = CommonStrings.common_rich_text_editor), headlineContent = {
subtitle = stringResource(id = R.string.screen_advanced_settings_rich_text_editor_description), Text(text = stringResource(id = CommonStrings.common_rich_text_editor))
isChecked = state.isRichTextEditorEnabled, },
onCheckedChange = { state.eventSink(AdvancedSettingsEvents.SetRichTextEditorEnabled(it)) }, supportingContent = {
Text(text = stringResource(id = R.string.screen_advanced_settings_rich_text_editor_description))
},
trailingContent = ListItemContent.Switch(
checked = state.isRichTextEditorEnabled,
onChange = { state.eventSink(AdvancedSettingsEvents.SetRichTextEditorEnabled(it)) },
),
) )
PreferenceSwitch( ListItem(
title = stringResource(id = CommonStrings.action_view_source), headlineContent = {
subtitle = stringResource(id = R.string.screen_advanced_settings_view_source_description), Text(text = stringResource(id = CommonStrings.action_view_source))
isChecked = state.isDeveloperModeEnabled, },
onCheckedChange = { state.eventSink(AdvancedSettingsEvents.SetDeveloperModeEnabled(it)) }, supportingContent = {
Text(text = stringResource(id = R.string.screen_advanced_settings_view_source_description))
},
trailingContent = ListItemContent.Switch(
checked = state.isDeveloperModeEnabled,
onChange = { state.eventSink(AdvancedSettingsEvents.SetDeveloperModeEnabled(it)) },
),
) )
} }