TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-21 00:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix contentDescriptions on pick display and message notifications

Browse Source
This commit is contained in:
Andrew 2024-06-26 23:24:45 +09:30
parent 9831758060
commit 031f3eb45f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
View File

@ -64,8 +64,8 @@ internal fun MessageNotificationsScreen(
NotificationRadioButton( NotificationRadioButton(
R.string.activity_pn_mode_fast_mode, R.string.activity_pn_mode_fast_mode,
R.string.activity_pn_mode_fast_mode_explanation, R.string.activity_pn_mode_fast_mode_explanation,
R.string.activity_pn_mode_recommended_option_tag, modifier = Modifier.contentDescription(R.string.AccessibilityId_fast_mode_notifications_button),
contentDescription = R.string.AccessibilityId_fast_mode_notifications_button, tag = R.string.activity_pn_mode_recommended_option_tag,
selected = state.pushEnabled, selected = state.pushEnabled,
onClick = { setEnabled(true) } onClick = { setEnabled(true) }
) )
@ -75,7 +75,7 @@ internal fun MessageNotificationsScreen(
NotificationRadioButton( NotificationRadioButton(
R.string.activity_pn_mode_slow_mode, R.string.activity_pn_mode_slow_mode,
R.string.activity_pn_mode_slow_mode_explanation, R.string.activity_pn_mode_slow_mode_explanation,
contentDescription = R.string.AccessibilityId_slow_mode_notifications_button, modifier = Modifier.contentDescription(R.string.AccessibilityId_slow_mode_notifications_button),
selected = state.pushDisabled, selected = state.pushDisabled,
onClick = { setEnabled(false) } onClick = { setEnabled(false) }
) )
@ -90,13 +90,13 @@ internal fun MessageNotificationsScreen(
private fun NotificationRadioButton( private fun NotificationRadioButton(
@StringRes title: Int, @StringRes title: Int,
@StringRes explanation: Int, @StringRes explanation: Int,
modifier: Modifier = Modifier,
@StringRes tag: Int? = null, @StringRes tag: Int? = null,
@StringRes contentDescription: Int? = null,
selected: Boolean = false, selected: Boolean = false,
onClick: () -> Unit = {} onClick: () -> Unit = {}
) { ) {
TextButton( TextButton(
modifier = Modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
colors = transparentButtonColors(), colors = transparentButtonColors(),
onClick = onClick, onClick = onClick,
shape = RectangleShape, shape = RectangleShape,
@ -105,7 +105,6 @@ private fun NotificationRadioButton(
Box( Box(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.contentDescription(contentDescription)
.border(LocalDimensions.current.borderStroke, LocalColors.current.borders, RoundedCornerShape(8.dp)), .border(LocalDimensions.current.borderStroke, LocalColors.current.borders, RoundedCornerShape(8.dp)),
) { ) {
Column(modifier = Modifier.padding(horizontal = 15.dp).padding(top = 10.dp, bottom = 11.dp)) { Column(modifier = Modifier.padding(horizontal = 15.dp).padding(top = 10.dp, bottom = 11.dp)) {

6
app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
View File

@ -20,7 +20,6 @@ import org.thoughtcrime.securesms.ui.LocalDimensions
import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.PreviewTheme
import org.thoughtcrime.securesms.ui.base import org.thoughtcrime.securesms.ui.base
import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField
import org.thoughtcrime.securesms.ui.contentDescription
import org.thoughtcrime.securesms.ui.h4 import org.thoughtcrime.securesms.ui.h4
@Preview @Preview
@ -53,9 +52,8 @@ internal fun DisplayName(state: State, onChange: (String) -> Unit = {}, onContin
Spacer(Modifier.height(LocalDimensions.current.itemSpacing)) Spacer(Modifier.height(LocalDimensions.current.itemSpacing))
SessionOutlinedTextField( SessionOutlinedTextField(
text = state.displayName, text = state.displayName,
modifier = Modifier modifier = Modifier.fillMaxWidth(),
.fillMaxWidth() contentDescription = stringResource(R.string.AccessibilityId_enter_display_name),
.contentDescription(R.string.AccessibilityId_enter_display_name),
placeholder = stringResource(R.string.displayNameEnter), placeholder = stringResource(R.string.displayNameEnter),
onChange = onChange, onChange = onChange,
onContinue = onContinue, onContinue = onContinue,

4
app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt
View File

@ -44,6 +44,7 @@ import org.thoughtcrime.securesms.ui.color.LocalColors
import org.thoughtcrime.securesms.ui.color.borders import org.thoughtcrime.securesms.ui.color.borders
import org.thoughtcrime.securesms.ui.color.text import org.thoughtcrime.securesms.ui.color.text
import org.thoughtcrime.securesms.ui.color.textSecondary import org.thoughtcrime.securesms.ui.color.textSecondary
import org.thoughtcrime.securesms.ui.contentDescription
@Preview @Preview
@Composable @Composable
@ -68,6 +69,7 @@ fun PreviewSessionOutlinedTextField() {
fun SessionOutlinedTextField( fun SessionOutlinedTextField(
text: String, text: String,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
contentDescription: String? = null,
onChange: (String) -> Unit = {}, onChange: (String) -> Unit = {},
textStyle: TextStyle = base, textStyle: TextStyle = base,
placeholder: String = "", placeholder: String = "",
@ -100,7 +102,7 @@ fun SessionOutlinedTextField(
BasicTextField( BasicTextField(
value = text, value = text,
onValueChange = onChange, onValueChange = onChange,
modifier = Modifier.wrapContentHeight().fillMaxWidth(), modifier = Modifier.wrapContentHeight().fillMaxWidth().contentDescription(contentDescription),
textStyle = textStyle.copy(color = LocalColors.current.text(error != null)), textStyle = textStyle.copy(color = LocalColors.current.text(error != null)),
cursorBrush = SolidColor(LocalColors.current.text(error != null)), cursorBrush = SolidColor(LocalColors.current.text(error != null)),
keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done), keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done),