mittwerk
/
element-x-android
mirror of https://github.com/element-hq/element-x-android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Prevent usage of hard-coded string for contentDescription, and fix existing issues.

pull/1845/head
Benoit Marty 10 months ago
parent
2e6803ac41
commit
67ed385e45
12 changed files with 20 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
  2. 2
      features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
  3. 2
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
  4. 2
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
  5. 2
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
  6. 2
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
  7. 8
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
  8. 2
      libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
  9. 2
      libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
  10. 2
      libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
  11. 6
      libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
  12. 4
      tools/check/forbidden_strings_in_code.txt

2
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
Unescape View File

@ -58,7 +58,7 @@ fun RoomPrivacyOption(
Icon( Icon(
modifier = Modifier.padding(horizontal = 8.dp), modifier = Modifier.padding(horizontal = 8.dp),
resourceId = roomPrivacyItem.icon, resourceId = roomPrivacyItem.icon,
contentDescription = "", contentDescription = null,
tint = MaterialTheme.colorScheme.secondary, tint = MaterialTheme.colorScheme.secondary,
) )

2
features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
Unescape View File

@ -300,7 +300,7 @@ private fun PinUnlockHeader(
.size(32.dp), .size(32.dp),
tint = ElementTheme.colors.iconPrimary, tint = ElementTheme.colors.iconPrimary,
imageVector = Icons.Filled.Lock, imageVector = Icons.Filled.Lock,
contentDescription = "", contentDescription = null,
) )
} }
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
Unescape View File

@ -70,7 +70,7 @@ fun RoundedIconAtom(
tint = tint, tint = tint,
resourceId = resourceId, resourceId = resourceId,
imageVector = imageVector, imageVector = imageVector,
contentDescription = "", contentDescription = null,
) )
} }
} }

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
Unescape View File

@ -51,7 +51,7 @@ fun PreferenceIcon(
Icon( Icon(
imageVector = icon, imageVector = icon,
resourceId = iconResourceId, resourceId = iconResourceId,
contentDescription = "", contentDescription = null,
tint = tintColor ?: enabled.toSecondaryEnabledColor(), tint = tintColor ?: enabled.toSecondaryEnabledColor(),
modifier = Modifier modifier = Modifier
.padding(end = 16.dp) .padding(end = 16.dp)

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
Unescape View File

@ -66,7 +66,7 @@ internal fun FloatingActionButtonPreview() =
private fun ContentToPreview() { private fun ContentToPreview() {
Box(modifier = Modifier.padding(8.dp)) { Box(modifier = Modifier.padding(8.dp)) {
FloatingActionButton(onClick = {}) { FloatingActionButton(onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "") Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
} }
} }
} }

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
Unescape View File

@ -145,5 +145,5 @@ internal fun IconImageVectorPreview() =
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "") Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
} }

8
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
Unescape View File

@ -67,20 +67,20 @@ private fun ContentToPreview() {
CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconPrimary) { CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconPrimary) {
Row { Row {
IconButton(onClick = {}) { IconButton(onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "") Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
} }
IconButton(enabled = false, onClick = {}) { IconButton(enabled = false, onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "") Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
} }
} }
} }
CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconSecondary) { CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconSecondary) {
Row { Row {
IconButton(onClick = {}) { IconButton(onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "") Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
} }
IconButton(enabled = false, onClick = {}) { IconButton(enabled = false, onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "") Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
} }
} }
} }

2
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
Unescape View File

@ -87,7 +87,7 @@ fun EditableAvatarView(
Icon( Icon(
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.dp),
resourceId = CommonDrawables.ic_edit, resourceId = CommonDrawables.ic_edit,
contentDescription = "", contentDescription = null,
tint = MaterialTheme.colorScheme.onPrimary, tint = MaterialTheme.colorScheme.onPrimary,
) )
} }

2
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
Unescape View File

@ -79,7 +79,7 @@ fun UnresolvedUserRow(
) { ) {
Icon( Icon(
resourceId = CommonDrawables.ic_compound_error, resourceId = CommonDrawables.ic_compound_error,
contentDescription = "", contentDescription = null,
modifier = Modifier modifier = Modifier
.size(18.dp) .size(18.dp)
.align(Alignment.Top) .align(Alignment.Top)

2
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
Unescape View File

@ -72,7 +72,7 @@ fun UnsavedAvatar(
Box(modifier = commonModifier.background(ElementTheme.colors.temporaryColorBgSpecial)) { Box(modifier = commonModifier.background(ElementTheme.colors.temporaryColorBgSpecial)) {
Icon( Icon(
imageVector = Icons.Outlined.AddAPhoto, imageVector = Icons.Outlined.AddAPhoto,
contentDescription = "", contentDescription = null,
modifier = Modifier modifier = Modifier
.align(Alignment.Center) .align(Alignment.Center)
.size(40.dp), .size(40.dp),

6
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
Unescape View File

@ -98,19 +98,19 @@ internal fun FormattingButtonPreview() = ElementPreview {
state = FormattingOptionState.Default, state = FormattingOptionState.Default,
onClick = { }, onClick = { },
imageVector = ImageVector.vectorResource(CommonDrawables.ic_bold), imageVector = ImageVector.vectorResource(CommonDrawables.ic_bold),
contentDescription = "", contentDescription = null,
) )
FormattingOption( FormattingOption(
state = FormattingOptionState.Selected, state = FormattingOptionState.Selected,
onClick = { }, onClick = { },
imageVector = ImageVector.vectorResource(CommonDrawables.ic_italic), imageVector = ImageVector.vectorResource(CommonDrawables.ic_italic),
contentDescription = "", contentDescription = null,
) )
FormattingOption( FormattingOption(
state = FormattingOptionState.Disabled, state = FormattingOptionState.Disabled,
onClick = { }, onClick = { },
imageVector = ImageVector.vectorResource(CommonDrawables.ic_underline), imageVector = ImageVector.vectorResource(CommonDrawables.ic_underline),
contentDescription = "", contentDescription = null,
) )
} }
} }

4
tools/check/forbidden_strings_in_code.txt
Unescape View File

@ -132,3 +132,7 @@ System\.currentTimeMillis\(\)===1
### Use `import io.element.android.libraries.ui.strings.CommonStrings` then `CommonStrings.<stringKey>` instead ### Use `import io.element.android.libraries.ui.strings.CommonStrings` then `CommonStrings.<stringKey>` instead
import io\.element\.android\.libraries\.ui\.strings\.R import io\.element\.android\.libraries\.ui\.strings\.R
# Accessibility
### Use string resource for `contentDescription`, or null instead of empty string
contentDescription = "

Write Preview
Loading…
Cancel
Save