Skip to content

Commit 1874455

Browse files
geoff-powellgeoff-powell
committed
Cleanup preview param
1 parent d6cf123 commit 1874455

File tree

8 files changed

+42
-336
lines changed

8 files changed

+42
-336
lines changed

‎buildSrc/build.gradle

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎buildSrc/settings.gradle

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎gradle/aarAsJar.gradle

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bytebuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "by
2525
bytebuddy-core = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
2626

2727
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
28-
composeUi-foundation = { module = "androidx.compose.foundation:foundation" }
28+
composeUi-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
2929
composeUi-material = { module = "androidx.compose.material:material", version.ref = "compose" }
3030
composeUi-uiTooling = { module = "androidx.compose.ui:ui-tooling" }
3131

‎paparazzi-annotations/api/paparazzi-annotations.api

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
11
public abstract interface annotation class app/cash/paparazzi/annotations/Paparazzi : java/lang/annotation/Annotation {
22
}
33

4+
public abstract interface class app/cash/paparazzi/annotations/PaparazziPreviewData {
5+
}
6+
7+
public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Default : app/cash/paparazzi/annotations/PaparazziPreviewData {
8+
public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
9+
public final fun component1 ()Ljava/lang/String;
10+
public final fun component2 ()Lkotlin/jvm/functions/Function0;
11+
public final fun copy (Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Default;
12+
public static synthetic fun copy$default (Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Default;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Default;
13+
public fun equals (Ljava/lang/Object;)Z
14+
public final fun getComposable ()Lkotlin/jvm/functions/Function0;
15+
public final fun getSnapshotName ()Ljava/lang/String;
16+
public fun hashCode ()I
17+
public fun toString ()Ljava/lang/String;
18+
}
19+
20+
public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Empty : app/cash/paparazzi/annotations/PaparazziPreviewData {
21+
public static final field INSTANCE Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Empty;
22+
public fun equals (Ljava/lang/Object;)Z
23+
public fun hashCode ()I
24+
public fun toString ()Ljava/lang/String;
25+
}
26+
27+
public final class app/cash/paparazzi/annotations/PaparazziPreviewData$Error : app/cash/paparazzi/annotations/PaparazziPreviewData {
28+
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
29+
public final fun component1 ()Ljava/lang/String;
30+
public final fun component2 ()Ljava/lang/String;
31+
public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;
32+
public static synthetic fun copy$default (Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/cash/paparazzi/annotations/PaparazziPreviewData$Error;
33+
public fun equals (Ljava/lang/Object;)Z
34+
public final fun getMessage ()Ljava/lang/String;
35+
public final fun getSnapshotName ()Ljava/lang/String;
36+
public fun hashCode ()I
37+
public fun toString ()Ljava/lang/String;
38+
}
39+

‎paparazzi/api/paparazzi.api

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -245,17 +245,8 @@ public final class app/cash/paparazzi/preview/ComposableSingletons$SnapshotKt {
245245
public final class app/cash/paparazzi/preview/ComposableSingletons$UtilsKt {
246246
public static final field INSTANCE Lapp/cash/paparazzi/preview/ComposableSingletons$UtilsKt;
247247
public static field lambda-1 Lkotlin/jvm/functions/Function3;
248-
public static field lambda-2 Lkotlin/jvm/functions/Function3;
249248
public fun <init> ()V
250249
public final fun getLambda-1$paparazzi ()Lkotlin/jvm/functions/Function3;
251-
public final fun getLambda-2$paparazzi ()Lkotlin/jvm/functions/Function3;
252-
}
253-
254-
public final class app/cash/paparazzi/preview/DefaultLocaleRule : org/junit/rules/TestRule {
255-
public static final field $stable I
256-
public fun <init> (Ljava/lang/String;)V
257-
public fun apply (Lorg/junit/runners/model/Statement;Lorg/junit/runner/Description;)Lorg/junit/runners/model/Statement;
258-
public final fun getLocale ()Ljava/lang/String;
259250
}
260251

261252
public class app/cash/paparazzi/preview/PaparazziValuesProvider : com/google/testing/junit/testparameterinjector/TestParameter$TestParameterValuesProvider {
@@ -265,11 +256,7 @@ public class app/cash/paparazzi/preview/PaparazziValuesProvider : com/google/tes
265256
}
266257

267258
public final class app/cash/paparazzi/preview/SnapshotKt {
268-
public static final fun deviceConfig (Lapp/cash/paparazzi/annotations/PaparazziPreviewData;Lapp/cash/paparazzi/DeviceConfig;)Lapp/cash/paparazzi/DeviceConfig;
269-
public static synthetic fun deviceConfig$default (Lapp/cash/paparazzi/annotations/PaparazziPreviewData;Lapp/cash/paparazzi/DeviceConfig;ILjava/lang/Object;)Lapp/cash/paparazzi/DeviceConfig;
270-
public static final fun flatten (Ljava/util/List;)Ljava/util/List;
271-
public static final fun locale (Lapp/cash/paparazzi/annotations/PaparazziPreviewData;)Ljava/lang/String;
272-
public static final fun snapshot (Lapp/cash/paparazzi/Paparazzi;Lapp/cash/paparazzi/annotations/PaparazziPreviewData;Ljava/lang/String;ZLkotlin/jvm/functions/Function3;)V
273-
public static synthetic fun snapshot$default (Lapp/cash/paparazzi/Paparazzi;Lapp/cash/paparazzi/annotations/PaparazziPreviewData;Ljava/lang/String;ZLkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
259+
public static final fun snapshot (Lapp/cash/paparazzi/Paparazzi;Lapp/cash/paparazzi/annotations/PaparazziPreviewData;Ljava/lang/String;Lkotlin/jvm/functions/Function3;)V
260+
public static synthetic fun snapshot$default (Lapp/cash/paparazzi/Paparazzi;Lapp/cash/paparazzi/annotations/PaparazziPreviewData;Ljava/lang/String;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
274261
}
275262

‎paparazzi/src/main/java/app/cash/paparazzi/preview/Snapshot.kt

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,25 @@
22
package app.cash.paparazzi.preview
33

44
import androidx.compose.runtime.Composable
5-
import app.cash.paparazzi.DeviceConfig
65
import app.cash.paparazzi.Paparazzi
76
import app.cash.paparazzi.annotations.PaparazziPreviewData
87
import com.google.testing.junit.testparameterinjector.TestParameter.TestParameterValuesProvider
9-
import org.junit.rules.TestRule
10-
import org.junit.runner.Description
11-
import org.junit.runners.model.Statement
12-
import java.util.Locale
138

149
/**
1510
* Take a snapshot of the given [previewData].
1611
*/
1712
public fun Paparazzi.snapshot(
1813
previewData: PaparazziPreviewData,
1914
name: String? = null,
20-
localInspectionMode: Boolean = true,
2115
wrapper: @Composable (@Composable () -> Unit) -> Unit = { it() }
2216
) {
2317
when (previewData) {
24-
is PaparazziPreviewData.Default -> snapshotDefault(previewData, name, localInspectionMode, wrapper)
25-
is PaparazziPreviewData.Provider<*> -> snapshotProvider(previewData, name, localInspectionMode, wrapper)
18+
is PaparazziPreviewData.Default -> snapshotDefault(previewData, name, wrapper)
2619
is PaparazziPreviewData.Empty -> Unit
2720
is PaparazziPreviewData.Error -> throw Exception(previewData.message)
2821
}
2922
}
3023

31-
/**
32-
* Generate a Paparazzi DeviceConfig for the given preview
33-
* using the given [default] DeviceConfig.
34-
*
35-
* default: The IDE renders a preview with a higher resolution than
36-
* the default device set by Paparazzi (which is currently Nexus 5). Defaulting to
37-
* a larger device brings the previews and snapshots closer in parity.
38-
*/
39-
public fun PaparazziPreviewData.deviceConfig(
40-
default: DeviceConfig = DeviceConfig.PIXEL_5
41-
): DeviceConfig = when (this) {
42-
is PaparazziPreviewData.Default -> preview.deviceConfig(default)
43-
is PaparazziPreviewData.Provider<*> -> preview.deviceConfig(default)
44-
else -> default
45-
}
46-
47-
/**
48-
* Returns a locale for the given preview, or null if error or empty.
49-
*/
50-
public fun PaparazziPreviewData.locale(): String? = when (this) {
51-
is PaparazziPreviewData.Default -> preview.locale
52-
is PaparazziPreviewData.Provider<*> -> preview.locale
53-
else -> null
54-
}
55-
56-
/**
57-
* Convert a list of generated [PaparazziPreviewData]
58-
* to a flat list of [PaparazziPreviewData]s.
59-
*/
60-
public fun List<PaparazziPreviewData>.flatten(): List<PaparazziPreviewData> = flatMap {
61-
when (it) {
62-
is PaparazziPreviewData.Provider<*> -> List(it.previewParameter.values.count()) { i ->
63-
it.withPreviewParameterIndex(i)
64-
}
65-
else -> listOf(it)
66-
}
67-
}
68-
6924
/**
7025
* A `@TestParameter` values provider for the given [annotations].
7126
*
@@ -77,28 +32,5 @@ public fun List<PaparazziPreviewData>.flatten(): List<PaparazziPreviewData> = fl
7732
public open class PaparazziValuesProvider(
7833
private val annotations: List<PaparazziPreviewData>
7934
) : TestParameterValuesProvider {
80-
override fun provideValues(): List<PaparazziPreviewData> = annotations.flatten()
81-
}
82-
83-
/**
84-
* Enforce a particular default locale for a test. Resets back to default on completion.
85-
*/
86-
public class DefaultLocaleRule(public val locale: String?) : TestRule {
87-
override fun apply(
88-
base: Statement,
89-
description: Description
90-
): Statement {
91-
return object : Statement() {
92-
override fun evaluate() {
93-
val default = Locale.getDefault()
94-
95-
try {
96-
locale?.let { Locale.setDefault(Locale.forLanguageTag(it)) }
97-
base.evaluate()
98-
} finally {
99-
Locale.setDefault(default)
100-
}
101-
}
102-
}
103-
}
35+
override fun provideValues(): List<PaparazziPreviewData> = annotations
10436
}

0 commit comments

Comments
 (0)