Skip to content
This repository was archived by the owner on Feb 5, 2021. It is now read-only.

Commit 2fa42f6

Browse files
zach-klippensteinzach-klippenstein
committed
Update Compose to dev12.
1 parent dc194c3 commit 2fa42f6

File tree

12 files changed

+107
-111
lines changed

12 files changed

+107
-111
lines changed

‎buildSrc/src/main/java/Dependencies.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import java.util.Locale.US
1919
import kotlin.reflect.full.declaredMembers
2020

2121
object Versions {
22-
const val compose = "0.1.0-dev11"
22+
const val compose = "0.1.0-dev12"
2323
const val kotlin = "1.3.71"
2424
const val targetSdk = 29
2525
const val workflow = "0.28.0"

‎compose-tooling/api/compose-tooling.api‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ public final class com/squareup/workflow/ui/compose/tooling/BuildConfig {
66
}
77

88
public final class com/squareup/workflow/ui/compose/tooling/ComposeWorkflowsKt {
9-
public static final fun preview (Lcom/squareup/workflow/ui/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
10-
public static synthetic fun preview$default (Lcom/squareup/workflow/ui/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;ILjava/lang/Object;)V
9+
public static final fun preview (Lcom/squareup/workflow/ui/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;III)V
1110
}
1211

1312
public final class com/squareup/workflow/ui/compose/tooling/ViewFactoriesKt {
14-
public static final fun preview (Lcom/squareup/workflow/ui/ViewFactory;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
15-
public static synthetic fun preview$default (Lcom/squareup/workflow/ui/ViewFactory;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;ILjava/lang/Object;)V
13+
public static final fun preview (Lcom/squareup/workflow/ui/ViewFactory;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;III)V
1614
}
1715

‎compose-tooling/src/main/java/com/squareup/workflow/ui/compose/tooling/PlaceholderViewFactory.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,28 @@
1818
package com.squareup.workflow.ui.compose.tooling
1919

2020
import androidx.compose.Composable
21-
import androidx.ui.core.DrawScope
2221
import androidx.ui.core.Modifier
2322
import androidx.ui.core.clipToBounds
2423
import androidx.ui.core.drawBehind
2524
import androidx.ui.foundation.Box
2625
import androidx.ui.foundation.Text
2726
import androidx.ui.foundation.drawBorder
2827
import androidx.ui.geometry.Offset
28+
import androidx.ui.geometry.toRect
2929
import androidx.ui.graphics.Color
3030
import androidx.ui.graphics.Paint
3131
import androidx.ui.graphics.Shadow
32-
import androidx.ui.graphics.painter.Stroke
33-
import androidx.ui.graphics.painter.drawCanvas
34-
import androidx.ui.graphics.painter.rotate
32+
import androidx.ui.graphics.drawscope.DrawScope
33+
import androidx.ui.graphics.drawscope.Stroke
34+
import androidx.ui.graphics.drawscope.drawCanvas
35+
import androidx.ui.graphics.drawscope.rotate
3536
import androidx.ui.graphics.withSaveLayer
3637
import androidx.ui.layout.fillMaxSize
3738
import androidx.ui.text.TextStyle
3839
import androidx.ui.text.style.TextAlign
3940
import androidx.ui.tooling.preview.Preview
4041
import androidx.ui.unit.Dp
4142
import androidx.ui.unit.dp
42-
import androidx.ui.unit.px
43-
import androidx.ui.unit.toRect
4443
import com.squareup.workflow.ui.ViewFactory
4544
import com.squareup.workflow.ui.compose.bindCompose
4645

@@ -70,7 +69,7 @@ internal fun placeholderViewFactory(modifier: Modifier): ViewFactory<Any> =
7069
style = TextStyle(
7170
textAlign = TextAlign.Center,
7271
color = Color.White,
73-
shadow = Shadow(blurRadius = 5.px, color = Color.Black)
72+
shadow = Shadow(blurRadius = 5f, color = Color.Black)
7473
)
7574
)
7675
}

‎core-compose/api/core-compose.api‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
public final class com/squareup/workflow/ui/compose/ComposeRendering {
22
public static final field Companion Lcom/squareup/workflow/ui/compose/ComposeRendering$Companion;
33
public static final fun <clinit> ()V
4-
public fun <init> (Lkotlin/jvm/functions/Function2;)V
4+
public fun <init> (Lkotlin/jvm/functions/Function4;)V
55
}
66

77
public final class com/squareup/workflow/ui/compose/ComposeRendering$Companion {
@@ -10,15 +10,15 @@ public final class com/squareup/workflow/ui/compose/ComposeRendering$Companion {
1010
}
1111

1212
public final class com/squareup/workflow/ui/compose/ComposeViewFactory : com/squareup/workflow/ui/ViewFactory {
13-
public fun <init> (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function3;)V
13+
public fun <init> (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function5;)V
1414
public fun buildView (Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroid/content/Context;Landroid/view/ViewGroup;)Landroid/view/View;
1515
public fun getType ()Lkotlin/reflect/KClass;
1616
}
1717

1818
public abstract interface class com/squareup/workflow/ui/compose/ComposeViewFactoryRoot {
1919
public static final field Companion Lcom/squareup/workflow/ui/compose/ComposeViewFactoryRoot$Companion;
2020
public static fun <clinit> ()V
21-
public abstract fun wrap (Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
21+
public abstract fun wrap (Lkotlin/jvm/functions/Function3;Landroidx/compose/Composer;II)V
2222
}
2323

2424
public final class com/squareup/workflow/ui/compose/ComposeViewFactoryRoot$Companion : com/squareup/workflow/ui/ViewEnvironmentKey {
@@ -29,42 +29,33 @@ public final class com/squareup/workflow/ui/compose/ComposeViewFactoryRoot$Compa
2929

3030
public final class com/squareup/workflow/ui/compose/ComposeViewFactoryRootKt {
3131
public static final fun <clinit> ()V
32-
public static final fun ComposeViewFactoryRoot (Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow/ui/compose/ComposeViewFactoryRoot;
33-
public static final fun withComposeViewFactoryRoot (Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow/ui/ViewEnvironment;
32+
public static final fun ComposeViewFactoryRoot (Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/compose/ComposeViewFactoryRoot;
33+
public static final fun withComposeViewFactoryRoot (Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/ViewEnvironment;
3434
}
3535

3636
public abstract class com/squareup/workflow/ui/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
3737
public fun <init> ()V
3838
public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
39-
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;)V
39+
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;II)V
4040
}
4141

4242
public final class com/squareup/workflow/ui/compose/ComposeWorkflowKt {
43-
public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/compose/ComposeWorkflow;
43+
public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function6;)Lcom/squareup/workflow/ui/compose/ComposeWorkflow;
4444
}
4545

4646
public final class com/squareup/workflow/ui/compose/ViewEnvironmentsKt {
47-
public static final fun showRendering (Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;)V
48-
public static synthetic fun showRendering$default (Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;ILjava/lang/Object;)V
47+
public static final fun showRendering (Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;III)V
4948
}
5049

5150
public final class com/squareup/workflow/ui/compose/WorkflowContainerKt {
52-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;)V
53-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)V
54-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)V
55-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)V
56-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)V
57-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;)V
58-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;)V
59-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;)V
60-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;ILjava/lang/Object;)V
61-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
62-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
63-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
64-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
65-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;ILjava/lang/Object;)V
66-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;ILjava/lang/Object;)V
67-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;ILjava/lang/Object;)V
51+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function4;Landroidx/compose/Composer;III)V
52+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
53+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
54+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
55+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
56+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function4;Landroidx/compose/Composer;III)V
57+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function4;Landroidx/compose/Composer;III)V
58+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function4;Landroidx/compose/Composer;III)V
6859
}
6960

7061
public final class com/squareup/workflow/ui/compose/internal/ComposeSupportKt {

‎core-compose/src/androidTest/java/com/squareup/workflow/ui/compose/WorkflowContainerTest.kt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import androidx.compose.Providers
2222
import androidx.compose.mutableStateOf
2323
import androidx.compose.onActive
2424
import androidx.test.ext.junit.runners.AndroidJUnit4
25-
import androidx.ui.foundation.Clickable
25+
import androidx.ui.core.Modifier
2626
import androidx.ui.foundation.Text
27+
import androidx.ui.foundation.clickable
2728
import androidx.ui.layout.Column
2829
import androidx.ui.savedinstancestate.UiSavedStateRegistry
2930
import androidx.ui.savedinstancestate.UiSavedStateRegistryAmbient
@@ -89,12 +90,8 @@ class WorkflowContainerTest {
8990
composeRule.setContent {
9091
WorkflowContainer(workflow, onOutput = { receivedOutputs += it }) { sendOutput ->
9192
Column {
92-
Clickable(onClick = { sendOutput("one") }) {
93-
Text("send one")
94-
}
95-
Clickable(onClick = { sendOutput("two") }) {
96-
Text("send two")
97-
}
93+
Text("send one", Modifier.clickable(onClick = { sendOutput("one") }))
94+
Text("send two", Modifier.clickable(onClick = { sendOutput("two") }))
9895
}
9996
}
10097
}

‎core-compose/src/main/java/com/squareup/workflow/ui/compose/ComposeViewFactoryRoot.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,14 @@ fun ViewEnvironment.withComposeViewFactoryRoot(
5757
wrapper: @Composable() (content: @Composable() () -> Unit) -> Unit
5858
): ViewEnvironment = this + (ComposeViewFactoryRoot to ComposeViewFactoryRoot(wrapper))
5959

60-
// This could be inline, but that makes the Compose compiler puke.
6160
@Suppress("FunctionName")
6261
fun ComposeViewFactoryRoot(
6362
wrapper: @Composable() (content: @Composable() () -> Unit) -> Unit
64-
): ComposeViewFactoryRoot = object : ComposeViewFactoryRoot {
63+
): ComposeViewFactoryRoot = ComposeViewFactoryRootImpl(wrapper)
64+
65+
private class ComposeViewFactoryRootImpl(
66+
val wrapper: @Composable() (content: @Composable() () -> Unit) -> Unit
67+
) : ComposeViewFactoryRoot {
6568
@Composable override fun wrap(content: @Composable() () -> Unit) = wrapper(content)
6669
}
6770

0 commit comments

Comments
 (0)