Skip to content

Commit c4211f8

Browse files
committed
Renames ScreenViewFactory.for* to .from*
`ScreenViewFactory.fromCode()`, lovely.
1 parent 78b74ec commit c4211f8

File tree

41 files changed

+84
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+84
-88
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.ui.tooling.preview.Preview
99
import com.squareup.sample.compose.databinding.LegacyViewBinding
1010
import com.squareup.sample.compose.nestedrenderings.RecursiveWorkflow.LegacyRendering
1111
import com.squareup.workflow1.ui.ScreenViewFactory
12-
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.forViewBinding
12+
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
1313
import com.squareup.workflow1.ui.ScreenViewRunner
1414
import com.squareup.workflow1.ui.ViewEnvironment
1515
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
@@ -28,7 +28,7 @@ class LegacyRunner(private val binding: LegacyViewBinding) : ScreenViewRunner<Le
2828
binding.stub.update(rendering.rendering, viewEnvironment)
2929
}
3030

31-
companion object : ScreenViewFactory<LegacyRendering> by forViewBinding(
31+
companion object : ScreenViewFactory<LegacyRendering> by fromViewBinding(
3232
LegacyViewBinding::inflate, ::LegacyRunner
3333
)
3434
}

samples/containers/android/src/main/java/com/squareup/sample/container/ScrimContainer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
99
import androidx.core.content.ContextCompat
1010
import com.squareup.sample.container.panel.ScrimScreen
1111
import com.squareup.workflow1.ui.ScreenViewFactory
12-
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.forBuiltView
12+
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromCode
1313
import com.squareup.workflow1.ui.ScreenViewHolder
1414
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1515
import com.squareup.workflow1.ui.WorkflowViewStub
@@ -92,7 +92,7 @@ internal class ScrimContainer @JvmOverloads constructor(
9292
}
9393

9494
@OptIn(WorkflowUiExperimentalApi::class)
95-
companion object : ScreenViewFactory<ScrimScreen<*>> by forBuiltView(
95+
companion object : ScreenViewFactory<ScrimScreen<*>> by fromCode(
9696
buildView = { _, initialEnvironment, context, _ ->
9797
val stub = WorkflowViewStub(context)
9898
val scrimContainer = ScrimContainer(context)

samples/containers/android/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class OverviewDetailContainer(view: View) : ScreenViewRunner<OverviewDetailScree
8989
stub.show(combined, viewEnvironment + Single)
9090
}
9191

92-
companion object : ScreenViewFactory<OverviewDetailScreen> by ScreenViewFactory.forLayoutResource(
92+
companion object : ScreenViewFactory<OverviewDetailScreen> by ScreenViewFactory.fromLayout(
9393
layoutId = R.layout.overview_detail,
9494
constructor = ::OverviewDetailContainer
9595
)

samples/containers/hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonLayoutRunner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ data class HelloBackButtonScreen(
1515
val onClick: () -> Unit,
1616
val onBackPressed: (() -> Unit)?
1717
) : AndroidScreen<HelloBackButtonScreen> {
18-
override val viewFactory = ScreenViewFactory.forLayoutResource<HelloBackButtonScreen>(
18+
override val viewFactory = ScreenViewFactory.fromLayout<HelloBackButtonScreen>(
1919
R.layout.hello_back_button_layout, ::HelloBackButtonLayoutRunner
2020
)
2121
}

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/PoemListRendering.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ data class PoemListScreen(
2323
val onPoemSelected: (Int) -> Unit,
2424
val selection: Int = -1
2525
) : AndroidScreen<PoemListScreen> {
26-
override val viewFactory = ScreenViewFactory.forLayoutResource(
26+
override val viewFactory = ScreenViewFactory.fromLayout(
2727
R.layout.list, ::PoemListLayoutRunner
2828
)
2929

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaListScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ data class StanzaListScreen(
2929
val selection: Int = -1
3030
) : AndroidScreen<StanzaListScreen> {
3131
override val viewFactory =
32-
ScreenViewFactory.forLayoutResource(R.layout.list, ::StanzaListLayoutRunner)
32+
ScreenViewFactory.fromLayout(R.layout.list, ::StanzaListLayoutRunner)
3333
}
3434

3535
@OptIn(WorkflowUiExperimentalApi::class)

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ data class StanzaScreen(
3333
override val compatibilityKey = "$title: $stanzaNumber"
3434

3535
override val viewFactory =
36-
ScreenViewFactory.forLayoutResource(R.layout.stanza_layout, ::StanzaLayoutRunner)
36+
ScreenViewFactory.fromLayout(R.layout.stanza_layout, ::StanzaLayoutRunner)
3737
}
3838

3939
@OptIn(WorkflowUiExperimentalApi::class)

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/BoardView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class BoardView(context: Context) : View(context) {
8383

8484
@OptIn(WorkflowUiExperimentalApi::class)
8585
companion object : ScreenViewFactory<Board>
86-
by ScreenViewFactory.forBuiltView(
86+
by ScreenViewFactory.fromCode(
8787
buildView = { _, initialEnvironment, context, _ ->
8888
val view = BoardView(context)
8989
ScreenViewHolder(initialEnvironment, view) { screen, _ ->

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/BoardsListLayoutRunner.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.squareup.cycler.toDataSource
1111
import com.squareup.sample.dungeon.DungeonAppWorkflow.DisplayBoardsListScreen
1212
import com.squareup.sample.dungeon.board.Board
1313
import com.squareup.workflow1.ui.ScreenViewFactory
14-
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.forLayoutResource
14+
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromLayout
1515
import com.squareup.workflow1.ui.ScreenViewRunner
1616
import com.squareup.workflow1.ui.ViewEnvironment
1717
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
@@ -101,7 +101,7 @@ class BoardsListLayoutRunner(rootView: View) : ScreenViewRunner<DisplayBoardsLis
101101
)
102102
}
103103

104-
companion object : ScreenViewFactory<DisplayBoardsListScreen> by forLayoutResource(
104+
companion object : ScreenViewFactory<DisplayBoardsListScreen> by fromLayout(
105105
R.layout.boards_list_layout, ::BoardsListLayoutRunner
106106
)
107107
}

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/GameLayoutRunner.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.squareup.sample.dungeon.Direction.RIGHT
1111
import com.squareup.sample.dungeon.Direction.UP
1212
import com.squareup.sample.dungeon.GameWorkflow.GameRendering
1313
import com.squareup.workflow1.ui.ScreenViewFactory
14-
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.forLayoutResource
14+
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromLayout
1515
import com.squareup.workflow1.ui.ScreenViewRunner
1616
import com.squareup.workflow1.ui.ViewEnvironment
1717
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
@@ -66,7 +66,7 @@ class GameLayoutRunner(view: View) : ScreenViewRunner<GameRendering> {
6666
}
6767
}
6868

69-
companion object : ScreenViewFactory<GameRendering> by forLayoutResource(
69+
companion object : ScreenViewFactory<GameRendering> by fromLayout(
7070
R.layout.game_layout, ::GameLayoutRunner
7171
)
7272
}

0 commit comments

Comments
 (0)