Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 00:35:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Default icon description for list items

Browse Source
This commit is contained in:
Sad Ellie 2023-10-11 23:25:13 +03:00
parent fb1b7fab2b
commit a9dfcc03f9
6 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt
View File

@ -100,7 +100,7 @@ fun UnittoListItem(
headlineText: String, headlineText: String,
supportingText: String? = null, supportingText: String? = null,
icon: ImageVector, icon: ImageVector,
iconDescription: String, iconDescription: String = headlineText,
trailing: @Composable (() -> Unit)? = null, trailing: @Composable (() -> Unit)? = null,
) = UnittoListItem( ) = UnittoListItem(
modifier = modifier, modifier = modifier,
@ -122,7 +122,7 @@ fun UnittoListItem(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
headlineText: String, headlineText: String,
icon: ImageVector, icon: ImageVector,
iconDescription: String, iconDescription: String = headlineText,
supportingText: String? = null, supportingText: String? = null,
switchState: Boolean, switchState: Boolean,
onSwitchChange: (Boolean) -> Unit onSwitchChange: (Boolean) -> Unit
@ -201,7 +201,6 @@ fun PreviewUnittoListItem1() {
supportingText = "Support text support text support text support text", supportingText = "Support text support text support text support text",
modifier = Modifier, modifier = Modifier,
onSwitchChange = {}, onSwitchChange = {},
iconDescription = "",
switchState = true, switchState = true,
) )
} }

9
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
View File

@ -114,7 +114,6 @@ private fun SettingsScreen(
) { ) {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Palette, icon = Icons.Default.Palette,
iconDescription = stringResource(R.string.settings_display),
headlineText = stringResource(R.string.settings_display), headlineText = stringResource(R.string.settings_display),
supportingText = stringResource(R.string.settings_display_support), supportingText = stringResource(R.string.settings_display_support),
modifier = Modifier.clickable { navControllerAction(displayRoute) } modifier = Modifier.clickable { navControllerAction(displayRoute) }
@ -122,7 +121,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.Home, icon = Icons.Default.Home,
iconDescription = stringResource(R.string.settings_starting_screen),
headlineText = stringResource(R.string.settings_starting_screen), headlineText = stringResource(R.string.settings_starting_screen),
supportingText = stringResource(R.string.settings_starting_screen_support), supportingText = stringResource(R.string.settings_starting_screen_support),
modifier = Modifier.clickable { navControllerAction(startingScreenRoute) } modifier = Modifier.clickable { navControllerAction(startingScreenRoute) }
@ -130,7 +128,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default._123, icon = Icons.Default._123,
iconDescription = stringResource(R.string.settings_formatting),
headlineText = stringResource(R.string.settings_formatting), headlineText = stringResource(R.string.settings_formatting),
supportingText = stringResource(R.string.settings_formatting_support), supportingText = stringResource(R.string.settings_formatting_support),
modifier = Modifier.clickable { navControllerAction(formattingRoute) } modifier = Modifier.clickable { navControllerAction(formattingRoute) }
@ -138,7 +135,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.Calculate, icon = Icons.Default.Calculate,
iconDescription = stringResource(R.string.calculator_title),
headlineText = stringResource(R.string.calculator_title), headlineText = stringResource(R.string.calculator_title),
supportingText = stringResource(R.string.settings_calculator_support), supportingText = stringResource(R.string.settings_calculator_support),
modifier = Modifier.clickable { navControllerAction(calculatorSettingsRoute) } modifier = Modifier.clickable { navControllerAction(calculatorSettingsRoute) }
@ -146,7 +142,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.SwapHoriz, icon = Icons.Default.SwapHoriz,
iconDescription = stringResource(R.string.unit_converter_title),
headlineText = stringResource(R.string.unit_converter_title), headlineText = stringResource(R.string.unit_converter_title),
supportingText = stringResource(R.string.settings_converter_support), supportingText = stringResource(R.string.settings_converter_support),
modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) } modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) }
@ -156,7 +151,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.Vibration, icon = Icons.Default.Vibration,
iconDescription = stringResource(R.string.settings_vibrations),
headlineText = stringResource(R.string.settings_vibrations), headlineText = stringResource(R.string.settings_vibrations),
supportingText = stringResource(R.string.settings_vibrations_support), supportingText = stringResource(R.string.settings_vibrations_support),
modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) }, modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) },
@ -172,7 +166,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
headlineText = stringResource(R.string.settings_clear_cache), headlineText = stringResource(R.string.settings_clear_cache),
icon = Icons.Default.Cached, icon = Icons.Default.Cached,
iconDescription = stringResource(R.string.settings_clear_cache),
modifier = Modifier.clickable { clearCache(); showToast(mContext, "👌") }, modifier = Modifier.clickable { clearCache(); showToast(mContext, "👌") },
) )
} }
@ -180,7 +173,6 @@ private fun SettingsScreen(
if (BuildConfig.STORE_LINK.isNotEmpty()) { if (BuildConfig.STORE_LINK.isNotEmpty()) {
UnittoListItem( UnittoListItem(
icon = Icons.Default.RateReview, icon = Icons.Default.RateReview,
iconDescription = stringResource(R.string.settings_rate_this_app),
headlineText = stringResource(R.string.settings_rate_this_app), headlineText = stringResource(R.string.settings_rate_this_app),
modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) } modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) }
) )
@ -188,7 +180,6 @@ private fun SettingsScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.Info, icon = Icons.Default.Info,
iconDescription = stringResource(R.string.settings_about_unitto),
headlineText = stringResource(R.string.settings_about_unitto), headlineText = stringResource(R.string.settings_about_unitto),
supportingText = stringResource(R.string.settings_about_unitto_support), supportingText = stringResource(R.string.settings_about_unitto_support),
modifier = Modifier.clickable { navControllerAction(aboutRoute) } modifier = Modifier.clickable { navControllerAction(aboutRoute) }

6
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
View File

@ -93,7 +93,6 @@ private fun AboutScreen(
item { item {
UnittoListItem( UnittoListItem(
icon = Icons.AutoMirrored.Filled.Help, icon = Icons.AutoMirrored.Filled.Help,
iconDescription = stringResource(R.string.settings_currency_rates_note_title),
headlineText = stringResource(R.string.settings_currency_rates_note_title), headlineText = stringResource(R.string.settings_currency_rates_note_title),
modifier = Modifier.clickable { showDialog = true } modifier = Modifier.clickable { showDialog = true }
) )
@ -103,7 +102,6 @@ private fun AboutScreen(
item { item {
UnittoListItem( UnittoListItem(
icon = Icons.Default.PrivacyTip, icon = Icons.Default.PrivacyTip,
iconDescription = stringResource(R.string.settings_terms_and_conditions),
headlineText = stringResource(R.string.settings_terms_and_conditions), headlineText = stringResource(R.string.settings_terms_and_conditions),
modifier = Modifier.clickable { modifier = Modifier.clickable {
openLink( openLink(
@ -118,7 +116,6 @@ private fun AboutScreen(
item { item {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Policy, icon = Icons.Default.Policy,
iconDescription = stringResource(R.string.settings_privacy_policy),
headlineText = stringResource(R.string.settings_privacy_policy), headlineText = stringResource(R.string.settings_privacy_policy),
modifier = Modifier.clickable { modifier = Modifier.clickable {
openLink( openLink(
@ -133,7 +130,6 @@ private fun AboutScreen(
item { item {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Code, icon = Icons.Default.Code,
iconDescription = stringResource(R.string.settings_view_source_code),
headlineText = stringResource(R.string.settings_view_source_code), headlineText = stringResource(R.string.settings_view_source_code),
modifier = Modifier.clickable { modifier = Modifier.clickable {
openLink( openLink(
@ -148,7 +144,6 @@ private fun AboutScreen(
item { item {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Copyright, icon = Icons.Default.Copyright,
iconDescription = stringResource(R.string.settings_third_party_licenses),
headlineText = stringResource(R.string.settings_third_party_licenses), headlineText = stringResource(R.string.settings_third_party_licenses),
modifier = Modifier.clickable { navigateToThirdParty() } modifier = Modifier.clickable { navigateToThirdParty() }
) )
@ -158,7 +153,6 @@ private fun AboutScreen(
item { item {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Info, icon = Icons.Default.Info,
iconDescription = stringResource(R.string.settings_version_name),
headlineText = stringResource(R.string.settings_version_name), headlineText = stringResource(R.string.settings_version_name),
supportingText = "${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})", supportingText = "${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})",
modifier = Modifier.combinedClickable { modifier = Modifier.combinedClickable {

1
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt
View File

@ -67,7 +67,6 @@ private fun CalculatorSettingsScreen(
UnittoListItem( UnittoListItem(
headlineText = stringResource(R.string.settings_partial_history_view), headlineText = stringResource(R.string.settings_partial_history_view),
icon = Icons.Default.Timer, icon = Icons.Default.Timer,
iconDescription = stringResource(R.string.settings_partial_history_view),
supportingText = stringResource(R.string.settings_partial_history_view_support), supportingText = stringResource(R.string.settings_partial_history_view_support),
switchState = prefs.partialHistoryView, switchState = prefs.partialHistoryView,
onSwitchChange = updatePartialHistoryView onSwitchChange = updatePartialHistoryView

3
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt
View File

@ -84,7 +84,6 @@ private fun ConverterSettingsScreen(
item("unit group") { item("unit group") {
UnittoListItem( UnittoListItem(
icon = Icons.AutoMirrored.Filled.Rule, icon = Icons.AutoMirrored.Filled.Rule,
iconDescription = stringResource(R.string.settings_unit_groups_title),
headlineText = stringResource(R.string.settings_unit_groups_title), headlineText = stringResource(R.string.settings_unit_groups_title),
supportingText = stringResource(R.string.settings_unit_groups_support), supportingText = stringResource(R.string.settings_unit_groups_support),
modifier = Modifier.clickable { navigateToUnitsGroup() } modifier = Modifier.clickable { navigateToUnitsGroup() }
@ -94,7 +93,6 @@ private fun ConverterSettingsScreen(
item("units sorting") { item("units sorting") {
UnittoListItem( UnittoListItem(
icon = Icons.AutoMirrored.Filled.Sort, icon = Icons.AutoMirrored.Filled.Sort,
iconDescription = stringResource(R.string.settings_units_sorting),
headlineText = stringResource(R.string.settings_units_sorting), headlineText = stringResource(R.string.settings_units_sorting),
supportingText = stringResource(R.string.settings_units_sorting_support), supportingText = stringResource(R.string.settings_units_sorting_support),
modifier = Modifier.clickable { showDialog = true } modifier = Modifier.clickable { showDialog = true }
@ -104,7 +102,6 @@ private fun ConverterSettingsScreen(
item("format time") { item("format time") {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Timer, icon = Icons.Default.Timer,
iconDescription = stringResource(R.string.settings_format_time),
headlineText = stringResource(R.string.settings_format_time), headlineText = stringResource(R.string.settings_format_time),
supportingText = stringResource(R.string.settings_format_time_support), supportingText = stringResource(R.string.settings_format_time_support),
switchState = prefs.unitConverterFormatTime, switchState = prefs.unitConverterFormatTime,

6
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt
View File

@ -201,7 +201,6 @@ private fun DisplayScreen(
) { ) {
UnittoListItem( UnittoListItem(
icon = Icons.Default.DarkMode, icon = Icons.Default.DarkMode,
iconDescription = stringResource(R.string.settings_amoled_dark),
headlineText = stringResource(R.string.settings_amoled_dark), headlineText = stringResource(R.string.settings_amoled_dark),
supportingText = stringResource(R.string.settings_amoled_dark_support), supportingText = stringResource(R.string.settings_amoled_dark_support),
switchState = isAmoledThemeEnabled, switchState = isAmoledThemeEnabled,
@ -212,7 +211,6 @@ private fun DisplayScreen(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
UnittoListItem( UnittoListItem(
icon = Icons.Default.Colorize, icon = Icons.Default.Colorize,
iconDescription = stringResource(R.string.settings_dynamic_colors),
headlineText = stringResource(R.string.settings_dynamic_colors), headlineText = stringResource(R.string.settings_dynamic_colors),
supportingText = stringResource(R.string.settings_dynamic_colors_support), supportingText = stringResource(R.string.settings_dynamic_colors_support),
switchState = isDynamicThemeEnabled, switchState = isDynamicThemeEnabled,
@ -265,7 +263,6 @@ private fun DisplayScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.FontDownload, icon = Icons.Default.FontDownload,
iconDescription = stringResource(R.string.settings_system_font),
headlineText = stringResource(R.string.settings_system_font), headlineText = stringResource(R.string.settings_system_font),
supportingText = stringResource(R.string.settings_system_font_support), supportingText = stringResource(R.string.settings_system_font_support),
switchState = systemFont, switchState = systemFont,
@ -274,7 +271,6 @@ private fun DisplayScreen(
UnittoListItem( UnittoListItem(
icon = UnittoIcons.Clear, icon = UnittoIcons.Clear,
iconDescription = stringResource(R.string.settings_middle_zero),
headlineText = stringResource(R.string.settings_ac_button), headlineText = stringResource(R.string.settings_ac_button),
supportingText = stringResource(R.string.settings_ac_button_support), supportingText = stringResource(R.string.settings_ac_button_support),
switchState = acButton, switchState = acButton,
@ -283,7 +279,6 @@ private fun DisplayScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.ExposureZero, icon = Icons.Default.ExposureZero,
iconDescription = stringResource(R.string.settings_middle_zero),
headlineText = stringResource(R.string.settings_middle_zero), headlineText = stringResource(R.string.settings_middle_zero),
supportingText = stringResource(R.string.settings_middle_zero_support), supportingText = stringResource(R.string.settings_middle_zero_support),
switchState = middleZero, switchState = middleZero,
@ -292,7 +287,6 @@ private fun DisplayScreen(
UnittoListItem( UnittoListItem(
icon = Icons.Default.Language, icon = Icons.Default.Language,
iconDescription = stringResource(R.string.settings_language),
headlineText = stringResource(R.string.settings_language), headlineText = stringResource(R.string.settings_language),
supportingText = stringResource(R.string.settings_language_support), supportingText = stringResource(R.string.settings_language_support),
modifier = Modifier.clickable { navigateToLanguages() } modifier = Modifier.clickable { navigateToLanguages() }