Exclude `ContentToPreview` from coverage, either by using annotation @ExcludeFromCoverage, or by inlining it.

app/build.gradle.kts

@@ -288,6 +288,8 @@ koverReport {
                 "io.element.android.libraries.designsystem.theme.components.bottomsheet.*",
             )
             annotatedBy(
+                "androidx.compose.ui.tooling.preview.Preview",
+                "io.element.android.libraries.architecture.coverage.ExcludeFromCoverage",
                 "io.element.android.libraries.designsystem.preview.PreviewsDayNight",
                 "io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight",
             )

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchMultipleUsersResultItem.kt

@@ -57,10 +57,7 @@ fun SearchMultipleUsersResultItem(
 
 @Preview
 @Composable
-internal fun SearchMultipleUsersResultItemPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun SearchMultipleUsersResultItemPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     Column {
         SearchMultipleUsersResultItem(
             searchResult = UserSearchResult(

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchSingleUserResultItem.kt

@@ -53,10 +53,7 @@ fun SearchSingleUserResultItem(
 
 @Preview
 @Composable
-internal fun SearchSingleUserResultItemPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun SearchSingleUserResultItemPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     Column {
         SearchSingleUserResultItem(
             searchResult = UserSearchResult(aMatrixUser(), isUnresolved = false),

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/coverage/ExcludeFromCoverage.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.architecture.coverage
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
+annotation class ExcludeFromCoverage

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt

@@ -171,11 +171,7 @@ fun AnnotatedString.linkify(linkStyle: SpanStyle): AnnotatedString {
 
 @Preview(group = PreviewGroup.Text)
 @Composable
-internal fun ClickableLinkTextPreview() =
+internal fun ClickableLinkTextPreview() = ElementThemedPreview {
-    ElementThemedPreview { ContentToPreview() }
-
-@Composable
-private fun ContentToPreview() {
     ClickableLinkText(
         annotatedString = AnnotatedString("Hello", ParagraphStyle()),
         linkAnnotationTag = "",
@@ -184,4 +180,3 @@ private fun ContentToPreview() {
         interactionSource = remember { MutableInteractionSource() },
     )
 }
-

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt

@@ -54,10 +54,7 @@ fun LabelledCheckbox(
 
 @Preview(group = PreviewGroup.Toggles)
 @Composable
-internal fun LabelledCheckboxPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun LabelledCheckboxPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     LabelledCheckbox(
         checked = true,
         onCheckedChange = {},

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt

@@ -141,10 +141,7 @@ private fun ProgressDialogContent(
 
 @Preview(group = PreviewGroup.Dialogs)
 @Composable
-internal fun ProgressDialogPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun ProgressDialogPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     DialogPreview {
         ProgressDialogContent(text = "test dialog content", isCancellable = true)
     }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt

@@ -68,10 +68,7 @@ private fun PreferenceCategoryTitle(title: String, modifier: Modifier = Modifier
 
 @Preview(group = PreviewGroup.Preferences)
 @Composable
-internal fun PreferenceCategoryPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun PreferenceCategoryPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     PreferenceCategory(
         title = "Category title",
     ) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt

@@ -95,10 +95,7 @@ fun PreferenceCheckbox(
 
 @Preview(group = PreviewGroup.Preferences)
 @Composable
-internal fun PreferenceCheckboxPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun PreferenceCheckboxPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     Column {
         PreferenceCheckbox(
             title = "Checkbox",

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDivider.kt

@@ -36,9 +36,6 @@ fun PreferenceDivider(
 
 @Preview(group = PreviewGroup.Preferences)
 @Composable
-internal fun PreferenceDividerPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun PreferenceDividerPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     PreferenceDivider()
 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceRow.kt

@@ -50,10 +50,7 @@ fun PreferenceRow(
 
 @Preview(group = PreviewGroup.Preferences)
 @Composable
-internal fun PreferenceRowPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun PreferenceRowPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     PreferenceRow {
         Text(text = "Content")
     }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt

@@ -90,10 +90,7 @@ fun PreferenceSlide(
 
 @Preview(group = PreviewGroup.Preferences)
 @Composable
-internal fun PreferenceSlidePreview() = ElementThemedPreview { ContentToPreview() }
+internal fun PreferenceSlidePreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     PreferenceSlide(
         iconResourceId = CompoundDrawables.ic_user_profile,
         title = "Slide",

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt

@@ -102,10 +102,7 @@ fun PreferenceSwitch(
 
 @Preview(group = PreviewGroup.Preferences)
 @Composable
-internal fun PreferenceSwitchPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun PreferenceSwitchPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     PreferenceSwitch(
         title = "Switch",
         subtitle = "Subtitle Switch",

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt

@@ -90,10 +90,7 @@ private fun compoundErrorCheckBoxColors(): CheckboxColors {
 
 @Preview(group = PreviewGroup.Toggles)
 @Composable
-internal fun CheckboxesPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
+internal fun CheckboxesPreview() = ElementThemedPreview(vertical = false) {
-
-@Composable
-private fun ContentToPreview() {
     Column {
         // Unchecked
         Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt

@@ -69,10 +69,7 @@ fun CircularProgressIndicator(
 
 @Preview(group = PreviewGroup.Progress)
 @Composable
-internal fun CircularProgressIndicatorPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
+internal fun CircularProgressIndicatorPreview() = ElementThemedPreview(vertical = false) {
-
-@Composable
-private fun ContentToPreview() {
     Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
         // Indeterminate progress
         CircularProgressIndicator(

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt

@@ -78,10 +78,7 @@ internal object DropDownMenuItemDefaults {
 
 @Preview(group = PreviewGroup.Menus)
 @Composable
-internal fun DropdownMenuItemPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun DropdownMenuItemPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     Column {
         DropdownMenuItem(
             text = { Text(text = "Item") },

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt

@@ -59,11 +59,7 @@ fun FloatingActionButton(
 
 @Preview(group = PreviewGroup.FABs)
 @Composable
-internal fun FloatingActionButtonPreview() =
+internal fun FloatingActionButtonPreview() = ElementThemedPreview {
-    ElementThemedPreview { ContentToPreview() }
-
-@Composable
-private fun ContentToPreview() {
     Box(modifier = Modifier.padding(8.dp)) {
         FloatingActionButton(onClick = {}) {
             Icon(imageVector = CompoundIcons.Close, contentDescription = null)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalDivider.kt

@@ -50,11 +50,6 @@ object ElementDividerDefaults {
 @Composable
 internal fun HorizontalDividerPreview() = ElementThemedPreview {
     Box(Modifier.padding(vertical = 10.dp), contentAlignment = Alignment.Center) {
-        ContentToPreview()
-    }
-}
-
-@Composable
-private fun ContentToPreview() {
         HorizontalDivider()
     }
+}

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt

@@ -140,10 +140,6 @@ fun Icon(
 
 @Preview(group = PreviewGroup.Icons)
 @Composable
-internal fun IconImageVectorPreview() =
+internal fun IconImageVectorPreview() = ElementThemedPreview {
-    ElementThemedPreview { ContentToPreview() }
-
-@Composable
-private fun ContentToPreview() {
     Icon(imageVector = CompoundIcons.Close, contentDescription = null)
 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt

@@ -58,11 +58,7 @@ fun IconButton(
 
 @Preview(group = PreviewGroup.Buttons)
 @Composable
-internal fun IconButtonPreview() =
+internal fun IconButtonPreview() = ElementThemedPreview {
-    ElementThemedPreview { ContentToPreview() }
-
-@Composable
-private fun ContentToPreview() {
     Column {
         CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconPrimary) {
             Row {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt

@@ -59,10 +59,7 @@ fun IconToggleButton(
 
 @Preview(group = PreviewGroup.Toggles)
 @Composable
-internal fun IconToggleButtonPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
+internal fun IconToggleButtonPreview() = ElementThemedPreview(vertical = false) {
-
-@Composable
-private fun ContentToPreview() {
     var checked by remember { mutableStateOf(false) }
     Column {
         Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt

@@ -74,10 +74,7 @@ fun LinearProgressIndicator(
 
 @Preview(group = PreviewGroup.Progress)
 @Composable
-internal fun LinearProgressIndicatorPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
+internal fun LinearProgressIndicatorPreview() = ElementThemedPreview(vertical = false) {
-
-@Composable
-private fun ContentToPreview() {
     Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
         // Indeterminate progress
         LinearProgressIndicator(

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt

@@ -59,14 +59,10 @@ fun MediumTopAppBar(
     )
 }
 
-@Preview(group = PreviewGroup.AppBars)
-@Composable
-internal fun MediumTopAppBarPreview() =
-    ElementThemedPreview { ContentToPreview() }
-
 @OptIn(ExperimentalMaterial3Api::class)
+@Preview(group = PreviewGroup.AppBars)
 @Composable
-private fun ContentToPreview() {
+internal fun MediumTopAppBarPreview() = ElementThemedPreview {
     MediumTopAppBar(
         title = { Text(text = "Title") },
         navigationIcon = { BackButton(onClick = {}) },

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt

@@ -39,6 +39,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 import io.element.android.libraries.designsystem.preview.sheetStateForPreview
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -93,6 +94,7 @@ internal fun ModalBottomSheetDarkPreview() =
     ElementPreviewDark { ContentToPreview() }
 
 @OptIn(ExperimentalMaterial3Api::class)
+@ExcludeFromCoverage
 @Composable
 private fun ContentToPreview() {
     Box(

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheetLayout.kt

@@ -47,6 +47,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.modifiers.applyIf
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
@@ -110,6 +111,7 @@ internal fun ModalBottomSheetLayoutDarkPreview() =
     ElementPreviewDark { ContentToPreview() }
 
 @OptIn(ExperimentalMaterialApi::class)
+@ExcludeFromCoverage
 @Composable
 private fun ContentToPreview() {
     ModalBottomSheetLayout(

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/OutlinedTextField.kt

@@ -43,6 +43,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewGroup
@@ -166,6 +167,7 @@ internal fun OutlinedTextFieldsPreview() = ElementPreviewLight { ContentToPrevie
 internal fun OutlinedTextFieldsDarkPreview() = ElementPreviewDark { ContentToPreview() }
 
 @Composable
+@ExcludeFromCoverage
 private fun ContentToPreview() {
     Column(modifier = Modifier.padding(4.dp)) {
         allBooleans.forEach { isError ->

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt

@@ -66,10 +66,7 @@ internal fun compoundRadioButtonColors(): RadioButtonColors {
 
 @Preview(group = PreviewGroup.Toggles)
 @Composable
-internal fun RadioButtonPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
+internal fun RadioButtonPreview() = ElementThemedPreview(vertical = false) {
-
-@Composable
-private fun ContentToPreview() {
     var checked by remember { mutableStateOf(false) }
     Column {
         Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt

@@ -58,10 +58,7 @@ fun Slider(
 
 @Preview(group = PreviewGroup.Sliders)
 @Composable
-internal fun SlidersPreview() = ElementThemedPreview { ContentToPreview() }
+internal fun SlidersPreview() = ElementThemedPreview {
-
-@Composable
-private fun ContentToPreview() {
     var value by remember { mutableFloatStateOf(0.33f) }
     Column {
         Slider(onValueChange = { value = it }, value = value, enabled = true)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Surface.kt

@@ -56,11 +56,7 @@ fun Surface(
 
 @Preview
 @Composable
-internal fun SurfacePreview() =
+internal fun SurfacePreview() = ElementThemedPreview {
-    ElementThemedPreview { ContentToPreview() }
-
-@Composable
-private fun ContentToPreview() {
     Surface {
         Spacer(modifier = Modifier.size(64.dp))
     }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt

@@ -42,6 +42,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.utils.toHrf
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewGroup
@@ -120,6 +121,7 @@ internal fun TextLightPreview() = ElementPreviewLight { ContentToPreview() }
 @Composable
 internal fun TextDarkPreview() = ElementPreviewDark { ContentToPreview() }
 
+@ExcludeFromCoverage
 @Composable
 private fun ContentToPreview() {
     val colors = mapOf(

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TextField.kt

@@ -44,6 +44,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewGroup
@@ -154,6 +155,7 @@ internal fun TextFieldLightPreview() =
 internal fun TextFieldDarkPreview() =
     ElementPreviewDark { ContentToPreview() }
 
+@ExcludeFromCoverage
 @Composable
 private fun ContentToPreview() {
     Column(modifier = Modifier.padding(4.dp)) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TopAppBar.kt

@@ -59,14 +59,10 @@ fun TopAppBar(
     )
 }
 
-@Preview(group = PreviewGroup.AppBars)
-@Composable
-internal fun TopAppBarPreview() =
-    ElementThemedPreview { ContentToPreview() }
-
 @OptIn(ExperimentalMaterial3Api::class)
+@Preview(group = PreviewGroup.AppBars)
 @Composable
-private fun ContentToPreview() {
+internal fun TopAppBarPreview() = ElementThemedPreview {
     TopAppBar(
         title = { Text(text = "Title") },
         navigationIcon = { BackButton(onClick = {}) },

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/DatePickerPreview.kt

@@ -23,6 +23,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.rememberDatePickerState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.theme.components.AlertDialogContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
@@ -41,6 +42,7 @@ internal fun DatePickerDarkPreview() {
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
+@ExcludeFromCoverage
 @Composable
 private fun ContentToPreview() {
     val state = rememberDatePickerState(