Remove Modifier parameter in private function when only default value is used.

This will improve the code coverage metrics, and this also fixes a few potential bug, where the Modifier was used several times.
This commit is contained in:
Benoit Marty 2024-02-08 10:03:24 +01:00 committed by Benoit Marty
parent d06e5c23cb
commit b104dba845
59 changed files with 117 additions and 262 deletions

View file

@ -115,10 +115,8 @@ fun SunsetPage(
@OptIn(CoreColorToken::class)
@Composable
private fun SunsetBackground(
modifier: Modifier = Modifier,
) {
Column(modifier = modifier.fillMaxSize()) {
private fun SunsetBackground() {
Column(modifier = Modifier.fillMaxSize()) {
// The top background colors are the opposite of the current theme ones
val topBackgroundColor = if (ElementTheme.isLightTheme) {
DarkColorTokens.colorThemeBg

View file

@ -73,7 +73,6 @@ fun BlurHashAsyncImage(
@Composable
private fun BlurHashImage(
blurHash: String?,
modifier: Modifier = Modifier,
contentDescription: String? = null,
contentScale: ContentScale = ContentScale.Fit,
) {
@ -91,7 +90,7 @@ private fun BlurHashImage(
}
bitmapState.value?.let { bitmap ->
Image(
modifier = modifier.fillMaxSize(),
modifier = Modifier.fillMaxSize(),
bitmap = bitmap.asImageBitmap(),
contentScale = contentScale,
contentDescription = contentDescription

View file

@ -65,7 +65,6 @@ private fun ConfirmationDialogContent(
cancelText: String,
onSubmitClicked: () -> Unit,
onCancelClicked: () -> Unit,
modifier: Modifier = Modifier,
title: String? = null,
thirdButtonText: String? = null,
onThirdButtonClicked: () -> Unit = {},
@ -73,7 +72,6 @@ private fun ConfirmationDialogContent(
icon: @Composable (() -> Unit)? = null,
) {
SimpleAlertDialogContent(
modifier = modifier,
title = title,
content = content,
submitText = submitText,

View file

@ -51,12 +51,10 @@ fun ErrorDialog(
private fun ErrorDialogContent(
content: String,
onSubmitClicked: () -> Unit,
modifier: Modifier = Modifier,
title: String = ErrorDialogDefaults.title,
submitText: String = ErrorDialogDefaults.submitText,
) {
SimpleAlertDialogContent(
modifier = modifier,
title = title,
content = content,
submitText = submitText,

View file

@ -80,7 +80,6 @@ private fun ListDialogContent(
onSubmitClicked: () -> Unit,
cancelText: String,
submitText: String,
modifier: Modifier = Modifier,
title: String? = null,
enabled: Boolean = true,
subtitle: @Composable (() -> Unit)? = null,
@ -88,7 +87,6 @@ private fun ListDialogContent(
SimpleAlertDialogContent(
title = title,
subtitle = subtitle,
modifier = modifier,
cancelText = cancelText,
submitText = submitText,
onCancelClicked = onDismissRequest,

View file

@ -84,7 +84,6 @@ private fun MultipleSelectionDialogContent(
onConfirmClicked: (List<Int>) -> Unit,
dismissButtonTitle: String,
onDismissRequest: () -> Unit,
modifier: Modifier = Modifier,
title: String? = null,
initialSelected: ImmutableList<Int> = persistentListOf(),
subtitle: @Composable (() -> Unit)? = null,
@ -96,7 +95,6 @@ private fun MultipleSelectionDialogContent(
SimpleAlertDialogContent(
title = title,
subtitle = subtitle,
modifier = modifier,
submitText = confirmButtonTitle,
onSubmitClicked = {
onConfirmClicked(selectedOptionIndexes.toList())

View file

@ -56,13 +56,11 @@ private fun RetryDialogContent(
content: String,
onRetry: () -> Unit,
onDismiss: () -> Unit,
modifier: Modifier = Modifier,
title: String = RetryDialogDefaults.title,
retryText: String = RetryDialogDefaults.retryText,
dismissText: String = RetryDialogDefaults.dismissText,
) {
SimpleAlertDialogContent(
modifier = modifier,
title = title,
content = content,
submitText = retryText,

View file

@ -79,7 +79,6 @@ private fun SingleSelectionDialogContent(
onOptionSelected: (Int) -> Unit,
dismissButtonTitle: String,
onDismissRequest: () -> Unit,
modifier: Modifier = Modifier,
title: String? = null,
initialSelection: Int? = null,
subtitle: @Composable (() -> Unit)? = null,
@ -87,7 +86,6 @@ private fun SingleSelectionDialogContent(
SimpleAlertDialogContent(
title = title,
subtitle = subtitle,
modifier = modifier,
submitText = dismissButtonTitle,
onSubmitClicked = onDismissRequest,
applyPaddingToContents = false,

View file

@ -52,9 +52,9 @@ fun PreferenceCategory(
}
@Composable
private fun PreferenceCategoryTitle(title: String, modifier: Modifier = Modifier) {
private fun PreferenceCategoryTitle(title: String) {
Text(
modifier = modifier.padding(
modifier = Modifier.padding(
top = 20.dp,
bottom = 8.dp,
start = preferencePaddingHorizontal,

View file

@ -80,10 +80,8 @@ fun PreferencePage(
private fun PreferenceTopAppBar(
title: String,
onBackPressed: () -> Unit,
modifier: Modifier = Modifier,
) {
TopAppBar(
modifier = modifier,
navigationIcon = {
BackButton(onClick = onBackPressed)
},

View file

@ -91,7 +91,6 @@ private fun TextFieldDialog(
onDismissRequest: () -> Unit,
value: String?,
placeholder: String?,
modifier: Modifier = Modifier,
validation: (String?) -> Boolean = { true },
onValidationErrorMessage: String? = null,
autoSelectOnDisplay: Boolean = true,
@ -110,7 +109,6 @@ private fun TextFieldDialog(
onSubmit = { onSubmit(textFieldContents.text) },
onDismissRequest = onDismissRequest,
enabled = canSubmit,
modifier = modifier,
) {
item {
TextFieldListItem(

View file

@ -98,11 +98,9 @@ private fun IconsPreview(
title: String,
iconsList: ImmutableList<Int>,
iconNameTransform: (String) -> String,
modifier: Modifier = Modifier,
) = ElementPreview {
val context = LocalContext.current
Column(
modifier = modifier,
verticalArrangement = Arrangement.spacedBy(2.dp),
) {
Text(

View file

@ -55,7 +55,6 @@ internal fun SimpleAlertDialogContent(
content: String,
submitText: String,
onSubmitClicked: () -> Unit,
modifier: Modifier = Modifier,
title: String? = null,
subtitle: @Composable (() -> Unit)? = null,
destructiveSubmit: Boolean = false,
@ -67,7 +66,6 @@ internal fun SimpleAlertDialogContent(
icon: @Composable (() -> Unit)? = null,
) {
SimpleAlertDialogContent(
modifier = modifier,
icon = icon,
title = title,
subtitle = subtitle,
@ -92,7 +90,6 @@ internal fun SimpleAlertDialogContent(
internal fun SimpleAlertDialogContent(
submitText: String,
onSubmitClicked: () -> Unit,
modifier: Modifier = Modifier,
title: String? = null,
subtitle: @Composable (() -> Unit)? = null,
destructiveSubmit: Boolean = false,
@ -148,7 +145,6 @@ internal fun SimpleAlertDialogContent(
}
}
},
modifier = modifier,
title = title?.let { titleText ->
@Composable {
Text(
@ -192,11 +188,9 @@ internal fun AlertDialogContent(
iconContentColor: Color,
titleContentColor: Color,
textContentColor: Color,
modifier: Modifier = Modifier,
applyPaddingToContents: Boolean = true,
) {
Surface(
modifier = modifier,
shape = shape,
color = containerColor,
tonalElevation = tonalElevation,