Skip to content

Undoes port of AlertContainerScreen to Screen #629

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

Merged
merged 1 commit into from
Jan 12, 2022
Merged

Undoes port of AlertContainerScreen to Screen #629

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
11 changes: 9 additions & 2 deletions samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/TimeMachineAppWorkflow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,30 @@ import com.squareup.sample.timemachine.shakeable.ShakeableTimeMachineScreen
import com.squareup.sample.timemachine.shakeable.ShakeableTimeMachineWorkflow
import com.squareup.sample.timemachine.shakeable.ShakeableTimeMachineWorkflow.PropsFactory
import com.squareup.workflow1.StatelessWorkflow
import com.squareup.workflow1.mapRendering
import com.squareup.workflow1.renderChild
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
import com.squareup.workflow1.ui.asScreen
import kotlin.time.ExperimentalTime
import kotlin.time.TimeSource

/**
* A workflow that wraps [DungeonAppWorkflow] with a [ShakeableTimeMachineWorkflow] to enable
* time travel debugging.
*/
@OptIn(ExperimentalTime::class)
@OptIn(ExperimentalTime::class, WorkflowUiExperimentalApi::class)
class TimeMachineAppWorkflow(
appWorkflow: DungeonAppWorkflow,
clock: TimeSource,
context: Context
) : StatelessWorkflow<BoardPath, Nothing, ShakeableTimeMachineScreen>() {

@Suppress("DEPRECATION")
private val timeMachineWorkflow =
ShakeableTimeMachineWorkflow(TimeMachineWorkflow(appWorkflow, clock), context)
ShakeableTimeMachineWorkflow(
TimeMachineWorkflow(appWorkflow.mapRendering { asScreen(it) }, clock),
context
)

override fun render(
renderProps: BoardPath,
Expand Down
8 changes: 4 additions & 4 deletions workflow-ui/container-android/api/container-android.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public final class com/squareup/workflow1/ui/modal/AlertContainer : com/squareup
public synthetic fun buildDialog (Ljava/lang/Object;Lcom/squareup/workflow1/ui/ViewEnvironment;)Lcom/squareup/workflow1/ui/modal/ModalContainer$DialogRef;
}

public final class com/squareup/workflow1/ui/modal/AlertContainer$Companion : com/squareup/workflow1/ui/ScreenViewFactory {
public synthetic fun buildView (Lcom/squareup/workflow1/ui/Screen;Lcom/squareup/workflow1/ui/ViewEnvironment;Landroid/content/Context;Landroid/view/ViewGroup;)Landroid/view/View;
public final class com/squareup/workflow1/ui/modal/AlertContainer$Companion : com/squareup/workflow1/ui/ViewFactory {
public fun buildView (Lcom/squareup/workflow1/ui/modal/AlertContainerScreen;Lcom/squareup/workflow1/ui/ViewEnvironment;Landroid/content/Context;Landroid/view/ViewGroup;)Landroid/view/View;
public final fun customThemeBinding (I)Lcom/squareup/workflow1/ui/ScreenViewFactory;
public static synthetic fun customThemeBinding$default (Lcom/squareup/workflow1/ui/modal/AlertContainer$Companion;IILjava/lang/Object;)Lcom/squareup/workflow1/ui/ScreenViewFactory;
public synthetic fun buildView (Ljava/lang/Object;Lcom/squareup/workflow1/ui/ViewEnvironment;Landroid/content/Context;Landroid/view/ViewGroup;)Landroid/view/View;
public final fun customThemeBinding (I)Lcom/squareup/workflow1/ui/ViewFactory;
public static synthetic fun customThemeBinding$default (Lcom/squareup/workflow1/ui/modal/AlertContainer$Companion;IILjava/lang/Object;)Lcom/squareup/workflow1/ui/ViewFactory;
public fun getType ()Lkotlin/reflect/KClass;
}

Expand Down
31 changes: 15 additions & 16 deletions ...flow-ui/container-android/src/main/java/com/squareup/workflow1/ui/modal/AlertContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import androidx.annotation.StyleRes
import androidx.appcompat.app.AlertDialog
import com.squareup.workflow1.ui.ManualScreenViewFactory
import com.squareup.workflow1.ui.ScreenViewFactory
import com.squareup.workflow1.ui.BuilderViewFactory
import com.squareup.workflow1.ui.ViewEnvironment
import com.squareup.workflow1.ui.ViewFactory
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
import com.squareup.workflow1.ui.bindShowRendering
import com.squareup.workflow1.ui.container.R
Expand Down Expand Up @@ -83,29 +83,28 @@ public class AlertContainer @JvmOverloads constructor(

private class AlertContainerViewFactory(
@StyleRes private val dialogThemeResId: Int = 0
) : ScreenViewFactory<AlertContainerScreen<*>> by ManualScreenViewFactory(
type = AlertContainerScreen::class,
viewConstructor = { initialRendering, initialEnv, context, _ ->
AlertContainer(context, dialogThemeResId = dialogThemeResId)
.apply {
id = R.id.workflow_alert_container
layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
bindShowRendering(initialRendering, initialEnv, ::update)
}
}
) : ViewFactory<AlertContainerScreen<*>> by BuilderViewFactory(
type = AlertContainerScreen::class,
viewConstructor = { initialRendering, initialEnv, context, _ ->
AlertContainer(context, dialogThemeResId = dialogThemeResId)
.apply {
id = R.id.workflow_alert_container
layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
bindShowRendering(initialRendering, initialEnv, ::update)
}
}
)

public companion object : ScreenViewFactory<AlertContainerScreen<*>>
by AlertContainerViewFactory() {
public companion object : ViewFactory<AlertContainerScreen<*>> by AlertContainerViewFactory() {
/**
* Creates a [ScreenViewFactory] to show the [AlertScreen]s of an [AlertContainerScreen]
* Creates a [ViewFactory] to show the [AlertScreen]s of an [AlertContainerScreen]
* as Android `AlertDialog`s.
*
* @param dialogThemeResId the resource ID of the theme against which to inflate
* dialogs. Defaults to `0` to use the parent `context`'s default alert dialog theme.
*/
public fun customThemeBinding(
@StyleRes dialogThemeResId: Int = 0
): ScreenViewFactory<AlertContainerScreen<*>> = AlertContainerViewFactory(dialogThemeResId)
): ViewFactory<AlertContainerScreen<*>> = AlertContainerViewFactory(dialogThemeResId)
}
}
2 changes: 1 addition & 1 deletion workflow-ui/container-common/api/container-common.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public final class com/squareup/workflow1/ui/backstack/BackStackScreenKt {
public static final fun toBackStackScreenOrNull (Ljava/util/List;)Lcom/squareup/workflow1/ui/backstack/BackStackScreen;
}

public final class com/squareup/workflow1/ui/modal/AlertContainerScreen : com/squareup/workflow1/ui/Screen, com/squareup/workflow1/ui/modal/HasModals {
public final class com/squareup/workflow1/ui/modal/AlertContainerScreen : com/squareup/workflow1/ui/modal/HasModals {
public fun <init> (Ljava/lang/Object;Lcom/squareup/workflow1/ui/modal/AlertScreen;)V
public fun <init> (Ljava/lang/Object;Ljava/util/List;)V
public synthetic fun <init> (Ljava/lang/Object;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
Expand Down
3 changes: 1 addition & 2 deletions ...ui/container-common/src/main/java/com/squareup/workflow1/ui/modal/AlertContainerScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package com.squareup.workflow1.ui.modal

import com.squareup.workflow1.ui.Screen
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi

/**
Expand All @@ -21,7 +20,7 @@ import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
public data class AlertContainerScreen<B : Any>(
override val beneathModals: B,
override val modals: List<AlertScreen> = emptyList()
) : Screen, HasModals<B, AlertScreen> {
) : HasModals<B, AlertScreen> {
public constructor(
baseScreen: B,
alert: AlertScreen
Expand Down