Merge pull request #1444 from square/zachklipp/cleanup-nested-sample

Clean up some missed junk in the new flashing feature in the nested sample.

Author: zach-klippenstein

samples/compose-samples/src/main/java/com/squareup/sample/compose/nestedrenderings/RecursiveViewFactory.kt

@@ -20,10 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -55,13 +52,11 @@ val RecursiveComposableFactory = ScreenComposableFactory<Rendering> { rendering
       .compositeOver(Color.Black)
   }
 
-  var lastFlashedTrigger by remember { mutableIntStateOf(rendering.flashTrigger) }
   val flashAlpha = remember { Animatable(Color(0x00FFFFFF)) }
 
   // Flash the card white when asked.
   LaunchedEffect(rendering.flashTrigger) {
     if (rendering.flashTrigger != 0) {
-      lastFlashedTrigger = rendering.flashTrigger
       flashAlpha.animateTo(
         Color(0x00FFFFFF),
         animationSpec = keyframes {

samples/compose-samples/src/main/java/com/squareup/sample/compose/nestedrenderings/RecursiveWorkflow.kt

@@ -5,15 +5,14 @@ import com.squareup.sample.compose.databinding.LegacyViewBinding
 import com.squareup.sample.compose.nestedrenderings.RecursiveWorkflow.LegacyRendering
 import com.squareup.sample.compose.nestedrenderings.RecursiveWorkflow.Rendering
 import com.squareup.sample.compose.nestedrenderings.RecursiveWorkflow.State
-import com.squareup.workflow1.SessionWorkflow
 import com.squareup.workflow1.Snapshot
+import com.squareup.workflow1.StatefulWorkflow
 import com.squareup.workflow1.WorkflowExperimentalApi
 import com.squareup.workflow1.action
 import com.squareup.workflow1.renderChild
 import com.squareup.workflow1.ui.AndroidScreen
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.ScreenViewFactory
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.ZERO
@@ -28,14 +27,13 @@ import kotlin.time.Duration.Companion.seconds
  * through Composable renderings as well as adapting in both directions.
  */
 @OptIn(WorkflowExperimentalApi::class)
-object RecursiveWorkflow : SessionWorkflow<Unit, State, Unit, Screen>() {
+object RecursiveWorkflow : StatefulWorkflow<Unit, State, Unit, Screen>() {
 
   data class State(
     val children: Int = 0,
     val flashTrigger: Int = 0,
     val nextFlashId: Int = 0,
     val pendingFlashes: List<Int> = emptyList(),
-    val flashScope: CoroutineScope,
   )
 
   /**
@@ -69,8 +67,7 @@ object RecursiveWorkflow : SessionWorkflow<Unit, State, Unit, Screen>() {
   override fun initialState(
     props: Unit,
     snapshot: Snapshot?,
-    workflowScope: CoroutineScope
-  ): State = State(flashScope = workflowScope)
+  ): State = State()
 
   override fun render(
     renderProps: Unit,