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

Commit fc180e3

Browse files
zach-klippensteinzach-klippenstein
authored
Merge pull request #23 from square/zachklipp/cleanup-packages
Tidy up the package structure.
2 parents 471c856 + debc500 commit fc180e3

File tree

19 files changed

+52
-44
lines changed

19 files changed

+52
-44
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ 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/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/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;)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
1111
}
1212

1313
public final class com/squareup/workflow/ui/compose/tooling/ViewFactoriesKt {

‎compose-tooling/src/androidTest/java/com/squareup/workflow/ui/compose/tooling/PreviewComposeWorkflowTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import androidx.ui.test.findByText
3131
import androidx.ui.tooling.preview.Preview
3232
import androidx.ui.unit.dp
3333
import com.squareup.workflow.Workflow
34-
import com.squareup.workflow.compose.composed
34+
import com.squareup.workflow.ui.compose.composed
3535
import com.squareup.workflow.ui.ViewEnvironmentKey
3636
import com.squareup.workflow.ui.compose.showRendering
3737
import org.junit.Rule

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.Composable
2121
import androidx.ui.core.Modifier
2222
import androidx.ui.foundation.Box
2323
import com.squareup.workflow.Sink
24-
import com.squareup.workflow.compose.ComposeWorkflow
24+
import com.squareup.workflow.ui.compose.ComposeWorkflow
2525
import com.squareup.workflow.ui.ViewEnvironment
2626
import com.squareup.workflow.ui.ViewFactory
2727
import com.squareup.workflow.ui.ViewRegistry

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

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

7-
public final class com/squareup/workflow/compose/ComposeRendering$Companion {
7+
public final class com/squareup/workflow/ui/compose/ComposeRendering$Companion {
88
public final fun getFactory ()Lcom/squareup/workflow/ui/ViewFactory;
9-
public final fun getNoopRendering ()Lcom/squareup/workflow/compose/ComposeRendering;
10-
}
11-
12-
public abstract class com/squareup/workflow/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
13-
public fun <init> ()V
14-
public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
15-
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;)V
16-
}
17-
18-
public final class com/squareup/workflow/compose/ComposeWorkflowKt {
19-
public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/compose/ComposeWorkflow;
20-
}
21-
22-
public final class com/squareup/workflow/ui/compose/ComposeSupportKt {
23-
public static final fun <clinit> ()V
9+
public final fun getNoopRendering ()Lcom/squareup/workflow/ui/compose/ComposeRendering;
2410
}
2511

2612
public final class com/squareup/workflow/ui/compose/ComposeViewFactory : com/squareup/workflow/ui/ViewFactory {
@@ -46,6 +32,16 @@ public final class com/squareup/workflow/ui/compose/ComposeViewFactoryRootKt {
4632
public static final fun withComposeViewFactoryRoot (Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow/ui/ViewEnvironment;
4733
}
4834

35+
public abstract class com/squareup/workflow/ui/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
36+
public fun <init> ()V
37+
public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
38+
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;)V
39+
}
40+
41+
public final class com/squareup/workflow/ui/compose/ComposeWorkflowKt {
42+
public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/compose/ComposeWorkflow;
43+
}
44+
4945
public final class com/squareup/workflow/ui/compose/ViewEnvironmentsKt {
5046
public static final fun showRendering (Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;)V
5147
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
@@ -70,6 +66,10 @@ public final class com/squareup/workflow/ui/compose/WorkflowContainerKt {
7066
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
7167
}
7268

69+
public final class com/squareup/workflow/ui/compose/internal/ComposeSupportKt {
70+
public static final fun <clinit> ()V
71+
}
72+
7373
public final class com/squareup/workflow/ui/core/compose/BuildConfig {
7474
public static final field BUILD_TYPE Ljava/lang/String;
7575
public static final field DEBUG Z

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.ui.test.assertIsDisplayed
2323
import androidx.ui.test.createComposeRule
2424
import androidx.ui.test.findByText
2525
import com.google.common.truth.Truth.assertThat
26+
import com.squareup.workflow.ui.compose.internal.SafeComposeViewFactoryRoot
2627
import org.junit.Rule
2728
import org.junit.Test
2829
import org.junit.runner.RunWith

‎core-compose/src/main/java/com/squareup/workflow/compose/ComposeRendering.kt renamed to ‎core-compose/src/main/java/com/squareup/workflow/ui/compose/ComposeRendering.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
@file:Suppress("RemoveEmptyParenthesesFromAnnotationEntry")
1717

18-
package com.squareup.workflow.compose
18+
package com.squareup.workflow.ui.compose
1919

2020
import androidx.compose.Composable
21-
import com.squareup.workflow.compose.ComposeRendering.Companion.Factory
22-
import com.squareup.workflow.compose.ComposeRendering.Companion.NoopRendering
21+
import com.squareup.workflow.ui.compose.ComposeRendering.Companion.Factory
22+
import com.squareup.workflow.ui.compose.ComposeRendering.Companion.NoopRendering
2323
import com.squareup.workflow.ui.ViewEnvironment
2424
import com.squareup.workflow.ui.ViewFactory
25-
import com.squareup.workflow.ui.compose.bindCompose
2625

2726
/**
2827
* A workflow rendering that renders itself using a [Composable] function.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ import androidx.ui.core.setContent
3131
import com.squareup.workflow.ui.ViewEnvironment
3232
import com.squareup.workflow.ui.ViewFactory
3333
import com.squareup.workflow.ui.bindShowRendering
34+
import com.squareup.workflow.ui.compose.internal.CompositionContinuation
35+
import com.squareup.workflow.ui.compose.internal.SafeComposeViewFactoryRoot
36+
import com.squareup.workflow.ui.compose.internal.setContent
3437
import kotlin.reflect.KClass
3538

3639
/**

‎core-compose/src/main/java/com/squareup/workflow/compose/ComposeWorkflow.kt renamed to ‎core-compose/src/main/java/com/squareup/workflow/ui/compose/ComposeWorkflow.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
*/
1616
@file:Suppress("RemoveEmptyParenthesesFromAnnotationEntry")
1717

18-
package com.squareup.workflow.compose
18+
package com.squareup.workflow.ui.compose
1919

2020
import androidx.compose.Composable
2121
import com.squareup.workflow.Sink
2222
import com.squareup.workflow.StatefulWorkflow
2323
import com.squareup.workflow.Workflow
2424
import com.squareup.workflow.ui.ViewEnvironment
25+
import com.squareup.workflow.ui.compose.internal.ComposeWorkflowImpl
2526

2627
/**
2728
* A stateless [Workflow][com.squareup.workflow.Workflow] that [renders][render] itself as

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.remember
2020
import androidx.ui.core.Modifier
2121
import com.squareup.workflow.ui.ViewEnvironment
2222
import com.squareup.workflow.ui.ViewRegistry
23+
import com.squareup.workflow.ui.compose.internal.showRendering
2324

2425
/**
2526
* Renders [rendering] into the composition using this [ViewEnvironment]'s

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import androidx.ui.savedinstancestate.UiSavedStateRegistryAmbient
4040
import androidx.ui.savedinstancestate.savedInstanceState
4141
import com.squareup.workflow.Snapshot
4242
import com.squareup.workflow.Workflow
43-
import com.squareup.workflow.compose.ComposeRendering
4443
import com.squareup.workflow.diagnostic.WorkflowDiagnosticListener
4544
import com.squareup.workflow.launchWorkflowIn
4645
import com.squareup.workflow.ui.ViewEnvironment

0 commit comments

Comments
 (0)