Skip to content

Allow for custom appCompatViewInflater #274 #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow for custom appCompatViewInflater #274 #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b047769
Allow for custom appCompatViewInflater and thus support for MaterialC…
Jun 30, 2022
969e794
re enabled withMaterialComponents()
Jul 1, 2022
d03f3b5
Fix Material button test to fit with existing screenshot
Jul 1, 2022
9eebccf
re-generated button screenshot from sample
Jul 2, 2022
f5d61ed
grabbed screenshot from material-components-present tests
Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.gradle.testkit.runner.GradleRunner
import org.gradle.testkit.runner.TaskOutcome.FROM_CACHE
import org.gradle.testkit.runner.TaskOutcome.SUCCESS
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
import java.io.File
import java.nio.file.Files
Expand Down Expand Up @@ -697,7 +696,6 @@ class PaparazziPluginTest {
}

@Test
@Ignore
fun withMaterialComponents() {
val fixtureRoot = File("src/test/projects/material-components-present")

Expand Down
4 changes: 2 additions & 2 deletions paparazzi-gradle-plugin/src/test/projects/material-components-present/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ android {
}

dependencies {
implementation 'com.google.android.material:material:1.5.0-alpha03'
}
implementation 'com.google.android.material:material:1.6.1'
}
5 changes: 4 additions & 1 deletion ...aterial-components-present/src/test/java/app/cash/paparazzi/plugin/test/ButtonViewTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ import org.junit.Test

class ButtonViewTest {
@get:Rule
val paparazzi = Paparazzi(theme = "Theme.MaterialComponents")
val paparazzi = Paparazzi(
theme = "Theme.MaterialComponents.NoActionBar",
appCompatViewInflaterClassName = "com.google.android.material.theme.MaterialComponentsViewInflater",
)

@Test
fun testViews() {
Expand Down
Binary file modified ...gin/src/test/projects/material-components-present/src/test/resources/button.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 24 additions & 16 deletions paparazzi/src/main/java/app/cash/paparazzi/Paparazzi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import com.android.layoutlib.bridge.impl.RenderAction
import com.android.layoutlib.bridge.impl.RenderSessionImpl
import java.awt.image.BufferedImage
import java.lang.reflect.Field
import java.lang.reflect.Method
import java.lang.reflect.Modifier
import java.util.Date
import java.util.concurrent.TimeUnit
Expand All @@ -86,6 +87,7 @@ class Paparazzi @JvmOverloads constructor(
private val theme: String = "android:Theme.Material.NoActionBar.Fullscreen",
private val renderingMode: RenderingMode = RenderingMode.NORMAL,
private val appCompatEnabled: Boolean = true,
private val appCompatViewInflaterClassName: String = "androidx.appcompat.app.AppCompatViewInflater",
private val maxPercentDifference: Double = 0.1,
private val snapshotHandler: SnapshotHandler = determineHandler(maxPercentDifference),
private val renderExtensions: Set<RenderExtension> = setOf()
Expand Down Expand Up @@ -444,22 +446,8 @@ class Paparazzi @JvmOverloads constructor(
context: Context,
attrs: AttributeSet
): View? {
val appCompatViewInflaterClass =
Class.forName("androidx.appcompat.app.AppCompatViewInflater")

val createViewMethod = appCompatViewInflaterClass
.getDeclaredMethod(
"createView",
View::class.java,
String::class.java,
Context::class.java,
AttributeSet::class.java,
Boolean::class.javaPrimitiveType,
Boolean::class.javaPrimitiveType,
Boolean::class.javaPrimitiveType,
Boolean::class.javaPrimitiveType
)
.apply { isAccessible = true }
val appCompatViewInflaterClass = Class.forName(appCompatViewInflaterClassName)
val createViewMethod = getCreateViewMethod(appCompatViewInflaterClass) ?: throw IllegalStateException("View inflater doesn't have `createView` method")

val inheritContext = true
val readAndroidTheme = true
Expand All @@ -476,6 +464,26 @@ class Paparazzi @JvmOverloads constructor(
) as View?
}

fun getCreateViewMethod(clazz: Class<*>): Method? {
try {
return clazz
.getDeclaredMethod(
"createView",
View::class.java,
String::class.java,
Context::class.java,
AttributeSet::class.java,
Boolean::class.javaPrimitiveType,
Boolean::class.javaPrimitiveType,
Boolean::class.javaPrimitiveType,
Boolean::class.javaPrimitiveType
)
.apply { isAccessible = true }
} catch (error: NoSuchMethodException) {
return clazz.superclass?.let { getCreateViewMethod(it) }
}
}

override fun onCreateView(
name: String,
context: Context,
Expand Down