From 27620e86c573ddedd72c5a0088c81b10c13d94b3 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sat, 20 Jan 2024 23:38:31 +0300 Subject: [PATCH] Add missing content descriptions #166 --- core/base/src/main/res/values/strings.xml | 14 ++++++++++++++ .../datecalculator/addsubtract/AddSubtractPage.kt | 2 +- .../feature/settings/components/ColorSelector.kt | 4 +++- .../settings/components/MonetModeSelector.kt | 4 +++- .../unitto/feature/timezone/TimeZoneScreen.kt | 4 ++-- .../timezone/components/FavoriteTimeZoneItem.kt | 4 ++-- .../feature/timezone/components/UserTimeZone.kt | 4 +++- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/core/base/src/main/res/values/strings.xml b/core/base/src/main/res/values/strings.xml index 342fa2c7..64875757 100644 --- a/core/base/src/main/res/values/strings.xml +++ b/core/base/src/main/res/values/strings.xml @@ -43,6 +43,10 @@ Copied %1$s! Add + + + Create event + Days Difference @@ -100,6 +104,11 @@ Used in this dialog window. Should be short --> Select time + + + + Selected item About Unitto Learn about the app @@ -206,6 +215,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d Need more time zones? + + + + Reset Time zones Tomorrow Acre diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt index 9e5fe973..4a557dfa 100644 --- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt @@ -128,7 +128,7 @@ private fun AddSubtractView( ) { Icon( imageVector = Icons.Default.Event, - contentDescription = null, + contentDescription = stringResource(R.string.date_calculator_create_event), ) } }, diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorSelector.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorSelector.kt index 5d4b9df4..dd544704 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorSelector.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorSelector.kt @@ -49,7 +49,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import com.sadellie.unitto.core.base.R @Composable internal fun ColorSelector( @@ -122,7 +124,7 @@ private fun ColorCheckbox( ) { Icon( imageVector = Icons.Default.Check, - contentDescription = null, + contentDescription = stringResource(R.string.selected_item), tint = if (color.luminance() > 0.5) Color.Black else Color.White, ) } diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/MonetModeSelector.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/MonetModeSelector.kt index 0014c231..b2f669d0 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/MonetModeSelector.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/MonetModeSelector.kt @@ -54,7 +54,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import com.sadellie.unitto.core.base.R import io.github.sadellie.themmo.Themmo import io.github.sadellie.themmo.ThemmoController import io.github.sadellie.themmo.core.MonetMode @@ -144,7 +146,7 @@ private fun MonetModeCheckbox( ) { Icon( imageVector = Icons.Default.Check, - contentDescription = null, + contentDescription = stringResource(R.string.selected_item), tint = MaterialTheme.colorScheme.inverseOnSurface, modifier = Modifier .background(MaterialTheme.colorScheme.inverseSurface, CircleShape) diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt index 56b8a087..7b0ce4d5 100644 --- a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt +++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/TimeZoneScreen.kt @@ -75,9 +75,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.SettingsButton -import com.sadellie.unitto.core.ui.common.datetimepicker.TimePickerDialog import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar +import com.sadellie.unitto.core.ui.common.datetimepicker.TimePickerDialog import com.sadellie.unitto.data.model.timezone.FavoriteZone import com.sadellie.unitto.feature.timezone.components.FavoriteTimeZoneItem import com.sadellie.unitto.feature.timezone.components.UserTimeZone @@ -189,7 +189,7 @@ private fun TimeZoneScreen( ) { Icon( imageVector = Icons.Filled.Add, - contentDescription = null, + contentDescription = stringResource(R.string.time_zone_add_title), modifier = Modifier.size(FloatingActionButtonDefaults.LargeIconSize), ) } diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt index 6f280f50..31b0a3a3 100644 --- a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt +++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt @@ -234,7 +234,7 @@ private fun TimeZoneLabel( ) { Icon( imageVector = Icons.Default.Edit, - contentDescription = null, + contentDescription = null, // Not required because there is text next to it modifier = Modifier.padding(end = 8.dp), ) Text( @@ -250,7 +250,7 @@ private fun TimeZoneLabel( AnimatedVisibility(visible = expanded) { Icon( imageVector = Icons.Default.Edit, - contentDescription = null, + contentDescription = null, // Not required because there is text next to it modifier = Modifier.padding(end = 8.dp), ) } diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/UserTimeZone.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/UserTimeZone.kt index 85008ec7..c8958c4d 100644 --- a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/UserTimeZone.kt +++ b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/UserTimeZone.kt @@ -46,9 +46,11 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.ui.LocalLocale import com.sadellie.unitto.core.ui.common.squashable import com.sadellie.unitto.core.ui.datetime.formatDateDayMonthYear @@ -113,7 +115,7 @@ internal fun UserTimeZone( IconButton(onResetClick) { Icon( imageVector = Icons.Outlined.History, - contentDescription = null, + contentDescription = stringResource(R.string.time_zone_reset), tint = MaterialTheme.colorScheme.onTertiaryContainer, ) }