mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-02-17 12:30:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve switch toggle semantics (#140)

Browse source
This commit is contained in:
Brian Yencho 2023-10-23 06:32:14 -05:00 • committed by Álison Fernandes
parent f5619d1710
commit 3f742cc6df
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSwitch.kt
View file

@ -16,6 +16,8 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.toggleableState
import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -43,7 +45,9 @@ fun BitwardenSwitch(
indication = rememberRipple(color = MaterialTheme.colorScheme.primary), indication = rememberRipple(color = MaterialTheme.colorScheme.primary),
onClick = { onCheckedChange?.invoke(!isChecked) }, onClick = { onCheckedChange?.invoke(!isChecked) },
) )
.semantics(mergeDescendants = true) { } .semantics(mergeDescendants = true) {
toggleableState = ToggleableState(isChecked)
}
.then(modifier), .then(modifier),
) { ) {
Switch( Switch(

3
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenWideSwitch.kt
View file

@ -17,6 +17,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.toggleableState
import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
@ -50,6 +52,7 @@ fun BitwardenWideSwitch(
onClick = { onCheckedChange?.invoke(!isChecked) }, onClick = { onCheckedChange?.invoke(!isChecked) },
) )
.semantics(mergeDescendants = true) { .semantics(mergeDescendants = true) {
toggleableState = ToggleableState(isChecked)
if (contentDescription != null) { if (contentDescription != null) {
this.contentDescription = contentDescription this.contentDescription = contentDescription
} }

10
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt
View file

@ -4,6 +4,8 @@ import androidx.compose.ui.semantics.ProgressBarRangeInfo
import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.semantics.SemanticsProperties
import androidx.compose.ui.test.SemanticsMatcher.Companion.expectValue import androidx.compose.ui.test.SemanticsMatcher.Companion.expectValue
import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.filterToOne
import androidx.compose.ui.test.hasContentDescription import androidx.compose.ui.test.hasContentDescription
import androidx.compose.ui.test.hasProgressBarRangeInfo import androidx.compose.ui.test.hasProgressBarRangeInfo
@ -156,22 +158,22 @@ class GeneratorScreenTest : BaseComposeTest() {
composeTestRule composeTestRule
.onNodeWithText("A—Z") .onNodeWithText("A—Z")
.performScrollTo() .performScrollTo()
.assertIsDisplayed() .assertIsOn()
composeTestRule composeTestRule
.onNodeWithText("a—z") .onNodeWithText("a—z")
.performScrollTo() .performScrollTo()
.assertIsDisplayed() .assertIsOn()
composeTestRule composeTestRule
.onNodeWithText("0-9") .onNodeWithText("0-9")
.performScrollTo() .performScrollTo()
.assertIsDisplayed() .assertIsOn()
composeTestRule composeTestRule
.onNodeWithText("!@#$%^&*") .onNodeWithText("!@#$%^&*")
.performScrollTo() .performScrollTo()
.assertIsDisplayed() .assertIsOff()
composeTestRule composeTestRule
.onNodeWithContentDescription("Minimum numbers, 1") .onNodeWithContentDescription("Minimum numbers, 1")