n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update some settings elements for TalkBack

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-05-28 14:03:04 +03:00
parent b72bc9c385
commit 70f2f371de
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
java/src/org/futo/inputmethod/latin/uix/settings/Components.kt
View File

@ -56,6 +56,13 @@ import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.drawscope.translate
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.role
import androidx.compose.ui.semantics.text
import androidx.compose.ui.semantics.toggleableState
import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
@ -83,7 +90,7 @@ fun ScreenTitle(title: String, showBack: Boolean = false, navController: NavHost
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
if(showBack) { if(showBack) {
Icon(Icons.Default.ArrowBack, contentDescription = "Back", modifier = Modifier.align(CenterVertically)) Icon(Icons.Default.ArrowBack, contentDescription = null, modifier = Modifier.align(CenterVertically))
Spacer(modifier = Modifier.width(18.dp)) Spacer(modifier = Modifier.width(18.dp))
} }
Text(title, style = Typography.titleLarge, modifier = Modifier Text(title, style = Typography.titleLarge, modifier = Modifier
@ -97,7 +104,7 @@ fun ScreenTitleWithIcon(title: String, painter: Painter) {
Row(modifier = Modifier.fillMaxWidth()) { Row(modifier = Modifier.fillMaxWidth()) {
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
Icon(painter, contentDescription = "", modifier = Modifier.align(CenterVertically)) Icon(painter, contentDescription = null, modifier = Modifier.align(CenterVertically))
Spacer(modifier = Modifier.width(18.dp)) Spacer(modifier = Modifier.width(18.dp))
Text(title, style = Typography.titleLarge, modifier = Modifier Text(title, style = Typography.titleLarge, modifier = Modifier
.align(CenterVertically) .align(CenterVertically)
@ -130,10 +137,11 @@ fun SettingItem(
onClick: (() -> Unit)? = null, onClick: (() -> Unit)? = null,
icon: (@Composable () -> Unit)? = null, icon: (@Composable () -> Unit)? = null,
disabled: Boolean = false, disabled: Boolean = false,
modifier: Modifier = Modifier,
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
Row( Row(
modifier = Modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.defaultMinSize(0.dp, 68.dp) .defaultMinSize(0.dp, 68.dp)
.clickable(enabled = !disabled && onClick != null, onClick = { .clickable(enabled = !disabled && onClick != null, onClick = {
@ -207,7 +215,12 @@ fun SettingToggleRaw(
setValue(!enabled) setValue(!enabled)
} }
}, },
icon = icon icon = icon,
modifier = Modifier.clearAndSetSemantics {
this.text = AnnotatedString("$title. $subtitle")
this.role = Role.Switch
this.toggleableState = ToggleableState(enabled)
}
) { ) {
Switch(checked = enabled, onCheckedChange = { Switch(checked = enabled, onCheckedChange = {
if (!disabled) { if (!disabled) {
@ -527,8 +540,8 @@ fun NavigationItem(title: String, style: NavigationItemStyle, navigate: () -> Un
} }
) { ) {
when(style) { when(style) {
NavigationItemStyle.Misc -> Icon(Icons.Default.ArrowForward, contentDescription = "Go") NavigationItemStyle.Misc -> Icon(Icons.Default.ArrowForward, contentDescription = null)
NavigationItemStyle.Mail -> Icon(Icons.Default.Send, contentDescription = "Send") NavigationItemStyle.Mail -> Icon(Icons.Default.Send, contentDescription = null)
else -> {} else -> {}
} }
} }