Skip to content
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

Hoist property binding up into abstract types #1534

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Hoist property binding up into abstract types #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...rc/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiFlexContainerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class ComposeUiFlexContainerTest(

override fun flexContainer(direction: FlexDirection) = ComposeTestFlexContainer(direction)

override fun widget(text: String, modifier: RedwoodModifier) = object : Text<@Composable () -> Unit> {
private var text by mutableStateOf(text)
override fun widget() = object : Text<@Composable () -> Unit> {
private var text by mutableStateOf("")

override val value = @Composable {
BasicText(
Expand All @@ -65,7 +65,7 @@ class ComposeUiFlexContainerTest(
)
}

override var modifier = modifier
override var modifier: RedwoodModifier = RedwoodModifier

override fun text(text: String) {
this.text = text
Expand Down
12 changes: 1 addition & 11 deletions ...oseui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiSpacerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import app.cash.paparazzi.DeviceConfig
import app.cash.paparazzi.Paparazzi
import app.cash.redwood.Modifier
import app.cash.redwood.layout.AbstractSpacerTest
import app.cash.redwood.layout.widget.Spacer
import app.cash.redwood.ui.dp
import app.cash.redwood.widget.Widget
import com.android.ide.common.rendering.api.SessionParams
import org.junit.Rule
Expand All @@ -41,15 +39,7 @@ class ComposeUiSpacerTest : AbstractSpacerTest<@Composable () -> Unit>() {
renderingMode = SessionParams.RenderingMode.SHRINK,
)

override fun widget(
width: Int,
height: Int,
modifier: Modifier,
): Spacer<@Composable () -> Unit> = ComposeUiSpacer().apply {
this.modifier = modifier
width(width.dp)
height(height.dp)
}
override fun widget(): Spacer<@Composable () -> Unit> = ComposeUiSpacer()

override fun wrap(widget: Widget<@Composable () -> Unit>, horizontal: Boolean) = @Composable {
if (horizontal) {
Expand Down
8 changes: 2 additions & 6 deletions redwood-layout-shared-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply plugin: 'org.jetbrains.kotlin.jvm'

dependencies {
api projects.redwoodLayoutApi
api projects.redwoodLayoutModifiers
api projects.redwoodLayoutWidget
api projects.redwoodRuntime
api projects.redwoodWidget
api projects.redwoodYoga
api libs.junit
api libs.testParameterInjector
}

android {
namespace 'app.cash.redwood.redwoodlayoutsharedtest'
}
7 changes: 6 additions & 1 deletion ...d-layout-shared-test/src/main/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,14 @@ import org.junit.Test
@Suppress("JUnitMalformedDeclaration")
abstract class AbstractFlexContainerTest<T : Any> {
abstract fun flexContainer(direction: FlexDirection): TestFlexContainer<T>
abstract fun widget(text: String, modifier: Modifier = Modifier): Text<T>
abstract fun widget(): Text<T>
abstract fun verifySnapshot(container: TestFlexContainer<T>, name: String? = null)

private fun widget(text: String, modifier: Modifier = Modifier): Text<T> = widget().apply {
text(text)
this.modifier = modifier
}

@Test fun emptyLayout(
@TestParameter flexDirectionEnum: FlexDirectionEnum,
) {
Expand Down
14 changes: 8 additions & 6 deletions redwood-layout-shared-test/src/main/kotlin/app/cash/redwood/layout/AbstractSpacerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,24 @@
*/
package app.cash.redwood.layout

import app.cash.redwood.Modifier
import app.cash.redwood.layout.widget.Spacer
import app.cash.redwood.ui.dp
import app.cash.redwood.widget.Widget
import org.junit.Test

abstract class AbstractSpacerTest<T : Any> {

abstract fun widget(
width: Int = 0,
height: Int = 0,
modifier: Modifier = Modifier,
): Widget<T>
abstract fun widget(): Spacer<T>

abstract fun wrap(widget: Widget<T>, horizontal: Boolean): T

abstract fun verifySnapshot(value: T)

private fun widget(width: Int, height: Int): Spacer<T> = widget().apply {
width(width.dp)
height(height.dp)
}

@Test fun zeroSpacer() {
val widget = widget(width = 0, height = 0)
verifySnapshot(wrap(widget, horizontal = true))
Expand Down
5 changes: 2 additions & 3 deletions redwood-layout-view/src/test/kotlin/app/cash/redwood/layout/view/ViewFlexContainerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,15 @@ class ViewFlexContainerTest(
return ViewTestFlexContainer(paparazzi.context, direction)
}

override fun widget(text: String, modifier: Modifier) = object : Text<View> {
override fun widget() = object : Text<View> {
override val value = TextView(paparazzi.context).apply {
background = ColorDrawable(Color.GREEN)
textSize = 18f
textDirection = View.TEXT_DIRECTION_LOCALE
setTextColor(Color.BLACK)
this.text = text
}

override var modifier = modifier
override var modifier: Modifier = Modifier

override fun text(text: String) {
value.text = text
Expand Down
12 changes: 1 addition & 11 deletions redwood-layout-view/src/test/kotlin/app/cash/redwood/layout/view/ViewSpacerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ import android.widget.LinearLayout.VERTICAL
import android.widget.TextView
import app.cash.paparazzi.DeviceConfig
import app.cash.paparazzi.Paparazzi
import app.cash.redwood.Modifier
import app.cash.redwood.layout.AbstractSpacerTest
import app.cash.redwood.layout.widget.Spacer
import app.cash.redwood.ui.dp
import app.cash.redwood.widget.Widget
import com.android.ide.common.rendering.api.SessionParams
import org.junit.Rule
Expand All @@ -42,15 +40,7 @@ class ViewSpacerTest : AbstractSpacerTest<View>() {
renderingMode = SessionParams.RenderingMode.SHRINK,
)

override fun widget(
width: Int,
height: Int,
modifier: Modifier,
): Spacer<View> = ViewSpacer(paparazzi.context).apply {
this.modifier = modifier
width(width.dp)
height(height.dp)
}
override fun widget(): Spacer<View> = ViewSpacer(paparazzi.context)

override fun wrap(widget: Widget<View>, horizontal: Boolean): View {
return LinearLayout(paparazzi.context).apply {
Expand Down
6 changes: 3 additions & 3 deletions ...eui/src/androidUnitTest/kotlin/app/cash/redwood/layout/composeui/ComposeUiLazyListTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class ComposeUiLazyListTest(

override fun flexContainer(direction: FlexDirection) = ComposeTestFlexContainer(direction)

override fun widget(text: String, modifier: RedwoodModifier) = object : Text<@Composable () -> Unit> {
private var text by mutableStateOf(text)
override fun widget() = object : Text<@Composable () -> Unit> {
private var text by mutableStateOf("")

override val value = @Composable {
BasicText(
Expand All @@ -67,7 +67,7 @@ class ComposeUiLazyListTest(
)
}

override var modifier = modifier
override var modifier: RedwoodModifier = RedwoodModifier

override fun text(text: String) {
this.text = text
Expand Down
5 changes: 2 additions & 3 deletions redwood-lazylayout-view/src/test/kotlin/app/cash/redwood/lazylayout/view/ViewLazyListTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,14 @@ class ViewLazyListTest(

override fun flexContainer(direction: FlexDirection) = ViewTestFlexContainer(paparazzi.context, direction)

override fun widget(text: String, modifier: Modifier) = object : Text<View> {
override fun widget() = object : Text<View> {
override val value = TextView(paparazzi.context).apply {
background = ColorDrawable(Color.GREEN)
textSize = 18f
setTextColor(Color.BLACK)
this.text = text
}

override var modifier = modifier
override var modifier: Modifier = Modifier

override fun text(text: String) {
value.text = text
Expand Down