mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
change (media preview config) : address review remarks
This commit is contained in:
+1
-1
@@ -52,7 +52,7 @@ class MediaPreviewConfigMigration @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onFailure {
|
.onFailure {
|
||||||
Timber.d("Couldn't perform migration, failed to fetch media preview config.")
|
Timber.e(it, "Couldn't perform migration, failed to fetch media preview config.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-7
@@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
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.foundation.layout.navigationBarsPadding
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@@ -143,12 +142,10 @@ private fun ModerationAndSafety(
|
|||||||
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 = {
|
||||||
Row {
|
ListSupportingText(
|
||||||
ListSupportingText(
|
text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle),
|
||||||
text = stringResource(R.string.screen_advanced_settings_show_media_timeline_subtitle),
|
contentPadding = ListSupportingTextDefaults.Padding.None,
|
||||||
contentPadding = ListSupportingTextDefaults.Padding.None,
|
)
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
ListItem(
|
ListItem(
|
||||||
|
|||||||
+4
-2
@@ -88,8 +88,9 @@ class DefaultMediaPreviewConfigStateStore @Inject constructor(
|
|||||||
|
|
||||||
override fun setHideInviteAvatars(hide: Boolean) {
|
override fun setHideInviteAvatars(hide: Boolean) {
|
||||||
sessionCoroutineScope.launch {
|
sessionCoroutineScope.launch {
|
||||||
Timber.d("Setting hide invite avatars to $hide")
|
|
||||||
val prevHideInviteAvatars = hideInviteAvatars.value
|
val prevHideInviteAvatars = hideInviteAvatars.value
|
||||||
|
if (prevHideInviteAvatars == hide) return@launch
|
||||||
|
Timber.d("Setting hide invite avatars to $hide")
|
||||||
hideInviteAvatars.value = hide
|
hideInviteAvatars.value = hide
|
||||||
runUpdatingState(setHideInviteAvatarsAction) {
|
runUpdatingState(setHideInviteAvatarsAction) {
|
||||||
mediaPreviewService
|
mediaPreviewService
|
||||||
@@ -104,8 +105,9 @@ class DefaultMediaPreviewConfigStateStore @Inject constructor(
|
|||||||
|
|
||||||
override fun setTimelineMediaPreviewValue(value: MediaPreviewValue) {
|
override fun setTimelineMediaPreviewValue(value: MediaPreviewValue) {
|
||||||
sessionCoroutineScope.launch {
|
sessionCoroutineScope.launch {
|
||||||
Timber.d("Setting timeline media preview value to $value")
|
|
||||||
val prevTimelineMediaPreviewValue = timelineMediaPreviewValue.value
|
val prevTimelineMediaPreviewValue = timelineMediaPreviewValue.value
|
||||||
|
if (prevTimelineMediaPreviewValue == value) return@launch
|
||||||
|
Timber.d("Setting timeline media preview value to $value")
|
||||||
timelineMediaPreviewValue.value = value
|
timelineMediaPreviewValue.value = value
|
||||||
runUpdatingState(setTimelineMediaPreviewAction) {
|
runUpdatingState(setTimelineMediaPreviewAction) {
|
||||||
mediaPreviewService
|
mediaPreviewService
|
||||||
|
|||||||
+1
-1
@@ -56,7 +56,7 @@ class RustMediaPreviewService(
|
|||||||
|
|
||||||
private fun RustMediaPreviewConfig.into(): MediaPreviewConfig {
|
private fun RustMediaPreviewConfig.into(): MediaPreviewConfig {
|
||||||
return MediaPreviewConfig(
|
return MediaPreviewConfig(
|
||||||
mediaPreviewValue = this@into.mediaPreviews.into(),
|
mediaPreviewValue = mediaPreviews.into(),
|
||||||
hideInviteAvatar = inviteAvatars == InviteAvatars.OFF
|
hideInviteAvatar = inviteAvatars == InviteAvatars.OFF
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user