Merge pull request #6953 from element-hq/feature/bma/cropIcon

Replace "Edit" button with Crop icon.
This commit is contained in:
Benoit Marty
2026-06-08 10:15:11 +02:00
committed by GitHub
16 changed files with 42 additions and 35 deletions
@@ -37,6 +37,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.features.messages.impl.R
import io.element.android.features.messages.impl.attachments.Attachment
import io.element.android.features.messages.impl.attachments.preview.error.sendAttachmentError
@@ -57,11 +58,12 @@ import io.element.android.libraries.designsystem.modifiers.niceClickable
import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.IconButton
import io.element.android.libraries.designsystem.theme.components.ListItem
import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Switch
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TextButton
import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.designsystem.utils.CommonDrawables
import io.element.android.libraries.mediaviewer.api.local.LocalMedia
@@ -163,10 +165,14 @@ fun AttachmentsPreviewView(
},
actions = {
if (state.canEditImage && canShowEditAction) {
TextButton(
stringResource(CommonStrings.action_edit),
onClick = ::postOpenImageEditor
)
IconButton(
onClick = ::postOpenImageEditor,
) {
Icon(
imageVector = CompoundIcons.Crop(),
contentDescription = stringResource(CommonStrings.action_edit),
)
}
}
}
)