From fb123d697e6ff53dea0bb797c9c5d61abff76441 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sat, 13 Aug 2022 23:57:43 +0300 Subject: [PATCH] Little code clean up --- .../unitto/screens/common/NavigateUpButton.kt | 2 +- .../unitto/screens/main/MainScreen.kt | 2 +- .../screens/main/components/MyTextField.kt | 4 ++-- .../screens/main/components/TopScreen.kt | 4 ++-- .../unitto/screens/second/SecondScreen.kt | 2 +- .../screens/second/components/ChipsRow.kt | 6 ++--- .../screens/second/components/SearchBar.kt | 6 ++--- .../second/components/SearchPlaceholder.kt | 8 +++---- .../screens/second/components/UnitListItem.kt | 8 +++---- .../unitto/screens/setttings/AboutScreen.kt | 2 +- .../screens/setttings/SettingsScreen.kt | 22 +++++++++---------- .../screens/setttings/UnitGroupsScreen.kt | 10 ++++----- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/sadellie/unitto/screens/common/NavigateUpButton.kt b/app/src/main/java/com/sadellie/unitto/screens/common/NavigateUpButton.kt index 52b6210d..8d038e3c 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/common/NavigateUpButton.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/common/NavigateUpButton.kt @@ -36,7 +36,7 @@ fun NavigateUpButton(onClick: () -> Unit) { IconButton(onClick = onClick) { Icon( Icons.Outlined.ArrowBack, - contentDescription = stringResource(id = R.string.navigate_up_description) + contentDescription = stringResource(R.string.navigate_up_description) ) } } diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt index f3fd81bc..e27d7693 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt @@ -69,7 +69,7 @@ fun MainScreen( IconButton(onClick = { navControllerAction(SETTINGS_SCREEN) }) { Icon( Icons.Outlined.MoreVert, - contentDescription = stringResource(id = R.string.open_settings_description) + contentDescription = stringResource(R.string.open_settings_description) ) } }, diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/components/MyTextField.kt b/app/src/main/java/com/sadellie/unitto/screens/main/components/MyTextField.kt index 33524f7b..743193e2 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/main/components/MyTextField.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/main/components/MyTextField.kt @@ -68,8 +68,8 @@ fun MyTextField( val clipboardManager = LocalClipboardManager.current val mc = LocalContext.current val textToShow = when { - showError -> stringResource(id = R.string.error_label) - showLoading -> stringResource(id = R.string.loading_label) + showError -> stringResource(R.string.error_label) + showLoading -> stringResource(R.string.loading_label) else -> Formatter.format(currentText) } val copiedText: String = stringResource(R.string.copied, textToShow) diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt index fb79f018..633b5d5f 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt @@ -87,14 +87,14 @@ fun TopScreenPart( MyTextField( Modifier.fillMaxWidth(), inputValue, - stringResource(id = if (loadingDatabase) R.string.loading_label else unitFrom.shortName), + stringResource(if (loadingDatabase) R.string.loading_label else unitFrom.shortName), loadingNetwork, networkError ) MyTextField( Modifier.fillMaxWidth(), outputValue, - stringResource(id = if (loadingDatabase) R.string.loading_label else unitTo.shortName), + stringResource(if (loadingDatabase) R.string.loading_label else unitTo.shortName), loadingNetwork, networkError ) diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt index 03cd38e9..567c0f7b 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt @@ -107,7 +107,7 @@ private fun BasicUnitListScreen( return@LazyColumn } uiState.unitsToShow.forEach { (unitGroup, listOfUnits) -> - item { Header(text = stringResource(id = unitGroup.res)) } + item { Header(text = stringResource(unitGroup.res)) } items(items = listOfUnits, key = { it.unitId }) { unit -> unitsListItem(unit) { selectAction(it) diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt index 1f8fc296..34b6b62e 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt @@ -82,12 +82,12 @@ fun ChipsRow( Icon( modifier = Modifier.height(18.dp), imageVector = Icons.Default.Check, - contentDescription = stringResource(id = R.string.checked_filter_description) + contentDescription = stringResource(R.string.checked_filter_description) ) } Text( modifier = Modifier.padding(start = 8.dp), - text = stringResource(id = item.res), + text = stringResource(item.res), style = MaterialTheme.typography.labelLarge, color = if (isSelected) MaterialTheme.colorScheme.onSecondaryContainer else MaterialTheme.colorScheme.onSurfaceVariant ) @@ -108,7 +108,7 @@ fun ChipsRow( Icon( modifier = Modifier.height(18.dp), imageVector = Icons.Default.Settings, - contentDescription = stringResource(id = R.string.open_settings_description) + contentDescription = stringResource(R.string.open_settings_description) ) } } diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt index 61415436..f00a0417 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt @@ -200,7 +200,7 @@ private fun SearchTextField( innerTextField() Text( modifier = Modifier.alpha(0.7f), - text = stringResource(id = R.string.search_bar_placeholder), + text = stringResource(R.string.search_bar_placeholder), style = MaterialTheme.typography.titleLarge, color = MaterialTheme.colorScheme.onSurface ) @@ -218,7 +218,7 @@ private fun SearchButton( IconButton(onClick) { Icon( Icons.Default.Search, - contentDescription = stringResource(id = R.string.search_button_description) + contentDescription = stringResource(R.string.search_button_description) ) } } @@ -237,7 +237,7 @@ private fun FavoritesButton( ) { Icon( if (favoritesOnly) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, - contentDescription = stringResource(id = R.string.favorite_button_description) + contentDescription = stringResource(R.string.favorite_button_description) ) } } diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchPlaceholder.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchPlaceholder.kt index 3522c7da..6da17e59 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchPlaceholder.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchPlaceholder.kt @@ -54,24 +54,24 @@ fun SearchPlaceholder(navigateToSettingsActtion: () -> Unit) { // Big icon in the middle Icon( Icons.Default.SearchOff, - contentDescription = stringResource(id = R.string.empty_search_result_description), + contentDescription = stringResource(R.string.empty_search_result_description), modifier = Modifier.size(48.dp) ) // Primary text Text( - text = stringResource(id = R.string.search_placeholder), + text = stringResource(R.string.search_placeholder), textAlign = TextAlign.Center, style = MaterialTheme.typography.bodyLarge ) // Secondary text with tips Text( - text = stringResource(id = R.string.search_placeholder_secondary), + text = stringResource(R.string.search_placeholder_secondary), textAlign = TextAlign.Center, style = MaterialTheme.typography.bodySmall ) // Open settings button ElevatedButton(onClick = navigateToSettingsActtion) { - Text(text = stringResource(id = R.string.search_placeholder_button_label)) + Text(text = stringResource(R.string.search_placeholder_button_label)) } } } diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt index f66eb6ec..d0ad08f1 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt @@ -84,7 +84,7 @@ private fun BasicUnitListItem( RoundedCornerShape(24.dp) ), paddingValues = PaddingValues(horizontal = 12.dp, vertical = 8.dp), - label = stringResource(id = unit.displayName), + label = stringResource(unit.displayName), supportText = shortNameLabel, trailingItem = { AnimatedContent( @@ -101,7 +101,7 @@ private fun BasicUnitListItem( ) { Icon( if (unit.isFavorite) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, - contentDescription = stringResource(id = R.string.favorite_button_description) + contentDescription = stringResource(R.string.favorite_button_description) ) } } @@ -128,7 +128,7 @@ fun UnitListItem( isSelected = isSelected, selectAction = selectAction, favoriteAction = favoriteAction, - shortNameLabel = stringResource(id = unit.shortName) + shortNameLabel = stringResource(unit.shortName) ) /** @@ -152,5 +152,5 @@ fun UnitListItem( isSelected = isSelected, selectAction = selectAction, favoriteAction = favoriteAction, - shortNameLabel = "${convertValue(unit)} ${stringResource(id = unit.shortName)}" + shortNameLabel = "${convertValue(unit)} ${stringResource(unit.shortName)}" ) diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/AboutScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/AboutScreen.kt index dd41e44a..8b40da7c 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/AboutScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/AboutScreen.kt @@ -54,7 +54,7 @@ fun AboutScreen( val mContext = LocalContext.current UnittoLargeTopAppBar( - title = stringResource(id = R.string.third_party_licenses), + title = stringResource(R.string.third_party_licenses), navigateUpAction = navigateUpAction ) { padding -> LazyColumn( diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt index b70a18fa..359bb0e9 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt @@ -52,7 +52,7 @@ fun SettingsScreen( } UnittoLargeTopAppBar( - title = stringResource(id = R.string.settings_screen), + title = stringResource(R.string.settings_screen), navigateUpAction = navigateUpAction ) { padding -> LazyColumn(contentPadding = padding) { @@ -63,7 +63,7 @@ fun SettingsScreen( // THEME item { UnittoListItem( - label = stringResource(id = R.string.unit_groups_setting), + label = stringResource(R.string.unit_groups_setting), onClick = { navControllerAction(UNIT_GROUPS_SCREEN) } ) } @@ -173,7 +173,7 @@ fun SettingsScreen( // APP VERSION item { UnittoListItem( - label = stringResource(id = R.string.app_version_name_setting), + label = stringResource(R.string.app_version_name_setting), supportText = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})", onClick = {} ) @@ -192,17 +192,17 @@ fun SettingsScreen( when (dialogState) { DialogState.PRECISION -> { AlertDialogWithList( - title = stringResource(id = R.string.precision_setting), + title = stringResource(R.string.precision_setting), listItems = PRECISIONS, selectedItemIndex = viewModel.userPrefs.digitsPrecision, selectAction = { viewModel.updatePrecision(it) }, dismissAction = { resetDialog() }, - supportText = stringResource(id = R.string.precision_setting_info) + supportText = stringResource(R.string.precision_setting_info) ) } DialogState.SEPARATOR -> { AlertDialogWithList( - title = stringResource(id = R.string.separator_setting), + title = stringResource(R.string.separator_setting), listItems = SEPARATORS, selectedItemIndex = viewModel.userPrefs.separator, selectAction = { viewModel.updateSeparator(it) }, @@ -211,20 +211,20 @@ fun SettingsScreen( } DialogState.OUTPUT_FORMAT -> { AlertDialogWithList( - title = stringResource(id = R.string.output_format_setting), + title = stringResource(R.string.output_format_setting), listItems = OUTPUT_FORMAT, selectedItemIndex = viewModel.userPrefs.outputFormat, selectAction = { viewModel.updateOutputFormat(it) }, dismissAction = { resetDialog() }, - supportText = stringResource(id = R.string.output_format_setting_info) + supportText = stringResource(R.string.output_format_setting_info) ) } DialogState.CURRENCY_RATE -> { AlertDialogWithList( - title = stringResource(id = R.string.currency_rates_note_title), + title = stringResource(R.string.currency_rates_note_title), dismissAction = { resetDialog() }, - supportText = stringResource(id = R.string.currency_rates_note_text), - dismissButtonLabel = stringResource(id = R.string.ok_label) + supportText = stringResource(R.string.currency_rates_note_text), + dismissButtonLabel = stringResource(R.string.ok_label) ) } // Dismissing alert dialog diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt index da45f735..79f3b22a 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt @@ -76,7 +76,7 @@ fun UnitGroupsScreen( .reorderable(state) ) { item(key = "enabled") { - Header(text = stringResource(id = R.string.enabled_label)) + Header(text = stringResource(R.string.enabled_label)) } items(shownUnits.value, { it }) { item -> @@ -97,7 +97,7 @@ fun UnitGroupsScreen( leadingItem = { Icon( Icons.Default.RemoveCircle, - stringResource(id = R.string.disable_unit_group_description), + stringResource(R.string.disable_unit_group_description), tint= MaterialTheme.colorScheme.outline, modifier = Modifier.clickable( interactionSource = remember { MutableInteractionSource() }, @@ -109,7 +109,7 @@ fun UnitGroupsScreen( trailingItem = { Icon( Icons.Default.DragIndicator, - stringResource(id = R.string.reorder_unit_group_description), + stringResource(R.string.reorder_unit_group_description), tint= MaterialTheme.colorScheme.outline, modifier = Modifier .clickable( @@ -126,7 +126,7 @@ fun UnitGroupsScreen( item(key = "disabled") { Header( - text = stringResource(id = R.string.disabled_label), + text = stringResource(R.string.disabled_label), modifier = Modifier.animateItemPlacement() ) } @@ -141,7 +141,7 @@ fun UnitGroupsScreen( trailingItem = { Icon( Icons.Default.AddCircleOutline, - stringResource(id = R.string.enable_unit_group_description), + stringResource(R.string.enable_unit_group_description), tint= MaterialTheme.colorScheme.outline, modifier = Modifier.clickable( interactionSource = remember { MutableInteractionSource() },