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

Commit da02136

Browse files
zach-klippensteinzach-klippenstein
committed
Update Compose to dev12.
1 parent 4a5373a commit da02136

File tree

9 files changed

+60
-93
lines changed

9 files changed

+60
-93
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.composedViewFactory
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: 15 additions & 24 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,52 +10,43 @@ 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 class com/squareup/workflow/ui/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
1919
public fun <init> ()V
2020
public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
21-
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;)V
21+
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;II)V
2222
}
2323

2424
public final class com/squareup/workflow/ui/compose/ComposeWorkflowKt {
25-
public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/compose/ComposeWorkflow;
25+
public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function6;)Lcom/squareup/workflow/ui/compose/ComposeWorkflow;
2626
}
2727

2828
public final class com/squareup/workflow/ui/compose/CompositionRootKt {
2929
public static final fun <clinit> ()V
30-
public static final fun withCompositionRoot (Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow/ui/ViewEnvironment;
31-
public static final fun withCompositionRoot (Lcom/squareup/workflow/ui/ViewRegistry;Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow/ui/ViewRegistry;
30+
public static final fun withCompositionRoot (Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/ViewEnvironment;
31+
public static final fun withCompositionRoot (Lcom/squareup/workflow/ui/ViewRegistry;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/ViewRegistry;
3232
}
3333

3434
public final class com/squareup/workflow/ui/compose/RenderAsStateKt {
35-
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)Landroidx/compose/State;
36-
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)Landroidx/compose/State;
37-
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)Landroidx/compose/State;
38-
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)Landroidx/compose/State;
39-
public static synthetic fun renderAsState$default (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)Landroidx/compose/State;
40-
public static synthetic fun renderAsState$default (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)Landroidx/compose/State;
41-
public static synthetic fun renderAsState$default (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)Landroidx/compose/State;
42-
public static synthetic fun renderAsState$default (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)Landroidx/compose/State;
35+
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)Landroidx/compose/State;
36+
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)Landroidx/compose/State;
37+
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)Landroidx/compose/State;
38+
public static final fun renderAsState (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)Landroidx/compose/State;
4339
}
4440

4541
public final class com/squareup/workflow/ui/compose/ViewEnvironmentsKt {
46-
public static final fun WorkflowRendering (Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;)V
47-
public static synthetic fun WorkflowRendering$default (Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;ILjava/lang/Object;)V
42+
public static final fun WorkflowRendering (Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;III)V
4843
}
4944

5045
public final class com/squareup/workflow/ui/compose/WorkflowContainerKt {
51-
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
52-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)V
53-
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;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;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;)V
55-
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
56-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
57-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
58-
public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;ILjava/lang/Object;)V
46+
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
47+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
48+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
49+
public static final fun WorkflowContainer (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Landroidx/compose/Composer;III)V
5950
}
6051

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

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

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,19 @@
1818
package com.squareup.workflow.ui.compose.internal
1919

2020
import android.content.Context
21-
import android.view.View
2221
import android.view.ViewGroup
2322
import androidx.compose.Composable
2423
import androidx.compose.Composition
2524
import androidx.compose.CompositionReference
25+
import androidx.compose.FrameManager
2626
import androidx.compose.Recomposer
2727
import androidx.compose.compositionFor
28-
import androidx.lifecycle.LifecycleOwner
28+
import androidx.ui.core.AndroidOwner
2929
import androidx.ui.node.UiComposer
30-
import com.squareup.workflow.ui.compose.internal.ReflectionSupport.ANDROID_OWNER_CLASS
31-
import com.squareup.workflow.ui.compose.internal.ReflectionSupport.androidOwnerView
32-
import com.squareup.workflow.ui.compose.internal.ReflectionSupport.createOwner
3330
import com.squareup.workflow.ui.compose.internal.ReflectionSupport.createWrappedContent
34-
import com.squareup.workflow.ui.compose.internal.ReflectionSupport.ownerRoot
3531
import com.squareup.workflow.ui.core.compose.R
3632

37-
private typealias AndroidOwner = Any
3833
private typealias WrappedComposition = Composition
39-
private typealias LayoutNode = Any
4034

4135
private val DefaultLayoutParams = ViewGroup.LayoutParams(
4236
ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -59,12 +53,13 @@ internal fun ViewGroup.setContent(
5953
parent: CompositionReference,
6054
content: @Composable() () -> Unit
6155
): Composition {
56+
FrameManager.ensureStarted()
6257
val composeView: AndroidOwner =
6358
if (childCount > 0) {
64-
getChildAt(0).takeIf(ANDROID_OWNER_CLASS::isInstance)
59+
getChildAt(0) as? AndroidOwner
6560
} else {
6661
removeAllViews(); null
67-
} ?: createOwner(context).also { addView(androidOwnerView(it), DefaultLayoutParams) }
62+
} ?: AndroidOwner(context).also { addView(it.view, DefaultLayoutParams) }
6863
return doSetContent(context, composeView, recomposer, parent, content)
6964
}
7065

@@ -80,53 +75,38 @@ private fun doSetContent(
8075
content: @Composable() () -> Unit
8176
): Composition {
8277
// val original = compositionFor(context, owner.root, recomposer)
83-
val container = ownerRoot(owner)
8478
val original = compositionFor(
85-
container = container,
79+
container = owner.root,
8680
recomposer = recomposer,
8781
parent = parent,
8882
composerFactory = { slotTable, factoryRecomposer ->
89-
UiComposer(context, container, slotTable, factoryRecomposer)
83+
UiComposer(context, owner.root, slotTable, factoryRecomposer)
9084
}
9185
)
9286

93-
val wrapped = androidOwnerView(owner).getTag(R.id.wrapped_composition_tag)
87+
val wrapped = owner.view.getTag(R.id.wrapped_composition_tag)
9488
as? WrappedComposition
9589
// ?: WrappedComposition(owner, original).also {
9690
?: createWrappedContent(owner, original).also {
97-
androidOwnerView(owner).setTag(R.id.wrapped_composition_tag, it)
91+
owner.view.setTag(R.id.wrapped_composition_tag, it)
9892
}
9993
wrapped.setContent(content)
10094
return wrapped
10195
}
10296

10397
private object ReflectionSupport {
10498

105-
val ANDROID_OWNER_CLASS = Class.forName("androidx.ui.core.AndroidOwner")
10699
private val WRAPPED_COMPOSITION_CLASS = Class.forName("androidx.ui.core.WrappedComposition")
107-
private val ANDROID_OWNER_KT_CLASS = Class.forName("androidx.ui.core.AndroidOwnerKt")
108100

109101
private val WRAPPED_COMPOSITION_CTOR =
110-
WRAPPED_COMPOSITION_CLASS.getConstructor(ANDROID_OWNER_CLASS, Composition::class.java)
111-
112-
private val CREATE_OWNER_FUN =
113-
ANDROID_OWNER_KT_CLASS.getMethod("createOwner", Context::class.java, LifecycleOwner::class.java)
114-
private val ANDROID_OWNER_ROOT_GETTER = ANDROID_OWNER_CLASS.getMethod("getRoot")
102+
WRAPPED_COMPOSITION_CLASS.getConstructor(AndroidOwner::class.java, Composition::class.java)
115103

116104
init {
117105
WRAPPED_COMPOSITION_CTOR.isAccessible = true
118106
}
119107

120-
fun createOwner(context: Context): AndroidOwner =
121-
CREATE_OWNER_FUN.invoke(null, context, null) as AndroidOwner
122-
123-
fun ownerRoot(owner: AndroidOwner): LayoutNode =
124-
ANDROID_OWNER_ROOT_GETTER.invoke(owner) as LayoutNode
125-
126108
fun createWrappedContent(
127109
owner: AndroidOwner,
128110
original: Composition
129111
): WrappedComposition = WRAPPED_COMPOSITION_CTOR.newInstance(owner, original) as Composition
130-
131-
fun androidOwnerView(owner: AndroidOwner): View = owner as View
132112
}

‎samples/hello-compose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloBinding.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package com.squareup.sample.hellocomposebinding
1818
import androidx.compose.Composable
1919
import androidx.ui.core.Alignment
2020
import androidx.ui.core.Modifier
21-
import androidx.ui.foundation.Clickable
2221
import androidx.ui.foundation.Text
22+
import androidx.ui.foundation.clickable
2323
import androidx.ui.layout.fillMaxSize
2424
import androidx.ui.layout.wrapContentSize
2525
import androidx.ui.material.ripple.ripple
@@ -29,13 +29,13 @@ import com.squareup.workflow.ui.compose.composedViewFactory
2929
import com.squareup.workflow.ui.compose.tooling.preview
3030

3131
val HelloBinding = composedViewFactory<Rendering> { rendering, _ ->
32-
Clickable(
32+
Text(
33+
rendering.message,
3334
modifier = Modifier.fillMaxSize()
34-
.ripple(bounded = true),
35-
onClick = { rendering.onClick() }
36-
) {
37-
Text(rendering.message, modifier = Modifier.wrapContentSize(Alignment.Center))
38-
}
35+
.ripple()
36+
.clickable(onClick = rendering.onClick)
37+
.wrapContentSize(Alignment.Center)
38+
)
3939
}
4040

4141
@Preview(heightDp = 150, showBackground = true)

‎samples/hello-compose-rendering/src/main/java/com/squareup/sample/hellocomposerendering/HelloRenderingWorkflow.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@ package com.squareup.sample.hellocomposerendering
1818
import androidx.compose.Composable
1919
import androidx.ui.core.Alignment
2020
import androidx.ui.core.Modifier
21-
import androidx.ui.foundation.Clickable
2221
import androidx.ui.foundation.Text
23-
import androidx.ui.layout.fillMaxSize
22+
import androidx.ui.foundation.clickable
2423
import androidx.ui.layout.wrapContentSize
2524
import androidx.ui.material.MaterialTheme
2625
import androidx.ui.material.ripple.ripple
2726
import androidx.ui.tooling.preview.Preview
2827
import com.squareup.sample.hellocomposerendering.HelloRenderingWorkflow.Toggle
2928
import com.squareup.workflow.Sink
30-
import com.squareup.workflow.ui.compose.ComposeWorkflow
3129
import com.squareup.workflow.ui.ViewEnvironment
30+
import com.squareup.workflow.ui.compose.ComposeWorkflow
3231
import com.squareup.workflow.ui.compose.tooling.preview
3332

3433
/**
@@ -46,13 +45,13 @@ object HelloRenderingWorkflow : ComposeWorkflow<String, Toggle>() {
4645
viewEnvironment: ViewEnvironment
4746
) {
4847
MaterialTheme {
49-
Clickable(
50-
onClick = { outputSink.send(Toggle) },
51-
modifier = Modifier.ripple(bounded = true)
52-
.fillMaxSize()
53-
) {
54-
Text(props, modifier = Modifier.wrapContentSize(Alignment.Center))
55-
}
48+
Text(
49+
props,
50+
modifier = Modifier
51+
.ripple()
52+
.clickable(onClick = { outputSink.send(Toggle) })
53+
.wrapContentSize(Alignment.Center)
54+
)
5655
}
5756
}
5857
}

0 commit comments

Comments
 (0)