Skip to content

Commit 70af222

Browse files
Merge pull request #462 from square/zachklipp/cleanup-showfirstrendering
Remove useless type parameter from showFirstRendering().
2 parents 4a13c05 + 24a95c4 commit 70af222

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/DecorativeViewFactoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal class DecorativeViewFactoryTest {
4141
initializeView = {
4242
val outerRendering = getRendering<OuterRendering>()
4343
events += "initializeView $outerRendering ${environment!![envString]}"
44-
showFirstRendering<OuterRendering>()
44+
showFirstRendering()
4545
events += "exit initializeView"
4646
}
4747
)

workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/DecorativeViewFactory.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ import kotlin.reflect.KClass
115115
public class DecorativeViewFactory<OuterT : Any, InnerT : Any>(
116116
override val type: KClass<OuterT>,
117117
private val map: (OuterT, ViewEnvironment) -> Pair<InnerT, ViewEnvironment>,
118-
private val initializeView: View.() -> Unit = { showFirstRendering<OuterT>() },
118+
private val initializeView: View.() -> Unit = { showFirstRendering() },
119119
private val doShowRendering: (
120120
view: View,
121121
innerShowRendering: ViewShowRendering<InnerT>,
@@ -133,7 +133,7 @@ public class DecorativeViewFactory<OuterT : Any, InnerT : Any>(
133133
public constructor(
134134
type: KClass<OuterT>,
135135
map: (OuterT) -> InnerT,
136-
initializeView: View.() -> Unit = { showFirstRendering<OuterT>() },
136+
initializeView: View.() -> Unit = { showFirstRendering() },
137137
doShowRendering: (
138138
view: View,
139139
innerShowRendering: ViewShowRendering<InnerT>,

workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/ViewRegistry.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public fun <RenderingT : Any> ViewRegistry.buildView(
148148
initialViewEnvironment: ViewEnvironment,
149149
contextForNewView: Context,
150150
container: ViewGroup? = null,
151-
initializeView: View.() -> Unit = { showFirstRendering<RenderingT>() }
151+
initializeView: View.() -> Unit = { showFirstRendering() }
152152
): View {
153153
return getFactoryForRendering(initialRendering).buildView(
154154
initialRendering, initialViewEnvironment, contextForNewView, container
@@ -176,6 +176,6 @@ public operator fun ViewRegistry.plus(other: ViewRegistry): ViewRegistry =
176176
* [getRendering] and [environment].
177177
*/
178178
@WorkflowUiExperimentalApi
179-
public fun <RenderingT : Any> View.showFirstRendering() {
180-
showRendering(getRendering<RenderingT>()!!, environment!!)
179+
public fun View.showFirstRendering() {
180+
showRendering(getRendering()!!, environment!!)
181181
}

0 commit comments

Comments
 (0)