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

Fix duplicated strings and use back button

Browse source
This commit is contained in:
Maxime NATUREL 2023-03-06 17:17:27 +01:00 • committed by Florian Renaud
parent d55a1ccb07
commit 3efb141afc
5 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BackButton.kt
View file

@ -16,32 +16,31 @@
package io.element.android.libraries.designsystem.theme.components
import androidx.annotation.DrawableRes
import androidx.compose.foundation.layout.Column
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.ui.strings.R.string as StringR
import io.element.android.libraries.designsystem.R as DrawableR
import io.element.android.libraries.ui.strings.R as StringR
@Composable
fun BackButton(
action: () -> Unit,
onClick: () -> Unit,
modifier: Modifier = Modifier,
icon: ImageVector = Icons.Default.ArrowBack,
contentDescription: String = stringResource(StringR.action_back),
@DrawableRes icon: Int = DrawableR.drawable.ic_arrow_back,
contentDescription: String = stringResource(StringR.string.a11y_back),
enabled: Boolean = true
) {
IconButton(
modifier = modifier,
onClick = action,
onClick = onClick,
enabled = enabled,
) {
Icon(imageVector = icon, contentDescription = contentDescription)
Icon(resourceId = icon, contentDescription = contentDescription)
}
}
@ -56,7 +55,7 @@ internal fun BackButtonPreviewDark() = ElementPreviewDark { ContentToPreview() }
@Composable
private fun ContentToPreview() {
Column {
BackButton(action = { }, enabled = true, contentDescription = "Back")
BackButton(action = { }, enabled = false, contentDescription = "Back")
BackButton(onClick = { }, enabled = true, contentDescription = "Back")
BackButton(onClick = { }, enabled = false, contentDescription = "Back")
}
}