Browse Source

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

pull/1845/head
Benoit Marty 10 months ago
parent
commit
67ed385e45
  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

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

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

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

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

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

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

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

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

@ -66,7 +66,7 @@ internal fun FloatingActionButtonPreview() = @@ -66,7 +66,7 @@ internal fun FloatingActionButtonPreview() =
private fun ContentToPreview() {
Box(modifier = Modifier.padding(8.dp)) {
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

@ -145,5 +145,5 @@ internal fun IconImageVectorPreview() = @@ -145,5 +145,5 @@ internal fun IconImageVectorPreview() =
@Composable
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

@ -67,20 +67,20 @@ private fun ContentToPreview() { @@ -67,20 +67,20 @@ private fun ContentToPreview() {
CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconPrimary) {
Row {
IconButton(onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
}
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) {
Row {
IconButton(onClick = {}) {
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
}
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

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

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

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

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

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

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

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

4
tools/check/forbidden_strings_in_code.txt

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

Loading…
Cancel
Save