From a9dfcc03f923edc1af462cf1428ce3f4f681e8e2 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Wed, 11 Oct 2023 23:25:13 +0300 Subject: [PATCH] Default icon description for list items --- .../com/sadellie/unitto/core/ui/common/UnittoListItem.kt | 5 ++--- .../sadellie/unitto/feature/settings/SettingsScreen.kt | 9 --------- .../unitto/feature/settings/about/AboutScreen.kt | 6 ------ .../settings/calculator/CalculatorSettingsScreen.kt | 1 - .../settings/converter/ConverterSettingsScreen.kt | 3 --- .../unitto/feature/settings/display/DisplayScreen.kt | 6 ------ 6 files changed, 2 insertions(+), 28 deletions(-) diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt index 1da7144d..6b8f2d04 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt @@ -100,7 +100,7 @@ fun UnittoListItem( headlineText: String, supportingText: String? = null, icon: ImageVector, - iconDescription: String, + iconDescription: String = headlineText, trailing: @Composable (() -> Unit)? = null, ) = UnittoListItem( modifier = modifier, @@ -122,7 +122,7 @@ fun UnittoListItem( modifier: Modifier = Modifier, headlineText: String, icon: ImageVector, - iconDescription: String, + iconDescription: String = headlineText, supportingText: String? = null, switchState: Boolean, onSwitchChange: (Boolean) -> Unit @@ -201,7 +201,6 @@ fun PreviewUnittoListItem1() { supportingText = "Support text support text support text support text", modifier = Modifier, onSwitchChange = {}, - iconDescription = "", switchState = true, ) } diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt index 52d9cc05..6e08a4d3 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt @@ -114,7 +114,6 @@ private fun SettingsScreen( ) { UnittoListItem( icon = Icons.Default.Palette, - iconDescription = stringResource(R.string.settings_display), headlineText = stringResource(R.string.settings_display), supportingText = stringResource(R.string.settings_display_support), modifier = Modifier.clickable { navControllerAction(displayRoute) } @@ -122,7 +121,6 @@ private fun SettingsScreen( UnittoListItem( icon = Icons.Default.Home, - iconDescription = stringResource(R.string.settings_starting_screen), headlineText = stringResource(R.string.settings_starting_screen), supportingText = stringResource(R.string.settings_starting_screen_support), modifier = Modifier.clickable { navControllerAction(startingScreenRoute) } @@ -130,7 +128,6 @@ private fun SettingsScreen( UnittoListItem( icon = Icons.Default._123, - iconDescription = stringResource(R.string.settings_formatting), headlineText = stringResource(R.string.settings_formatting), supportingText = stringResource(R.string.settings_formatting_support), modifier = Modifier.clickable { navControllerAction(formattingRoute) } @@ -138,7 +135,6 @@ private fun SettingsScreen( UnittoListItem( icon = Icons.Default.Calculate, - iconDescription = stringResource(R.string.calculator_title), headlineText = stringResource(R.string.calculator_title), supportingText = stringResource(R.string.settings_calculator_support), modifier = Modifier.clickable { navControllerAction(calculatorSettingsRoute) } @@ -146,7 +142,6 @@ private fun SettingsScreen( UnittoListItem( icon = Icons.Default.SwapHoriz, - iconDescription = stringResource(R.string.unit_converter_title), headlineText = stringResource(R.string.unit_converter_title), supportingText = stringResource(R.string.settings_converter_support), modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) } @@ -156,7 +151,6 @@ private fun SettingsScreen( UnittoListItem( icon = Icons.Default.Vibration, - iconDescription = stringResource(R.string.settings_vibrations), headlineText = stringResource(R.string.settings_vibrations), supportingText = stringResource(R.string.settings_vibrations_support), modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) }, @@ -172,7 +166,6 @@ private fun SettingsScreen( UnittoListItem( headlineText = stringResource(R.string.settings_clear_cache), icon = Icons.Default.Cached, - iconDescription = stringResource(R.string.settings_clear_cache), modifier = Modifier.clickable { clearCache(); showToast(mContext, "👌") }, ) } @@ -180,7 +173,6 @@ private fun SettingsScreen( if (BuildConfig.STORE_LINK.isNotEmpty()) { UnittoListItem( icon = Icons.Default.RateReview, - iconDescription = stringResource(R.string.settings_rate_this_app), headlineText = stringResource(R.string.settings_rate_this_app), modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) } ) @@ -188,7 +180,6 @@ private fun SettingsScreen( UnittoListItem( icon = Icons.Default.Info, - iconDescription = stringResource(R.string.settings_about_unitto), headlineText = stringResource(R.string.settings_about_unitto), supportingText = stringResource(R.string.settings_about_unitto_support), modifier = Modifier.clickable { navControllerAction(aboutRoute) } diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt index 2d693864..46a5a6e1 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt @@ -93,7 +93,6 @@ private fun AboutScreen( item { UnittoListItem( icon = Icons.AutoMirrored.Filled.Help, - iconDescription = stringResource(R.string.settings_currency_rates_note_title), headlineText = stringResource(R.string.settings_currency_rates_note_title), modifier = Modifier.clickable { showDialog = true } ) @@ -103,7 +102,6 @@ private fun AboutScreen( item { UnittoListItem( icon = Icons.Default.PrivacyTip, - iconDescription = stringResource(R.string.settings_terms_and_conditions), headlineText = stringResource(R.string.settings_terms_and_conditions), modifier = Modifier.clickable { openLink( @@ -118,7 +116,6 @@ private fun AboutScreen( item { UnittoListItem( icon = Icons.Default.Policy, - iconDescription = stringResource(R.string.settings_privacy_policy), headlineText = stringResource(R.string.settings_privacy_policy), modifier = Modifier.clickable { openLink( @@ -133,7 +130,6 @@ private fun AboutScreen( item { UnittoListItem( icon = Icons.Default.Code, - iconDescription = stringResource(R.string.settings_view_source_code), headlineText = stringResource(R.string.settings_view_source_code), modifier = Modifier.clickable { openLink( @@ -148,7 +144,6 @@ private fun AboutScreen( item { UnittoListItem( icon = Icons.Default.Copyright, - iconDescription = stringResource(R.string.settings_third_party_licenses), headlineText = stringResource(R.string.settings_third_party_licenses), modifier = Modifier.clickable { navigateToThirdParty() } ) @@ -158,7 +153,6 @@ private fun AboutScreen( item { UnittoListItem( icon = Icons.Default.Info, - iconDescription = stringResource(R.string.settings_version_name), headlineText = stringResource(R.string.settings_version_name), supportingText = "${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})", modifier = Modifier.combinedClickable { diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt index 1674c6c7..290e5b20 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt @@ -67,7 +67,6 @@ private fun CalculatorSettingsScreen( UnittoListItem( headlineText = stringResource(R.string.settings_partial_history_view), icon = Icons.Default.Timer, - iconDescription = stringResource(R.string.settings_partial_history_view), supportingText = stringResource(R.string.settings_partial_history_view_support), switchState = prefs.partialHistoryView, onSwitchChange = updatePartialHistoryView diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt index 0fa6c17c..368c9d0c 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt @@ -84,7 +84,6 @@ private fun ConverterSettingsScreen( item("unit group") { UnittoListItem( icon = Icons.AutoMirrored.Filled.Rule, - iconDescription = stringResource(R.string.settings_unit_groups_title), headlineText = stringResource(R.string.settings_unit_groups_title), supportingText = stringResource(R.string.settings_unit_groups_support), modifier = Modifier.clickable { navigateToUnitsGroup() } @@ -94,7 +93,6 @@ private fun ConverterSettingsScreen( item("units sorting") { UnittoListItem( icon = Icons.AutoMirrored.Filled.Sort, - iconDescription = stringResource(R.string.settings_units_sorting), headlineText = stringResource(R.string.settings_units_sorting), supportingText = stringResource(R.string.settings_units_sorting_support), modifier = Modifier.clickable { showDialog = true } @@ -104,7 +102,6 @@ private fun ConverterSettingsScreen( item("format time") { UnittoListItem( icon = Icons.Default.Timer, - iconDescription = stringResource(R.string.settings_format_time), headlineText = stringResource(R.string.settings_format_time), supportingText = stringResource(R.string.settings_format_time_support), switchState = prefs.unitConverterFormatTime, diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt index 77209105..55558398 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt @@ -201,7 +201,6 @@ private fun DisplayScreen( ) { UnittoListItem( icon = Icons.Default.DarkMode, - iconDescription = stringResource(R.string.settings_amoled_dark), headlineText = stringResource(R.string.settings_amoled_dark), supportingText = stringResource(R.string.settings_amoled_dark_support), switchState = isAmoledThemeEnabled, @@ -212,7 +211,6 @@ private fun DisplayScreen( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { UnittoListItem( icon = Icons.Default.Colorize, - iconDescription = stringResource(R.string.settings_dynamic_colors), headlineText = stringResource(R.string.settings_dynamic_colors), supportingText = stringResource(R.string.settings_dynamic_colors_support), switchState = isDynamicThemeEnabled, @@ -265,7 +263,6 @@ private fun DisplayScreen( UnittoListItem( icon = Icons.Default.FontDownload, - iconDescription = stringResource(R.string.settings_system_font), headlineText = stringResource(R.string.settings_system_font), supportingText = stringResource(R.string.settings_system_font_support), switchState = systemFont, @@ -274,7 +271,6 @@ private fun DisplayScreen( UnittoListItem( icon = UnittoIcons.Clear, - iconDescription = stringResource(R.string.settings_middle_zero), headlineText = stringResource(R.string.settings_ac_button), supportingText = stringResource(R.string.settings_ac_button_support), switchState = acButton, @@ -283,7 +279,6 @@ private fun DisplayScreen( UnittoListItem( icon = Icons.Default.ExposureZero, - iconDescription = stringResource(R.string.settings_middle_zero), headlineText = stringResource(R.string.settings_middle_zero), supportingText = stringResource(R.string.settings_middle_zero_support), switchState = middleZero, @@ -292,7 +287,6 @@ private fun DisplayScreen( UnittoListItem( icon = Icons.Default.Language, - iconDescription = stringResource(R.string.settings_language), headlineText = stringResource(R.string.settings_language), supportingText = stringResource(R.string.settings_language_support), modifier = Modifier.clickable { navigateToLanguages() }