Removes no longer needed parentheses in @Composable() annotations
-Enables the NonParenthesizedAnnotationsOnFunctionalTypes flag to disable the IDE warning
-Temporarily disables the 'paren-spacing' lint in ktlint, due to: https://github.com/pinterest/ktlint/issues/737
-Turns unnecessary parentheses into a 'warning', and stops ignoring this IDE inspection in the UI project
Bug: b/155391691
Test: ./gradlew bOS, Studio
Change-Id: Ib4af53591b82a0d56ae0733ff2561196c2d49635
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index aafa7bf..32e6500 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -68,9 +68,7 @@
</inspection_tool>
<inspection_tool class="RawTypeCanBeGeneric" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="RawUseOfParameterizedType" enabled="true" level="ERROR" enabled_by_default="true" />
- <inspection_tool class="RemoveEmptyParenthesesFromAnnotationEntry" enabled="true" level="WEAK WARNING" enabled_by_default="true">
- <scope name="Compose" level="WEAK WARNING" enabled="false" />
- </inspection_tool>
+ <inspection_tool class="RemoveEmptyParenthesesFromAnnotationEntry" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="TestFunctionName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<scope name="Compose" level="WEAK WARNING" enabled="true">
<option name="namePattern" value="[A-Za-z_\d]+" />
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
index b7c096ea..d9bae01 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
@@ -66,6 +66,9 @@
val conf = project.configurations.create("kotlinPlugin")
project.tasks.withType(KotlinCompile::class.java).configureEach { compile ->
+ // TODO: remove when this is enabled by default in Kotlin 1.4
+ compile.kotlinOptions.freeCompilerArgs +=
+ "-XXLanguage:+NonParenthesizedAnnotationsOnFunctionalTypes"
compile.kotlinOptions.freeCompilerArgs +=
listOf("-P", "plugin:androidx.compose.plugins.idea:enabled=true")
compile.dependsOn(conf)
diff --git a/buildSrc/src/main/kotlin/androidx/build/Ktlint.kt b/buildSrc/src/main/kotlin/androidx/build/Ktlint.kt
index 2ee14d4..c47ceb2 100644
--- a/buildSrc/src/main/kotlin/androidx/build/Ktlint.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/Ktlint.kt
@@ -34,8 +34,11 @@
/**
* Import ordering check does not match IJ default ordering.
* New line check at the end of file is not useful for our project.
+ * TODO: https://github.com/pinterest/ktlint/issues/737
+ * Paren spacing doesn't understand @Composable () -> Unit, as it thinks the () is part of the
+ * annotation and not the function type of the lambda, so disabling this for now.
*/
-private const val DisabledRules = "import-ordering,final-newline"
+private const val DisabledRules = "import-ordering,final-newline,paren-spacing"
fun Project.configureKtlint() {
val outputDir = "${project.buildDir}/reports/ktlint/"
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/AbstractCodegenSignatureTest.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/AbstractCodegenSignatureTest.kt
index 4834c91..b88e636 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/AbstractCodegenSignatureTest.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/AbstractCodegenSignatureTest.kt
@@ -153,7 +153,7 @@
)
}
- fun invokeComposable(composer: Composer<*>?, fn: @Composable() () -> Unit) {
+ fun invokeComposable(composer: Composer<*>?, fn: @Composable () -> Unit) {
if (composer == null) error("Composer was null")
val composition = compositionFor(composer) { a, b -> composer }
composition.setContent(fn)
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallLoweringTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallLoweringTests.kt
index 8d039c2..6ca4cfa 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallLoweringTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallLoweringTests.kt
@@ -65,7 +65,7 @@
fun testSimpleInlining(): Unit = ensureSetup {
compose("""
@Composable
- inline fun foo(block: @Composable() () -> Unit) {
+ inline fun foo(block: @Composable () -> Unit) {
block()
}
@@ -85,7 +85,7 @@
import androidx.compose.*
@Composable
- fun test(children: @Composable() () -> Unit) {
+ fun test(children: @Composable () -> Unit) {
children()
}
"""
@@ -158,13 +158,13 @@
"""
import androidx.compose.*
- @Composable fun <T> A(value: T, block: @Composable() (T) -> Unit) {
+ @Composable fun <T> A(value: T, block: @Composable (T) -> Unit) {
block(value)
}
@Composable fun <T> B(
value: T,
- block: @Composable() (@Composable() (T) -> Unit) -> Unit
+ block: @Composable (@Composable (T) -> Unit) -> Unit
) {
block({ })
}
@@ -246,7 +246,7 @@
@Composable
inline fun PointerInputWrapper(
- crossinline children: @Composable() () -> Unit
+ crossinline children: @Composable () -> Unit
) {
// Hide the internals of PointerInputNode
LinearLayout {
@@ -288,7 +288,7 @@
"""
@Composable
inline fun PointerInputWrapper(
- crossinline children: @Composable() () -> Unit
+ crossinline children: @Composable () -> Unit
) {
LinearLayout {
children()
@@ -296,7 +296,7 @@
}
@Composable
- fun PressReleasedGestureDetector(children: @Composable() () -> Unit) {
+ fun PressReleasedGestureDetector(children: @Composable () -> Unit) {
PointerInputWrapper {
children()
}
@@ -310,11 +310,11 @@
codegen(
"""
@Composable
- inline fun Foo(crossinline children: @Composable() () -> Unit) {
+ inline fun Foo(crossinline children: @Composable () -> Unit) {
children()
}
- @Composable fun test(children: @Composable() () -> Unit) {
+ @Composable fun test(children: @Composable () -> Unit) {
Foo {
println("hello world")
children()
@@ -410,7 +410,7 @@
codegen(
"""
- @Composable fun SomeThing(children: @Composable() () -> Unit) {}
+ @Composable fun SomeThing(children: @Composable () -> Unit) {}
@Composable
fun Example() {
@@ -458,7 +458,7 @@
codegen(
"""
- fun startCompose(block: @Composable() () -> Unit) {}
+ fun startCompose(block: @Composable () -> Unit) {}
fun nonComposable() {
startCompose {
@@ -511,7 +511,7 @@
fun testSetContent(): Unit = ensureSetup {
codegen(
"""
- fun fakeCompose(block: @Composable() ()->Unit) { }
+ fun fakeCompose(block: @Composable ()->Unit) { }
class Test {
fun test() {
@@ -528,7 +528,7 @@
fun testComposeWithResult(): Unit = ensureSetup {
compose(
"""
- @Composable fun <T> identity(block: @Composable() ()->T): T = block()
+ @Composable fun <T> identity(block: @Composable ()->T): T = block()
@Composable
fun TestCall() {
@@ -599,7 +599,7 @@
}
@Composable
- fun FancyBox2(children: @Composable() ()->Unit) {
+ fun FancyBox2(children: @Composable ()->Unit) {
children()
}
""",
@@ -1043,7 +1043,7 @@
@Test
fun testInline_NonComposable_Identity(): Unit = ensureSetup {
compose("""
- @Composable inline fun InlineWrapper(base: Int, children: @Composable() ()->Unit) {
+ @Composable inline fun InlineWrapper(base: Int, children: @Composable ()->Unit) {
children()
}
""",
@@ -1071,7 +1071,7 @@
fun testInline_Composable_EmitChildren(): Unit = ensureSetup {
compose("""
@Composable
- inline fun InlineWrapper(base: Int, crossinline children: @Composable() ()->Unit) {
+ inline fun InlineWrapper(base: Int, crossinline children: @Composable ()->Unit) {
LinearLayout(id = base + 0) {
children()
}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolutionDiagnosticsTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolutionDiagnosticsTests.kt
index c5de69d..decde5b 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolutionDiagnosticsTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolutionDiagnosticsTests.kt
@@ -41,7 +41,7 @@
val x: Any? = null
- fun Activity.setViewContent(composable: @Composable() () -> Unit): Composition? {
+ fun Activity.setViewContent(composable: @Composable () -> Unit): Composition? {
assert(composable != x)
return null
}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolverTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolverTests.kt
index 1b9cbbe..32e6f2c 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolverTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeCallResolverTests.kt
@@ -107,7 +107,7 @@
import androidx.compose.*
@Composable
- fun test(children: @Composable() () -> Unit) {
+ fun test(children: @Composable () -> Unit) {
<call>children()
}
"""
@@ -117,13 +117,13 @@
"""
import androidx.compose.*
- @Composable fun <T> A(value: T, block: @Composable() (T) -> Unit) {
+ @Composable fun <T> A(value: T, block: @Composable (T) -> Unit) {
<call>block(value)
}
@Composable fun <T> B(
value: T,
- block: @Composable() (@Composable() (T) -> Unit) -> Unit
+ block: @Composable (@Composable (T) -> Unit) -> Unit
) {
<call>block({ })
}
@@ -164,7 +164,7 @@
@Composable fun Foo(
scope: TextSpanScope,
- composable: @Composable() TextSpanScope.() -> Unit
+ composable: @Composable TextSpanScope.() -> Unit
) {
with(scope) {
<call>composable()
@@ -200,7 +200,7 @@
@Composable
inline fun PointerInputWrapper(
- crossinline children: @Composable() () -> Unit
+ crossinline children: @Composable () -> Unit
) {
// Hide the internals of PointerInputNode
<emit>LinearLayout {
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt
index aae56dc..b72dd9b 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt
@@ -32,7 +32,7 @@
@Test
fun testParameterlessChildrenLambdasReused(): Unit = checkApi(
"""
- @Composable fun Foo(children: @Composable() () -> Unit) {
+ @Composable fun Foo(children: @Composable () -> Unit) {
}
@Composable fun Bar() {
Foo {}
@@ -97,7 +97,7 @@
fun testAnonymousParamNaming(): Unit = validateBytecode(
"""
@Composable
- fun Foo(children: @Composable() (a: Int, b: Int) -> Unit) {}
+ fun Foo(children: @Composable (a: Int, b: Int) -> Unit) {}
@Composable
fun test() {
Foo { _, _ -> }
@@ -224,7 +224,7 @@
fun testDataClassHashCode(): Unit = validateBytecode(
"""
data class Foo(
- val bar: @Composable() () -> Unit
+ val bar: @Composable () -> Unit
)
""") {
assert(!it.contains("CHECKCAST kotlin/jvm/functions/Function0"))
@@ -339,7 +339,7 @@
fun testCorrectComposerPassed5(): Unit = checkComposerParam(
"""
var a: Composer<*>? = null
- @Composable fun Wrap(children: @Composable() () -> Unit) {
+ @Composable fun Wrap(children: @Composable () -> Unit) {
children()
}
fun run() {
@@ -551,7 +551,7 @@
@Test
fun testLocalLambda(): Unit = checkApi(
"""
- @Composable fun Bar(children: @Composable() () -> Unit) {
+ @Composable fun Bar(children: @Composable () -> Unit) {
val foo = @Composable { x: Int -> print(x) }
foo(123)
children()
@@ -584,7 +584,7 @@
@Test
fun testNesting(): Unit = checkApi(
"""
- @Composable fun Wrap(children: @Composable() (x: Int) -> Unit) {
+ @Composable fun Wrap(children: @Composable (x: Int) -> Unit) {
children(123)
}
@Composable fun App(x: Int) {
@@ -756,7 +756,7 @@
"""
@Composable
fun Foo() {
- val c: @Composable() () -> Unit = with(123) {
+ val c: @Composable () -> Unit = with(123) {
val x = @Composable {}
x
}
@@ -771,7 +771,7 @@
"""
@Composable
fun Scaffold(
- topAppBar: @Composable() (() -> Unit)? = null
+ topAppBar: @Composable (() -> Unit)? = null
) {}
"""
) {
@@ -792,9 +792,9 @@
@Test
fun testLambdaMemoization(): Unit = validateBytecode(
"""
- fun subcompose(block: @Composable() () -> Unit) {}
+ fun subcompose(block: @Composable () -> Unit) {}
private class Foo {
- var children: @Composable() (Double) -> Unit = {}
+ var children: @Composable (Double) -> Unit = {}
fun subcompose() {
val constraints = Math.random()
subcompose {
@@ -1053,7 +1053,7 @@
@Test
fun testInlineCall(): Unit = checkApi(
"""
- @Composable inline fun Example(children: @Composable() () -> Unit) {
+ @Composable inline fun Example(children: @Composable () -> Unit) {
children()
}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt
index b69c57f..8d8e751 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt
@@ -197,7 +197,7 @@
@Test
fun testInlineCall(): Unit = composerParam(
"""
- @Composable inline fun Example(children: @Composable() () -> Unit) {
+ @Composable inline fun Example(children: @Composable () -> Unit) {
children()
}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsCodegenTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsCodegenTests.kt
index b2bf205..ce0caa6 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsCodegenTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsCodegenTests.kt
@@ -220,7 +220,7 @@
fun testSetContent(): Unit = ensureSetup {
codegen(
"""
- fun fakeCompose(block: @Composable() ()->Unit) { }
+ fun fakeCompose(block: @Composable ()->Unit) { }
class Test {
fun test() {
@@ -237,7 +237,7 @@
fun testComposeWithResult(): Unit = ensureSetup {
compose(
"""
- @Composable fun <T> identity(block: @Composable() ()->T): T = block()
+ @Composable fun <T> identity(block: @Composable ()->T): T = block()
@Composable
fun TestCall() {
@@ -310,7 +310,7 @@
}
@Composable
- fun FancyBox2(children: @Composable() ()->Unit) {
+ fun FancyBox2(children: @Composable ()->Unit) {
children()
}
""",
@@ -761,7 +761,7 @@
@Test
fun testInline_NonComposable_Identity(): Unit = ensureSetup {
compose("""
- @Composable inline fun InlineWrapper(base: Int, children: @Composable() ()->Unit) {
+ @Composable inline fun InlineWrapper(base: Int, children: @Composable ()->Unit) {
children()
}
""",
@@ -779,7 +779,7 @@
fun testInline_Composable_Identity(): Unit = ensureSetup {
compose("""
@Composable
- inline fun InlineWrapper(base: Int, children: @Composable() ()->Unit) {
+ inline fun InlineWrapper(base: Int, children: @Composable ()->Unit) {
children()
}
""",
@@ -797,7 +797,7 @@
fun testInline_Composable_EmitChildren(): Unit = ensureSetup {
compose("""
@Composable
- inline fun InlineWrapper(base: Int, crossinline children: @Composable() ()->Unit) {
+ inline fun InlineWrapper(base: Int, crossinline children: @Composable ()->Unit) {
LinearLayout(id = base + 0) {
children()
}
@@ -1372,7 +1372,7 @@
compose(
"""
@Composable
- fun Block(children: @Composable() () -> Unit) {
+ fun Block(children: @Composable () -> Unit) {
children()
}
""",
@@ -1547,7 +1547,7 @@
fun testImplicitReceiverPassing1(): Unit = ensureSetup {
compose(
"""
- @Composable fun Int.Foo(x: @Composable() Int.() -> Unit) {
+ @Composable fun Int.Foo(x: @Composable Int.() -> Unit) {
x()
}
""",
@@ -1569,7 +1569,7 @@
fun testImplicitReceiverPassing2(): Unit = ensureSetup {
compose(
"""
- @Composable fun Int.Foo(x: @Composable() Int.(text: String) -> Unit, text: String) {
+ @Composable fun Int.Foo(x: @Composable Int.(text: String) -> Unit, text: String) {
x(text=text)
}
@@ -1778,7 +1778,7 @@
val component = @Composable {
TextView(text="Hello, world!", id=42)
}
- class HolderA(val composable: @Composable() () -> Unit)
+ class HolderA(val composable: @Composable () -> Unit)
val holder = HolderA(component)
@@ -1800,7 +1800,7 @@
val component = @Composable {
TextView(text="Hello, world!", id=42)
}
- class HolderB(val composable: @Composable() () -> Unit) {
+ class HolderB(val composable: @Composable () -> Unit) {
@Composable
fun Foo() {
composable()
@@ -1845,7 +1845,7 @@
compose(
"""
@Composable
- fun Foo(a: Int = 42, b: String, c: @Composable() () -> Unit) {
+ fun Foo(a: Int = 42, b: String, c: @Composable () -> Unit) {
c()
TextView(text=b, id=a)
}
@@ -1963,7 +1963,7 @@
}
@Composable
- fun Box(children: @Composable() ()->Unit) {
+ fun Box(children: @Composable ()->Unit) {
LinearLayout(orientation=LinearLayout.VERTICAL) {
children()
}
@@ -2064,7 +2064,7 @@
@Composable
fun DefineAction(
onAction: Action = Action(param = 1) {},
- children: @Composable() ()->Unit
+ children: @Composable ()->Unit
) { }
"""
)
@@ -2241,7 +2241,7 @@
fun log(msg: String) { output.add(msg) }
@Composable
- fun Container(children: @Composable() () -> Unit) {
+ fun Container(children: @Composable () -> Unit) {
log("Container")
children()
}
@@ -2310,12 +2310,12 @@
val m = M()
@Composable
- inline fun InlineContainer(children: @Composable() () -> Unit) {
+ inline fun InlineContainer(children: @Composable () -> Unit) {
children()
}
@Composable
- fun Container(children: @Composable() () -> Unit) {
+ fun Container(children: @Composable () -> Unit) {
children()
}
@@ -2365,7 +2365,7 @@
class Receiver { var r: Int = 0 }
@Composable
- fun Container(children: @Composable() Receiver.() -> Unit) {
+ fun Container(children: @Composable Receiver.() -> Unit) {
Receiver().children()
}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsTypeResolutionTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsTypeResolutionTests.kt
index e982d99..adbfcef 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsTypeResolutionTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FcsTypeResolutionTests.kt
@@ -95,16 +95,16 @@
import androidx.compose.*
import android.widget.LinearLayout
- @Composable fun Foo(x: Int, composeItem: @Composable() () -> Unit = {}) {
+ @Composable fun Foo(x: Int, composeItem: @Composable () -> Unit = {}) {
println(x)
print(composeItem == {})
}
@Composable fun test(
- children: @Composable() () -> Unit,
+ children: @Composable () -> Unit,
value: Int,
x: Int,
- children2: @Composable() () -> Unit,
+ children2: @Composable () -> Unit,
value2: Int
) {
LinearLayout {
@@ -194,7 +194,7 @@
// NOTE: It's important that the diagnostic be only over the call target, and not the
// entire element so that a single error doesn't end up making a huge part of an
// otherwise correct file "red".
- @Composable fun Test(F: @Composable() (x: Foo) -> Unit) {
+ @Composable fun Test(F: @Composable (x: Foo) -> Unit) {
// NOTE: constructor attributes and fn params get a "missing parameter" diagnostic
A(<!NO_VALUE_FOR_PARAMETER!>)<!>
@@ -235,7 +235,7 @@
"""
import androidx.compose.*
- @Composable fun A(children: @Composable() () -> Unit) { children() }
+ @Composable fun A(children: @Composable () -> Unit) { children() }
@Composable fun Test() {
A(children={}) <!TOO_MANY_ARGUMENTS!>{ }<!>
@@ -406,7 +406,7 @@
import androidx.compose.*
object MyNamespace {
- @Composable fun Bar(children: @Composable() () -> Unit = {}) {
+ @Composable fun Bar(children: @Composable () -> Unit = {}) {
children()
}
@@ -465,17 +465,17 @@
import android.widget.Button
import android.widget.LinearLayout
- @Composable fun ChildrenRequired2(children: @Composable() () -> Unit) { children() }
+ @Composable fun ChildrenRequired2(children: @Composable () -> Unit) { children() }
- @Composable fun ChildrenOptional3(children: @Composable() () -> Unit = {}){ children() }
+ @Composable fun ChildrenOptional3(children: @Composable () -> Unit = {}){ children() }
@Composable fun NoChildren2() {}
@Composable
- fun MultiChildren(c: @Composable() (x: Int) -> Unit = {}) { c(1) }
+ fun MultiChildren(c: @Composable (x: Int) -> Unit = {}) { c(1) }
@Composable
- fun MultiChildren(c: @Composable() (x: Int, y: Int) -> Unit = { x, y ->println(x + y) }) { c(1,1) }
+ fun MultiChildren(c: @Composable (x: Int, y: Int) -> Unit = { x, y ->println(x + y) }) { c(1,1) }
@Composable fun Test() {
ChildrenRequired2 {}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FunctionBodySkippingTransformTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FunctionBodySkippingTransformTests.kt
index 61b2267..5473711 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FunctionBodySkippingTransformTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/FunctionBodySkippingTransformTests.kt
@@ -49,7 +49,7 @@
fun testIfInLambda(): Unit = comparisonPropagation(
"""
@Composable fun A(x: Int = 0, y: Int = 0) {}
- @Composable fun Wrap(children: @Composable() () -> Unit) {
+ @Composable fun Wrap(children: @Composable () -> Unit) {
children()
}
""",
@@ -110,7 +110,7 @@
@Composable fun A(x: Int = 0, y: Int = 0) {}
""",
"""
- @Composable fun Wrap(y: Int, children: @Composable() (x: Int) -> Unit) {
+ @Composable fun Wrap(y: Int, children: @Composable (x: Int) -> Unit) {
children(y)
}
@Composable
@@ -157,7 +157,7 @@
%dirty = %dirty or if (%composer.changed(y)) 0b1000 else 0b00010000
}
if (%dirty and 0b1011 xor 0b1010 !== 0 || !%composer.skipping) {
- Wrap(10, restartableFunction(%composer, -756386995, true) { it: Int, %composer: Composer<*>?, %changed: Int ->
+ Wrap(10, restartableFunction(%composer, -756386997, true) { it: Int, %composer: Composer<*>?, %changed: Int ->
A(x, 0, %composer, 0b0110 and %dirty, 0b0010)
}, %composer, 0b0110)
} else {
@@ -652,7 +652,7 @@
fun testNestedCalls(): Unit = comparisonPropagation(
"""
@Composable fun B(a: Int = 0, b: Int = 0, c: Int = 0) {}
- @Composable fun Provide(children: @Composable() (Int) -> Unit) {}
+ @Composable fun Provide(children: @Composable (Int) -> Unit) {}
""",
"""
@Composable
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt
index 5a0cc83..144a1a6 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt
@@ -171,7 +171,7 @@
import androidx.compose.Composable
import android.widget.LinearLayout
- @Composable inline fun row(crossinline children: @Composable() () -> Unit) {
+ @Composable inline fun row(crossinline children: @Composable () -> Unit) {
LinearLayout {
children()
}
@@ -236,7 +236,7 @@
@Composable
inline fun <T> key(
- block: @Composable() () -> T
+ block: @Composable () -> T
): T = block()
"""
),
@@ -272,7 +272,7 @@
@Suppress("UNUSED_PARAMETER")
@Pivotal
v1: Int,
- block: @Composable() () -> Int
+ block: @Composable () -> Int
): Int = block()
"""
),
@@ -670,7 +670,7 @@
import androidx.compose.*
- class Foo(val bar: @Composable() () -> Unit)
+ class Foo(val bar: @Composable () -> Unit)
"""
),
"Main" to mapOf(
@@ -678,7 +678,7 @@
import a.Foo
import androidx.compose.*
- @Composable fun Example(bar: @Composable() () -> Unit) {
+ @Composable fun Example(bar: @Composable () -> Unit) {
val foo = Foo(bar)
}
"""
@@ -699,7 +699,7 @@
import androidx.compose.*
- @Composable fun InternalComp(block: @Composable() () -> Unit) {
+ @Composable fun InternalComp(block: @Composable () -> Unit) {
block()
}
"""
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxTransformationTest.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxTransformationTest.kt
index b8eff86..2646762 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxTransformationTest.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxTransformationTest.kt
@@ -259,7 +259,7 @@
import androidx.compose.*
@Composable fun HelperComponent(
- children: @Composable() (title: String, rating: Int) -> Unit
+ children: @Composable (title: String, rating: Int) -> Unit
) {
children("Hello World!", 5)
children("Kompose is awesome!", 5)
@@ -283,7 +283,7 @@
import android.widget.*
import androidx.compose.*
- @Composable fun HelperComponent(children: @Composable() () -> Unit) {
+ @Composable fun HelperComponent(children: @Composable () -> Unit) {
}
class MainComponent {
@@ -304,11 +304,11 @@
import android.widget.*
import androidx.compose.*
- @Composable fun A(children: @Composable() () -> Unit) {
+ @Composable fun A(children: @Composable () -> Unit) {
children()
}
- @Composable fun B(children: @Composable() () -> Unit) {
+ @Composable fun B(children: @Composable () -> Unit) {
children()
}
@@ -333,11 +333,11 @@
import android.widget.*
import androidx.compose.*
- @Composable fun A(children: @Composable() (x: String) -> Unit) {
+ @Composable fun A(children: @Composable (x: String) -> Unit) {
children("")
}
- @Composable fun B(children: @Composable() (y: String) -> Unit) {
+ @Composable fun B(children: @Composable (y: String) -> Unit) {
children("")
}
@@ -379,7 +379,7 @@
import android.widget.*
import androidx.compose.*
- @Composable fun HelperComponent(children: @Composable() () -> Unit) {}
+ @Composable fun HelperComponent(children: @Composable () -> Unit) {}
class MainComponent {
@Composable
@@ -515,7 +515,7 @@
"""
import androidx.compose.*
- class Test(var children: @Composable() (x: Int) -> Unit) {
+ class Test(var children: @Composable (x: Int) -> Unit) {
@Composable
operator fun invoke() {
children(x=123)
@@ -545,7 +545,7 @@
import android.widget.*
import android.content.*
- @Composable fun Example(children: @Composable() () -> Unit) {
+ @Composable fun Example(children: @Composable () -> Unit) {
}
@@ -563,7 +563,7 @@
import androidx.compose.*
@Composable
- fun Example(children: @Composable() () -> Unit) {}
+ fun Example(children: @Composable () -> Unit) {}
@Composable
fun run(text: String) {
@@ -579,7 +579,7 @@
import androidx.compose.*
@Composable
- fun Example(children: @Composable() (String) -> Unit) {}
+ fun Example(children: @Composable (String) -> Unit) {}
@Composable
fun run(text: String) {
@@ -681,11 +681,11 @@
import androidx.compose.*
import androidx.ui.androidview.adapters.*
- @Composable fun Foo(children: @Composable() (sub: @Composable() () -> Unit) -> Unit) {
+ @Composable fun Foo(children: @Composable (sub: @Composable () -> Unit) -> Unit) {
}
- @Composable fun Boo(children: @Composable() () -> Unit) {
+ @Composable fun Boo(children: @Composable () -> Unit) {
}
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/LambdaMemoizationTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/LambdaMemoizationTests.kt
index 93c8012..c334929 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/LambdaMemoizationTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/LambdaMemoizationTests.kt
@@ -36,7 +36,7 @@
fun eventFired() { }
@Composable
- fun EventHolder(event: () -> Unit, block: @Composable() () -> Unit) {
+ fun EventHolder(event: () -> Unit, block: @Composable () -> Unit) {
workToBeAvoided()
block()
}
@@ -74,7 +74,7 @@
fun eventFired() { }
@Composable
- fun EventHolder(event: () -> Unit, block: @Composable() () -> Unit) {
+ fun EventHolder(event: () -> Unit, block: @Composable () -> Unit) {
workToBeAvoided()
block()
}
@@ -144,7 +144,7 @@
fun eventFired(data: String) { }
@Composable
- fun EventHolder(event: () -> Unit, block: @Composable() () -> Unit) {
+ fun EventHolder(event: () -> Unit, block: @Composable () -> Unit) {
workToBeRepeated()
block()
}
@@ -172,7 +172,7 @@
fun eventFired(data: String) { }
@Composable
- fun EventHolder(event: () -> Unit, block: @Composable() () -> Unit) {
+ fun EventHolder(event: () -> Unit, block: @Composable () -> Unit) {
workToBeRepeated()
block()
}
@@ -251,7 +251,7 @@
}
@Composable
- fun Wrapped(block: @Composable() () -> Unit) {
+ fun Wrapped(block: @Composable () -> Unit) {
block()
}
@@ -290,7 +290,7 @@
}
@Composable
- fun Wrapped(block: @Composable() () -> Unit) {
+ fun Wrapped(block: @Composable () -> Unit) {
block()
}
@@ -421,7 +421,7 @@
}
@Composable
- fun Wrap(block: @Composable() () -> Unit) {
+ fun Wrap(block: @Composable () -> Unit) {
workToBeAvoided()
block()
workToBeAvoided()
@@ -479,7 +479,7 @@
@Test
fun wrapLambaExpressions() = skipping("""
@Composable
- fun Wrapper(block: @Composable() () -> Unit) {
+ fun Wrapper(block: @Composable () -> Unit) {
workToBeAvoided()
block()
workToBeAvoided()
@@ -498,21 +498,21 @@
@Test
fun nonCapturingComposableLambda() = skipping("""
@Composable
- fun Wrapper1(block: @Composable() () -> Unit) {
+ fun Wrapper1(block: @Composable () -> Unit) {
workToBeAvoided("Wrapper1.1")
block()
workToBeAvoided("Wrapper1.2")
}
@Composable
- fun Wrapper2(block: @Composable() () -> Unit) {
+ fun Wrapper2(block: @Composable () -> Unit) {
workToBeAvoided("Wrapper2.1")
Wrapper1(block = block)
workToBeAvoided("Wrapper2.2")
}
@Composable
- fun Wrapper3(block: @Composable() () -> Unit) {
+ fun Wrapper3(block: @Composable () -> Unit) {
workToBeAvoided("Wrapper3.1")
Wrapper2 {
block()
@@ -536,7 +536,7 @@
@Test
fun wrappingOneParameter() = skipping("""
@Composable
- fun Wrap(block: @Composable() (p1: String) -> Unit) {
+ fun Wrap(block: @Composable (p1: String) -> Unit) {
workToBeAvoided()
block("test")
workToBeAvoided()
@@ -557,7 +557,7 @@
@Test // Selecting 23 as 22 is the maximum number handled by RestartingFunction
fun wrapping23Parameters() = skipping("""
@Composable
- fun Wrap(block: @Composable() (
+ fun Wrap(block: @Composable (
p1: String,
p2: String,
p3: String,
@@ -635,7 +635,7 @@
class Receiver() { }
@Composable
- fun Wrapper(block: @Composable() Receiver.() -> Unit) {
+ fun Wrapper(block: @Composable Receiver.() -> Unit) {
workToBeAvoided()
val receiver = Receiver()
receiver.block()
@@ -655,7 +655,7 @@
@Test
fun untrackedLambdasShouldNotForceEvaluation() = skipping("""
@Composable
- fun Wrapper(block: @Composable() () -> Unit) {
+ fun Wrapper(block: @Composable () -> Unit) {
workToBeAvoided()
block()
workToBeAvoided()
@@ -680,14 +680,14 @@
fun lambdasWithReturnResultsShouldBeUntracked() = skipping("""
@Composable
- fun Test1(param: @Composable() () -> String) {
+ fun Test1(param: @Composable () -> String) {
workToBeRepeated()
param()
workToBeRepeated()
}
@Composable
- fun Test2(param: @Composable() () -> String) {
+ fun Test2(param: @Composable () -> String) {
workToBeAvoided()
Test1(param)
workToBeAvoided()
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ScopeComposabilityTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ScopeComposabilityTests.kt
index 060b8f7..3e508ee 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ScopeComposabilityTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ScopeComposabilityTests.kt
@@ -100,7 +100,7 @@
"""
import androidx.compose.*
- @Composable fun Wrap(block: @Composable() () -> Unit) { block() }
+ @Composable fun Wrap(block: @Composable () -> Unit) { block() }
@Composable
fun Bar() {
@@ -135,7 +135,7 @@
"""
import androidx.compose.*
- fun kickOff(block: @Composable() () -> Unit) { }
+ fun kickOff(block: @Composable () -> Unit) { }
fun Bar() {
<normal>
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/analysis/ComposableCheckerTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/analysis/ComposableCheckerTests.kt
index aa28521..5884864 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/analysis/ComposableCheckerTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/analysis/ComposableCheckerTests.kt
@@ -98,8 +98,8 @@
import androidx.compose.*;
import android.widget.TextView;
- val myLambda1 = @Composable() { TextView(text="Hello World!") }
- val myLambda2: @Composable() ()->Unit = { TextView(text="Hello World!") }
+ val myLambda1 = @Composable { TextView(text="Hello World!") }
+ val myLambda2: @Composable ()->Unit = { TextView(text="Hello World!") }
""")
}
@@ -160,7 +160,7 @@
import androidx.compose.*;
import android.widget.TextView;
- fun foo(children: @Composable() ()->Unit) {
+ fun foo(children: @Composable ()->Unit) {
<!SVC_INVOCATION!>children<!>()
}
""")
@@ -172,7 +172,7 @@
import android.widget.TextView;
fun foo() {
- val bar: @Composable() ()->Unit = @Composable {
+ val bar: @Composable ()->Unit = @Composable {
TextView()
}
<!SVC_INVOCATION!>bar<!>()
@@ -220,7 +220,7 @@
check("""
import androidx.compose.*;
- val adHoc = <!WRONG_ANNOTATION_TARGET!>@Composable()<!> object {
+ val adHoc = <!WRONG_ANNOTATION_TARGET!>@Composable<!> object {
var x: Int = 0
var y: Int = 0
}
@@ -231,7 +231,7 @@
open class Noise() {}
- val adHoc = <!WRONG_ANNOTATION_TARGET!>@Composable()<!> object : Noise() {
+ val adHoc = <!WRONG_ANNOTATION_TARGET!>@Composable<!> object : Noise() {
var x: Int = 0
var y: Int = 0
}
@@ -398,7 +398,7 @@
import androidx.compose.*;
import android.widget.TextView;
- fun foo(v: @Composable() ()->Unit) {
+ fun foo(v: @Composable ()->Unit) {
val myVariable: ()->Unit = v
myVariable()
}
@@ -407,7 +407,7 @@
import androidx.compose.*;
import android.widget.TextView;
- fun foo(v: @Composable() ()->Unit) {
+ fun foo(v: @Composable ()->Unit) {
val myVariable: ()->Unit = <!TYPE_MISMATCH!>v<!>
myVariable()
}
@@ -421,7 +421,7 @@
@Composable
fun foo() {
- val myVariable: @Composable() ()->Unit = {};
+ val myVariable: @Composable ()->Unit = {};
myVariable()
}
""")
@@ -445,7 +445,7 @@
import android.widget.TextView;
@Composable
- fun MyComposable(children: @Composable() ()->Unit) { children() }
+ fun MyComposable(children: @Composable ()->Unit) { children() }
@Composable
fun foo() {
@@ -460,7 +460,7 @@
import android.widget.TextView;
@Composable
- fun MyComposable(children: @Composable() ()->Unit) { children() }
+ fun MyComposable(children: @Composable ()->Unit) { children() }
@Composable
fun foo() {
@@ -477,8 +477,8 @@
fun identity(f: ()->Unit): ()->Unit { return f; }
@Composable
- fun test(f: @Composable() ()->Unit) {
- val f2: @Composable() ()->Unit = identity(f);
+ fun test(f: @Composable ()->Unit) {
+ val f2: @Composable ()->Unit = identity(f);
f2()
}
""")
@@ -489,8 +489,8 @@
fun identity(f: ()->Unit): ()->Unit { return f; }
@Composable
- fun test(f: @Composable() ()->Unit) {
- val f2: @Composable() ()->Unit = <!TYPE_MISMATCH!>identity (<!TYPE_MISMATCH!>f<!>)<!>;
+ fun test(f: @Composable ()->Unit) {
+ val f2: @Composable ()->Unit = <!TYPE_MISMATCH!>identity (<!TYPE_MISMATCH!>f<!>)<!>;
f2()
}
""")
@@ -578,7 +578,7 @@
import androidx.compose.*
import android.widget.TextView;
- fun composeInto(l: @Composable() ()->Unit) { System.out.println(l) }
+ fun composeInto(l: @Composable ()->Unit) { System.out.println(l) }
fun Foo() {
composeInto {
@@ -617,7 +617,7 @@
import androidx.compose.*
import android.widget.TextView;
- typealias COMPOSABLE_UNIT_LAMBDA = @Composable() () -> Unit
+ typealias COMPOSABLE_UNIT_LAMBDA = @Composable () -> Unit
@Composable
fun ComposeWrapperComposable(children: COMPOSABLE_UNIT_LAMBDA) {
@@ -700,7 +700,7 @@
checkFail("""
import androidx.compose.*
- val lambda: @Composable() (() -> Unit)? = null
+ val lambda: @Composable (() -> Unit)? = null
@Composable
fun Foo() {
@@ -711,7 +711,7 @@
}
@Composable
- fun Bar(child: @Composable() () -> Unit) {
+ fun Bar(child: @Composable () -> Unit) {
child()
}
""")
@@ -720,7 +720,7 @@
check("""
import androidx.compose.*
- val lambda: @Composable() (() -> Unit)? = null
+ val lambda: @Composable (() -> Unit)? = null
@Composable
fun Foo() {
@@ -730,7 +730,7 @@
}
@Composable
- fun Bar(child: @Composable() (() -> Unit)?) {
+ fun Bar(child: @Composable (() -> Unit)?) {
child?.invoke()
}
""")
@@ -739,7 +739,7 @@
check("""
import androidx.compose.*
- val lambda: @Composable() (() -> Unit)? = null
+ val lambda: @Composable (() -> Unit)? = null
@Composable
fun Foo() {
@@ -750,7 +750,7 @@
}
@Composable
- fun Bar(child: @Composable() (() -> Unit)? = null) {
+ fun Bar(child: @Composable (() -> Unit)? = null) {
child?.invoke()
}
""")
@@ -759,7 +759,7 @@
check("""
import androidx.compose.*
- val lambda: @Composable() (() -> Unit)? = null
+ val lambda: @Composable (() -> Unit)? = null
@Composable
fun Foo() {
@@ -770,7 +770,7 @@
}
@Composable
- fun Bar(child: @Composable() (() -> Unit)? = {}) {
+ fun Bar(child: @Composable (() -> Unit)? = {}) {
child?.invoke()
}
""")
diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/ComposeBenchmarkBase.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/ComposeBenchmarkBase.kt
index f06a79e..6c3caf0 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/ComposeBenchmarkBase.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/ComposeBenchmarkBase.kt
@@ -41,7 +41,7 @@
@get:Rule
val activityRule = ActivityTestRule(ComposeActivity::class.java)
- fun measureCompose(block: @Composable() () -> Unit) {
+ fun measureCompose(block: @Composable () -> Unit) {
val activity = activityRule.activity
var composition: Composition? = null
benchmarkRule.measureRepeated {
@@ -93,10 +93,10 @@
}
class RecomposeReceiver {
- var composeCb: @Composable() () -> Unit = @Composable { }
+ var composeCb: @Composable () -> Unit = @Composable { }
var updateModelCb: () -> Unit = { }
- fun compose(block: @Composable() () -> Unit) {
+ fun compose(block: @Composable () -> Unit) {
composeCb = block
}
diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt
index 80a364f..1b034628 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt
@@ -42,7 +42,7 @@
}
@Composable
-fun Stack(vertical: Boolean, children: @Composable() () -> Unit) {
+fun Stack(vertical: Boolean, children: @Composable () -> Unit) {
if (vertical) {
Column(Modifier.fillMaxHeight()) { children() }
} else {
diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/realworld4/RealWorld4_Widgets.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/realworld4/RealWorld4_Widgets.kt
index 75e33a5..45422b0 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/realworld4/RealWorld4_Widgets.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/realworld4/RealWorld4_Widgets.kt
@@ -98,7 +98,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_01,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 + model.f6 +
@@ -241,7 +241,7 @@
number: Int,
s1: String,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f2 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -347,7 +347,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_04,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f1_modified + model.f3 + model.f4 + model.f5 + model.f6 +
@@ -431,7 +431,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_05,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
model.f7
@@ -551,7 +551,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_06,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
@@ -618,7 +618,7 @@
number: Int,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_07,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -698,7 +698,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -745,7 +745,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -795,7 +795,7 @@
model: RealWorld4_DataModel_10,
s2: String,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -875,7 +875,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -938,7 +938,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -977,7 +977,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -1017,7 +1017,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -1081,7 +1081,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -1267,7 +1267,7 @@
fun RealWorld4_FancyWidget_019(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -1303,7 +1303,7 @@
b: Boolean,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -1351,7 +1351,7 @@
fun RealWorld4_FancyWidget_021(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -1387,7 +1387,7 @@
s1: String,
number: Int,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -1475,7 +1475,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
obj: RealWorld4_UnmemoizablePojo_14,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -1529,7 +1529,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -1581,7 +1581,7 @@
b: Boolean,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -1637,7 +1637,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -1681,7 +1681,7 @@
color: Color,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -1769,7 +1769,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -1821,7 +1821,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -1906,7 +1906,7 @@
obj: RealWorld4_UnmemoizablePojo_5,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "nbeksu48gsl89k" + obj.f1 + obj.f2 + obj.f3 + obj.f4 + obj.f5
val tmp1 = obj::class.memberProperties.map { property ->
@@ -1949,7 +1949,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -1999,7 +1999,7 @@
model: RealWorld4_DataModel_10,
b: Boolean,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2044,7 +2044,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2088,7 +2088,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2225,7 +2225,7 @@
model: RealWorld4_DataModel_07,
obj: RealWorld4_UnmemoizablePojo_8,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -2286,7 +2286,7 @@
model: RealWorld4_DataModel_08,
s1: String,
b: Boolean,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -2350,7 +2350,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -2397,7 +2397,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -2464,7 +2464,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2510,7 +2510,7 @@
model: RealWorld4_DataModel_07,
obj: RealWorld4_UnmemoizablePojo_13,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -2578,7 +2578,7 @@
model: RealWorld4_DataModel_08,
obj: RealWorld4_UnmemoizablePojo_3,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -2664,7 +2664,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "nbeksu48gsl89k" + obj.f1 + obj.f2 + obj.f3 + obj.f4 + obj.f5 + obj.f6 +
obj.f7
@@ -2726,7 +2726,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -2772,7 +2772,7 @@
fun RealWorld4_FancyWidget_047(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2806,7 +2806,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
b: Boolean,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2845,7 +2845,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -2906,7 +2906,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2945,7 +2945,7 @@
number: Int,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -2984,7 +2984,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3127,7 +3127,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -3177,7 +3177,7 @@
number: Int,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -3232,7 +3232,7 @@
model: RealWorld4_DataModel_10,
obj: RealWorld4_UnmemoizablePojo_11,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3281,7 +3281,7 @@
fun RealWorld4_FancyWidget_058(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -3328,7 +3328,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3444,7 +3444,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -3500,7 +3500,7 @@
model: RealWorld4_DataModel_10,
s1: String,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3544,7 +3544,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3626,7 +3626,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3672,7 +3672,7 @@
model: RealWorld4_DataModel_10,
s2: String,
b: Boolean,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -3722,7 +3722,7 @@
model: RealWorld4_DataModel_05,
obj: RealWorld4_UnmemoizablePojo_2,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
model.f7
@@ -3790,7 +3790,7 @@
model: RealWorld4_DataModel_06,
s2: String,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
@@ -3855,7 +3855,7 @@
model: RealWorld4_DataModel_07,
s1: String,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -3923,7 +3923,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
obj: RealWorld4_UnmemoizablePojo_0,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -4001,7 +4001,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -4048,7 +4048,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -4131,7 +4131,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_06,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
@@ -4286,7 +4286,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -4400,7 +4400,7 @@
number: Int,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -4439,7 +4439,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_07,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -4500,7 +4500,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"nbeksu48gsl89k" + obj.f1 + obj.f2 + obj.f3 + obj.f4 + obj.f5 + obj.f6 + obj.f7 + obj.f8
@@ -4591,7 +4591,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -4641,7 +4641,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -4694,7 +4694,7 @@
fun RealWorld4_FancyWidget_084(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -4727,7 +4727,7 @@
fun RealWorld4_FancyWidget_085(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -4873,7 +4873,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -4920,7 +4920,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5001,7 +5001,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5040,7 +5040,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_07,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -5168,7 +5168,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
obj: RealWorld4_UnmemoizablePojo_9,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -5230,7 +5230,7 @@
fun RealWorld4_FancyWidget_095(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5265,7 +5265,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -5326,7 +5326,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -5455,7 +5455,7 @@
fun RealWorld4_FancyWidget_099(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5490,7 +5490,7 @@
model: RealWorld4_DataModel_08,
s2: String,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -5555,7 +5555,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -5618,7 +5618,7 @@
model: RealWorld4_DataModel_10,
s1: String,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5699,7 +5699,7 @@
model: RealWorld4_DataModel_10,
s1: String,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5743,7 +5743,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -5804,7 +5804,7 @@
fun RealWorld4_FancyWidget_106(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5839,7 +5839,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5883,7 +5883,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5921,7 +5921,7 @@
fun RealWorld4_FancyWidget_109(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -5957,7 +5957,7 @@
color: Color,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6006,7 +6006,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
obj: RealWorld4_UnmemoizablePojo_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6048,7 +6048,7 @@
fun RealWorld4_FancyWidget_112(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -6102,7 +6102,7 @@
number: Int,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -6168,7 +6168,7 @@
model: RealWorld4_DataModel_10,
s1: String,
color: Color,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6214,7 +6214,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6263,7 +6263,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -6310,7 +6310,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6349,7 +6349,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
color: Color,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6388,7 +6388,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -6436,7 +6436,7 @@
fun RealWorld4_FancyWidget_120(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6471,7 +6471,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6517,7 +6517,7 @@
b: Boolean,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "nbeksu48gsl89k" + obj.f1 + obj.f2 + obj.f3 + obj.f4 + obj.f5 + obj.f6
val tmp1 = obj::class.memberProperties.map { property ->
@@ -6571,7 +6571,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6616,7 +6616,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
b: Boolean,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -6668,7 +6668,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6707,7 +6707,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6745,7 +6745,7 @@
fun RealWorld4_FancyWidget_127(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6780,7 +6780,7 @@
model: RealWorld4_DataModel_10,
s2: String,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6824,7 +6824,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6862,7 +6862,7 @@
fun RealWorld4_FancyWidget_130(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -6897,7 +6897,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_04,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f1_modified + model.f3 + model.f4 + model.f5 + model.f6 +
@@ -6979,7 +6979,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_05,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
model.f7
@@ -7108,7 +7108,7 @@
model: RealWorld4_DataModel_06,
s1: String,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
@@ -7177,7 +7177,7 @@
fun RealWorld4_FancyWidget_134(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_07,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -7241,7 +7241,7 @@
fun RealWorld4_FancyWidget_135(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f5
val tmp1 = model::class.memberProperties.map { property ->
@@ -7283,7 +7283,7 @@
s2: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -7345,7 +7345,7 @@
s1: String,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -7388,7 +7388,7 @@
fun RealWorld4_FancyWidget_138(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_10,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -7421,7 +7421,7 @@
fun RealWorld4_FancyWidget_139(
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_05,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
model.f7
@@ -7476,7 +7476,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_06,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
@@ -7553,7 +7553,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_06,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 + model.f5 +
@@ -7704,7 +7704,7 @@
number: Int,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_07,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3 + model.f4 +
model.f6
@@ -7791,7 +7791,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_08,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 =
"nbeksu48gsl89k" + obj.f1 + obj.f2 + obj.f3 + obj.f4 + obj.f5 + obj.f6 + obj.f7 + obj.f8 +
@@ -7862,7 +7862,7 @@
model: RealWorld4_DataModel_09,
s2: String,
number: Int,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -7940,7 +7940,7 @@
b: Boolean,
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
@@ -8019,7 +8019,7 @@
obj: RealWorld4_UnmemoizablePojo_1,
b: Boolean,
s2: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f2 + model.f3
val tmp1 = model::class.memberProperties.map { property ->
@@ -8143,7 +8143,7 @@
modifier: Modifier = Modifier,
model: RealWorld4_DataModel_09,
s1: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val tmp0 = "jaleiurhgsei48" + model.f0 + model.f1 + model.f3 + model.f4
val tmp1 = model::class.memberProperties.map { property ->
diff --git a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt
index 2144694..0a90538 100644
--- a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt
+++ b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/SlotTableSamples.kt
@@ -55,7 +55,7 @@
@Suppress("UNUSED_PARAMETER")
@Composable
-private fun Column(children: @Composable() () -> Unit) {}
+private fun Column(children: @Composable () -> Unit) {}
@Suppress("UNUSED_PARAMETER")
@Composable
diff --git a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/AmbientTests.kt b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/AmbientTests.kt
index 11a57c5..05a99b7 100644
--- a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/AmbientTests.kt
+++ b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/AmbientTests.kt
@@ -506,7 +506,7 @@
}
@Composable
- fun subCompose(block: @Composable() () -> Unit) {
+ fun subCompose(block: @Composable () -> Unit) {
val container =
remember { escapeCompose { LayoutNode() } }
val reference = compositionReference()
@@ -529,7 +529,7 @@
ref.value = compositionReference()
}
- @Composable fun deferredSubCompose(block: @Composable() () -> Unit): () -> Unit {
+ @Composable fun deferredSubCompose(block: @Composable () -> Unit): () -> Unit {
val container = remember { escapeCompose { LayoutNode() } }
val ref = Ref<CompositionReference>()
narrowInvalidateForReference(ref = ref)
diff --git a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/BaseComposeTest.kt b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/BaseComposeTest.kt
index 694460a..75da95e 100644
--- a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/BaseComposeTest.kt
+++ b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/BaseComposeTest.kt
@@ -76,7 +76,7 @@
}
}
-internal fun Activity.show(block: @Composable() () -> Unit): Composition {
+internal fun Activity.show(block: @Composable () -> Unit): Composition {
var composition: Composition? = null
uiThread {
FrameManager.nextFrame()
@@ -106,21 +106,21 @@
val activity get() = activityRule.activity
fun compose(
- composable: @Composable() () -> Unit
+ composable: @Composable () -> Unit
) = UiTester(
activity,
composable
)
fun composeEmittables(
- composable: @Composable() () -> Unit
+ composable: @Composable () -> Unit
) = EmittableTester(
activity,
composable
)
}
-sealed class ComposeTester(val activity: Activity, val composable: @Composable() () -> Unit) {
+sealed class ComposeTester(val activity: Activity, val composable: @Composable () -> Unit) {
inner class ActiveTest(val activity: Activity, val composition: Composition) {
fun then(block: ActiveTest.(activity: Activity) -> Unit): ActiveTest {
activity.waitForAFrame()
@@ -135,7 +135,7 @@
}
}
- abstract fun initialComposition(composable: @Composable() () -> Unit): Composition
+ abstract fun initialComposition(composable: @Composable () -> Unit): Composition
fun then(block: ComposeTester.(activity: Activity) -> Unit): ActiveTest {
val composition = initialComposition(composable)
@@ -147,9 +147,9 @@
}
}
-class EmittableTester(activity: Activity, composable: @Composable() () -> Unit) :
+class EmittableTester(activity: Activity, composable: @Composable () -> Unit) :
ComposeTester(activity, composable) {
- override fun initialComposition(composable: @Composable() () -> Unit): Composition {
+ override fun initialComposition(composable: @Composable () -> Unit): Composition {
var composition: Composition? = null
activity.uiThread {
FrameManager.nextFrame()
@@ -159,9 +159,9 @@
}
}
-class UiTester(activity: Activity, composable: @Composable() () -> Unit) :
+class UiTester(activity: Activity, composable: @Composable () -> Unit) :
ComposeTester(activity, composable) {
- override fun initialComposition(composable: @Composable() () -> Unit): Composition {
+ override fun initialComposition(composable: @Composable () -> Unit): Composition {
return activity.show {
composable()
}
diff --git a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/EmittableComposer.kt b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/EmittableComposer.kt
index fdf48e9..3aeab66 100644
--- a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/EmittableComposer.kt
+++ b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/EmittableComposer.kt
@@ -194,7 +194,7 @@
}
}
-fun Activity.setEmittableContent(content: @Composable() () -> Unit): Composition {
+fun Activity.setEmittableContent(content: @Composable () -> Unit): Composition {
val root = Node("Root")
val composition = compositionFor(root, Recomposer.current()) { slotTable, recomposer ->
EmittableComposer(
diff --git a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/RestartTests.kt b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/RestartTests.kt
index 165a2e1..04428c6 100644
--- a/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/RestartTests.kt
+++ b/compose/compose-runtime/src/androidAndroidTest/kotlin/androidx/compose/test/RestartTests.kt
@@ -227,12 +227,12 @@
}
@Composable
-fun RestartGroup(block: @Composable() () -> Unit) {
+fun RestartGroup(block: @Composable () -> Unit) {
block()
}
@Composable
-fun Repeat(count: Int, block: @Composable() (index: Int) -> Unit) {
+fun Repeat(count: Int, block: @Composable (index: Int) -> Unit) {
for (i in 0 until count) {
block(i)
}
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Ambient.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Ambient.kt
index 93cc227..f2f087f 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Ambient.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Ambient.kt
@@ -164,7 +164,7 @@
* @see staticAmbientOf
*/
@Composable
-fun Providers(vararg values: ProvidedValue<*>, children: @Composable() () -> Unit) {
+fun Providers(vararg values: ProvidedValue<*>, children: @Composable () -> Unit) {
currentComposer.startProviders(values)
children()
currentComposer.endProviders()
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composable.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composable.kt
index cf2f2f1..34e3f4e 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composable.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composable.kt
@@ -44,13 +44,13 @@
AnnotationTarget.FUNCTION,
// type declarations
- // var foo: @Composable() () -> Unit = { ... }
+ // var foo: @Composable () -> Unit = { ... }
// parameter types
- // foo: @Composable() () -> Unit
+ // foo: @Composable () -> Unit
AnnotationTarget.TYPE,
// composable types inside of type signatures
- // foo: (@Composable() () -> Unit) -> Unit
+ // foo: (@Composable () -> Unit) -> Unit
AnnotationTarget.TYPE_PARAMETER,
// composable property declarations
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Compose.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Compose.kt
index 0cab57a..a1a6942 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Compose.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Compose.kt
@@ -16,7 +16,7 @@
package androidx.compose
-private val EmptyComposable: @Composable() () -> Unit = {}
+private val EmptyComposable: @Composable () -> Unit = {}
/**
* Represents empty content for a Composable function.
@@ -29,4 +29,4 @@
* @return this Composable if not null, else [emptyContent].
*/
@Suppress("NOTHING_TO_INLINE")
-inline fun @Composable() (() -> Unit)?.orEmpty() = this ?: emptyContent()
+inline fun (@Composable (() -> Unit))?.orEmpty() = this ?: emptyContent()
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt
index 50d9c20..d2ab1a6 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt
@@ -2241,7 +2241,7 @@
// TODO: get rid of the need for this when we merge FrameManager and Recomposer together!
internal var currentComposerInternal: Composer<*>? = null
-internal fun invokeComposable(composer: Composer<*>, composable: @Composable() () -> Unit) {
+internal fun invokeComposable(composer: Composer<*>, composable: @Composable () -> Unit) {
@Suppress("UNCHECKED_CAST")
val realFn = composable as Function1<Composer<*>, Unit>
realFn(composer)
@@ -2249,7 +2249,7 @@
internal fun <T> invokeComposableForResult(
composer: Composer<*>,
- composable: @Composable() () -> T
+ composable: @Composable () -> T
): T {
@Suppress("UNCHECKED_CAST")
val realFn = composable as Function1<Composer<*>, T>
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composition.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composition.kt
index 40ed296..c752d6d 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composition.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composition.kt
@@ -29,7 +29,7 @@
*
* @param content A composable function that describes the UI
*/
- fun setContent(content: @Composable() () -> Unit)
+ fun setContent(content: @Composable () -> Unit)
/**
* Clear the hierarchy that was created from the composition.
@@ -112,9 +112,9 @@
private var disposed = false
- var composable: @Composable() () -> Unit = emptyContent()
+ var composable: @Composable () -> Unit = emptyContent()
- override fun setContent(content: @Composable() () -> Unit) {
+ override fun setContent(content: @Composable () -> Unit) {
check(!disposed) { "The composition is disposed" }
this.composable = content
recomposer.recompose(composable, composer)
@@ -176,7 +176,7 @@
*/
private class HotReloader {
companion object {
- private var state = mutableListOf<Pair<CompositionImpl, @Composable() () -> Unit>>()
+ private var state = mutableListOf<Pair<CompositionImpl, @Composable () -> Unit>>()
@TestOnly
fun clearRoots() {
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Key.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Key.kt
index e5258e2..b9bc3e6 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Key.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Key.kt
@@ -55,7 +55,7 @@
@Suppress("UNUSED_PARAMETER")
@Pivotal
v1: V1,
- block: @Composable() () -> T
+ block: @Composable () -> T
): T = block()
/**
@@ -104,7 +104,7 @@
@Suppress("UNUSED_PARAMETER")
@Pivotal
v2: V2,
- block: @Composable() () -> T
+ block: @Composable () -> T
) = block()
/**
@@ -144,5 +144,5 @@
@Suppress("UNUSED_PARAMETER")
@Pivotal
vararg inputs: Any?,
- block: @Composable() () -> T
+ block: @Composable () -> T
) = block()
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Observe.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Observe.kt
index a03ae9d..7f90b5d 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Observe.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Observe.kt
@@ -30,4 +30,4 @@
* @see Recompose
*/
@Composable
-fun Observe(body: @Composable() () -> Unit) = body()
\ No newline at end of file
+fun Observe(body: @Composable () -> Unit) = body()
\ No newline at end of file
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recompose.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recompose.kt
index 3d01ced..3842c9e 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recompose.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recompose.kt
@@ -36,4 +36,4 @@
* @see invalidate
*/
@Composable
-fun Recompose(body: @Composable() (recompose: () -> Unit) -> Unit) = body(invalidate)
+fun Recompose(body: @Composable (recompose: () -> Unit) -> Unit) = body(invalidate)
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt
index 4a3e288..3a20b62 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt
@@ -51,7 +51,7 @@
private val composers = mutableSetOf<Composer<*>>()
@Suppress("PLUGIN_WARNING", "PLUGIN_ERROR")
- internal fun recompose(composable: @Composable() () -> Unit, composer: Composer<*>) {
+ internal fun recompose(composable: @Composable () -> Unit, composer: Composer<*>) {
val composerWasComposing = composer.isComposing
val prevComposer = currentComposerInternal
try {
diff --git a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt
index 2ce4b94..4e9c083 100644
--- a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt
+++ b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt
@@ -2075,7 +2075,7 @@
}
@Composable
- fun MockComposeScope.wrapper(children: @Composable() () -> Unit) {
+ fun MockComposeScope.wrapper(children: @Composable () -> Unit) {
children()
}
@@ -2204,7 +2204,7 @@
}
@Composable
- fun MockComposeScope.wrapper(children: @Composable() () -> Unit) {
+ fun MockComposeScope.wrapper(children: @Composable () -> Unit) {
children()
}
diff --git a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt
index 190eb07..c70aeed 100644
--- a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt
+++ b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt
@@ -99,7 +99,7 @@
fun <P1> MockComposeScope.memoize(
key: Any,
p1: P1,
- block: @Composable() (p1: P1) -> Unit
+ block: @Composable (p1: P1) -> Unit
) {
with(currentComposer as MockViewComposer) {
startGroup(key)
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
index 5ec22f7..13ed4b7 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
@@ -189,11 +189,11 @@
}
@Composable
- abstract fun emitPaddedContainer(padding: Dp, child: @Composable() () -> Unit)
+ abstract fun emitPaddedContainer(padding: Dp, child: @Composable () -> Unit)
}
@Composable
-fun FillerContainer(modifier: Modifier = Modifier, children: @Composable() () -> Unit) {
+fun FillerContainer(modifier: Modifier = Modifier, children: @Composable () -> Unit) {
Layout(children, modifier) { measurable, constraints, _ ->
val childConstraints = constraints.copy(minWidth = 0.ipx, minHeight = 0.ipx)
val placeable = measurable.firstOrNull()?.measure(childConstraints)
@@ -214,7 +214,7 @@
private class ModifierTestCase : PaddingTestCase() {
@Composable
- override fun emitPaddedContainer(padding: Dp, child: @Composable() () -> Unit) {
+ override fun emitPaddedContainer(padding: Dp, child: @Composable () -> Unit) {
FillerContainer(Modifier.padding(padding), child)
}
}
@@ -222,7 +222,7 @@
private class NoModifierTestCase : PaddingTestCase() {
@Composable
- override fun emitPaddedContainer(padding: Dp, child: @Composable() () -> Unit) {
+ override fun emitPaddedContainer(padding: Dp, child: @Composable () -> Unit) {
FillerContainer {
Padding(all = padding, children = child)
}
@@ -234,7 +234,7 @@
@Composable
private fun Padding(
all: Dp,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val padding = InnerPadding(all)
Layout(children) { measurables, constraints, _ ->
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt
index ecfec28..074f71c 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt
@@ -90,12 +90,12 @@
}
@Composable
- abstract fun emitContent(number: Int, content: @Composable() () -> Unit)
+ abstract fun emitContent(number: Int, content: @Composable () -> Unit)
}
private class WithTrailingLambdas : TrailingLambdaTestCase() {
@Composable
- override fun emitContent(number: Int, content: @Composable() () -> Unit) {
+ override fun emitContent(number: Int, content: @Composable () -> Unit) {
EmptyComposable(number = number) {
content()
}
@@ -104,12 +104,12 @@
private class WithoutTrailingLambdas : TrailingLambdaTestCase() {
@Composable
- override fun emitContent(number: Int, content: @Composable() () -> Unit) {
+ override fun emitContent(number: Int, content: @Composable () -> Unit) {
EmptyComposable(number = number, children = content)
}
}
@Suppress("UNUSED_PARAMETER")
@Composable
-private fun EmptyComposable(number: Int, children: @Composable() () -> Unit) {
+private fun EmptyComposable(number: Int, children: @Composable () -> Unit) {
}
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
index 011792c..e03114d 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
@@ -122,7 +122,7 @@
}
@Composable
-private fun ChangingConstraintsLayout(size: State<IntPx>, children: @Composable() () -> Unit) {
+private fun ChangingConstraintsLayout(size: State<IntPx>, children: @Composable () -> Unit) {
Layout(children) { measurables, _, _ ->
val constraints = Constraints.fixed(size.value, size.value)
with(PlacementScope) { measurables.first().measure(constraints).place(0.ipx, 0.ipx) }
diff --git a/ui/integration-tests/demos/common/src/main/java/androidx/ui/demos/common/Demo.kt b/ui/integration-tests/demos/common/src/main/java/androidx/ui/demos/common/Demo.kt
index 9a68825..19c03e5 100644
--- a/ui/integration-tests/demos/common/src/main/java/androidx/ui/demos/common/Demo.kt
+++ b/ui/integration-tests/demos/common/src/main/java/androidx/ui/demos/common/Demo.kt
@@ -42,7 +42,7 @@
/**
* Demo that displays [Composable] [content] when selected.
*/
-class ComposableDemo(title: String, val content: @Composable() () -> Unit) : Demo(title)
+class ComposableDemo(title: String, val content: @Composable () -> Unit) : Demo(title)
/**
* A category of [Demo]s, that will display a list of [demos] when selected.
diff --git a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt
index c3fc716..48fe2b7 100644
--- a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt
+++ b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt
@@ -111,7 +111,7 @@
private fun DemoTheme(
demoColors: DemoColorPalette,
window: Window,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
MaterialTheme(demoColors.colors) {
val statusBarColor = with(MaterialTheme.colors) {
diff --git a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
index 643a6c0..ff06807 100644
--- a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
+++ b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
@@ -138,7 +138,7 @@
@Composable
private fun DemoAppBar(
title: String,
- navigationIcon: @Composable() (() -> Unit)?,
+ navigationIcon: @Composable (() -> Unit)?,
isFiltering: Boolean,
filterText: TextFieldValue,
onFilter: (TextFieldValue) -> Unit,
diff --git a/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/ArrayAdapter.kt b/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/ArrayAdapter.kt
index 018d9f8..8e489927 100644
--- a/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/ArrayAdapter.kt
+++ b/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/ArrayAdapter.kt
@@ -30,7 +30,7 @@
// TODO(lmr): This should be moved to a separate module, but needs to be one that is not IR-compiled
class ArrayAdapter<T> : BaseAdapter(), Filterable {
- var composable: (@Composable() (T) -> Unit)? = null
+ var composable: (@Composable (T) -> Unit)? = null
var items: MutableList<T>? = null
var itemLayoutResourceId: Int = android.R.layout.simple_list_item_1
var itemFieldId: Int = 0
diff --git a/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/AutocompleteTextViewAttributeAdapter.kt b/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/AutocompleteTextViewAttributeAdapter.kt
index b054b4f..4e5b1da 100644
--- a/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/AutocompleteTextViewAttributeAdapter.kt
+++ b/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/AutocompleteTextViewAttributeAdapter.kt
@@ -38,6 +38,6 @@
composeAdapter.items = data.toMutableList()
}
-fun AutoCompleteTextView.setComposeItem(composeItem: @Composable() (Any) -> Unit) {
+fun AutoCompleteTextView.setComposeItem(composeItem: @Composable (Any) -> Unit) {
composeAdapter.composable = composeItem
}
\ No newline at end of file
diff --git a/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/SpinnerAttributeAdapter.kt b/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/SpinnerAttributeAdapter.kt
index af4f4a5..2df7149 100644
--- a/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/SpinnerAttributeAdapter.kt
+++ b/ui/ui-android-view/src/main/java/androidx/ui/androidview/adapters/SpinnerAttributeAdapter.kt
@@ -40,7 +40,7 @@
}
}
-fun AbsSpinner.setComposeItem(composeItem: @Composable() (Any) -> Unit) {
+fun AbsSpinner.setComposeItem(composeItem: @Composable (Any) -> Unit) {
composeAdapter.composable = composeItem
}
diff --git a/ui/ui-animation/src/main/java/androidx/ui/animation/Crossfade.kt b/ui/ui-animation/src/main/java/androidx/ui/animation/Crossfade.kt
index 91ab535..07b576e 100644
--- a/ui/ui-animation/src/main/java/androidx/ui/animation/Crossfade.kt
+++ b/ui/ui-animation/src/main/java/androidx/ui/animation/Crossfade.kt
@@ -43,7 +43,7 @@
fun <T> Crossfade(
current: T,
animation: AnimationBuilder<Float> = TweenBuilder(),
- children: @Composable() (T) -> Unit
+ children: @Composable (T) -> Unit
) {
val state = remember { CrossfadeState<T>() }
if (current != state.current) {
@@ -95,7 +95,7 @@
val transition: CrossfadeTransition
)
-private typealias CrossfadeTransition = @Composable() (children: @Composable() () -> Unit) -> Unit
+private typealias CrossfadeTransition = @Composable (children: @Composable () -> Unit) -> Unit
@Composable
private fun animatedOpacity(
diff --git a/ui/ui-animation/src/main/java/androidx/ui/animation/Transition.kt b/ui/ui-animation/src/main/java/androidx/ui/animation/Transition.kt
index 2bdce17..7645fde 100644
--- a/ui/ui-animation/src/main/java/androidx/ui/animation/Transition.kt
+++ b/ui/ui-animation/src/main/java/androidx/ui/animation/Transition.kt
@@ -72,7 +72,7 @@
clock: AnimationClockObservable = AnimationClockAmbient.current,
initState: T = toState,
onStateChangeFinished: ((T) -> Unit)? = null,
- children: @Composable() (state: TransitionState) -> Unit
+ children: @Composable (state: TransitionState) -> Unit
) {
if (transitionsEnabled) {
val disposableClock = clock.asDisposableClock()
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/MultipleCollect.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/MultipleCollect.kt
index 9bc712b..294a445 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/MultipleCollect.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/MultipleCollect.kt
@@ -30,9 +30,9 @@
@Composable
fun HeaderFooterLayout(
- header: @Composable() () -> Unit,
- footer: @Composable() () -> Unit,
- content: @Composable() () -> Unit
+ header: @Composable () -> Unit,
+ footer: @Composable () -> Unit,
+ content: @Composable () -> Unit
) {
Layout({
Box(Modifier.tag("header"), children = header)
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
index 574cffee..3c1a799 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
@@ -98,7 +98,7 @@
private fun Autofill(
autofillTypes: List<AutofillType>,
onFill: ((String) -> Unit),
- children: @Composable() (AutofillNode) -> Unit
+ children: @Composable (AutofillNode) -> Unit
) {
val autofillNode = AutofillNode( autofillTypes = autofillTypes)
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/focus/FocusableDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/focus/FocusableDemo.kt
index 3286df9..d7b5433 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/focus/FocusableDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/focus/FocusableDemo.kt
@@ -67,7 +67,7 @@
}
@Composable
-private fun CenteredRow(children: @Composable() RowScope.() -> Unit) {
+private fun CenteredRow(children: @Composable RowScope.() -> Unit) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Center,
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedLongPressDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedLongPressDemo.kt
index d331403..a341f105 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedLongPressDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedLongPressDemo.kt
@@ -44,7 +44,7 @@
@Composable
private fun LongPressableContainer(
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val defaultColor = DefaultBackgroundColor
val pressedColor = PressedColor
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedPressDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedPressDemo.kt
index 6d5f316..cde6b67 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedPressDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedPressDemo.kt
@@ -47,7 +47,7 @@
@Composable
private fun PressableContainer(
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit = {}
+ children: @Composable () -> Unit = {}
) {
val defaultColor = DefaultBackgroundColor
val pressedColor = PressedColor
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScalingDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScalingDemo.kt
index b158b53..a342541 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScalingDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScalingDemo.kt
@@ -54,7 +54,7 @@
private fun Scalable(
minPercent: Float,
color: Color,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val currentPercent = state { 1f }
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScrollingDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScrollingDemo.kt
index e22fb19..77f7fd7 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScrollingDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/NestedScrollingDemo.kt
@@ -73,7 +73,7 @@
* A very simple ScrollView like implementation that allows for vertical scrolling.
*/
@Composable
-private fun Draggable(children: @Composable() () -> Unit) {
+private fun Draggable(children: @Composable () -> Unit) {
val offset = state { 0.px }
val maxOffset = state { 0.px }
@@ -179,7 +179,7 @@
* times.
*/
@Composable
-private fun RepeatingList(repetitions: Int, row: @Composable() () -> Unit) {
+private fun RepeatingList(repetitions: Int, row: @Composable () -> Unit) {
Column(Modifier.drawBorder(border = Border(2.dp, BorderColor))) {
for (i in 1..repetitions) {
row()
diff --git a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/LayoutSample.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/LayoutSample.kt
index dbd99835..44b0a30 100644
--- a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/LayoutSample.kt
+++ b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/LayoutSample.kt
@@ -27,7 +27,7 @@
@Sampled
@Composable
-fun LayoutWithProvidedIntrinsicsUsage(children: @Composable() () -> Unit) {
+fun LayoutWithProvidedIntrinsicsUsage(children: @Composable () -> Unit) {
// We build a layout that will occupy twice as much space as its children,
// and will position them to be bottom right aligned.
Layout(
@@ -71,7 +71,7 @@
@Sampled
@Composable
-fun LayoutUsage(children: @Composable() () -> Unit) {
+fun LayoutUsage(children: @Composable () -> Unit) {
// We build a layout that will occupy twice as much space as its children,
// and will position them to be bottom right aligned.
Layout(children) { measurables, constraints, _ ->
@@ -98,7 +98,7 @@
@Sampled
@Composable
-fun LayoutTagChildrenUsage(header: @Composable() () -> Unit, footer: @Composable() () -> Unit) {
+fun LayoutTagChildrenUsage(header: @Composable () -> Unit, footer: @Composable () -> Unit) {
Layout({
// Here the Containers are only needed to apply the modifiers. You could use the
// modifier on header and footer directly if they are composables accepting modifiers.
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/HotReloadTests.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/HotReloadTests.kt
index 12f6e21..c9de2aa 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/HotReloadTests.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/HotReloadTests.kt
@@ -64,7 +64,7 @@
TextView(id = id, text = text)
}
- @Composable fun column(children: @Composable() () -> Unit) {
+ @Composable fun column(children: @Composable () -> Unit) {
LinearLayout { children() }
}
@@ -112,7 +112,7 @@
}
}
- @Composable fun columnNode(children: @Composable() () -> Unit) {
+ @Composable fun columnNode(children: @Composable () -> Unit) {
children()
}
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
index 45fe708..40c49c8 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
@@ -422,7 +422,7 @@
* before giving them to their child
*/
@Composable
- fun NoMinSizeContainer(children: @Composable() () -> Unit) {
+ fun NoMinSizeContainer(children: @Composable () -> Unit) {
Layout(children) { measurables, constraints, _ ->
val loosenedConstraints = constraints.copy(minWidth = 0.ipx, minHeight = 0.ipx)
val placeables = measurables.map { it.measure(loosenedConstraints) }
@@ -442,7 +442,7 @@
@Composable
fun NoIntrinsicSizeContainer(
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children, modifier) { measurables, constraints, _ ->
val placeables = measurables.map { it.measure(constraints) }
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/PopupTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/PopupTest.kt
index 31a2c06..b0114c9 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/PopupTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/PopupTest.kt
@@ -1040,7 +1040,7 @@
}
@Composable
-private fun TestAlign(children: @Composable() () -> Unit) {
+private fun TestAlign(children: @Composable () -> Unit) {
Layout(children) { measurables, constraints, _ ->
val measurable = measurables.firstOrNull()
// The child cannot be larger than our max constraints, but we ignore min constraints.
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
index 8874017..7b1e8ab 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
@@ -502,7 +502,7 @@
fun FixedSizeRow(
width: IntPx,
height: IntPx,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children = children, measureBlock = { measurables, constraints, _ ->
val resolvedWidth = width.coerceIn(constraints.minWidth, constraints.maxWidth)
@@ -1565,7 +1565,7 @@
var laidOut = false
activityTestRule.runOnUiThreadIR {
activity.setContent {
- val container = @Composable { children: @Composable() () -> Unit ->
+ val container = @Composable { children: @Composable () -> Unit ->
// This simulates a Container optimisation, when the child does not
// affect parent size.
Layout(children) { measurables, constraints, _ ->
@@ -1574,7 +1574,7 @@
}
}
}
- val recomposingChild = @Composable { children: @Composable() (IntPx) -> Unit ->
+ val recomposingChild = @Composable { children: @Composable (IntPx) -> Unit ->
// This simulates a child that recomposes, for example due to a transition.
children(model.offset)
}
@@ -2260,8 +2260,8 @@
val innerColor = mutableStateOf(Color.Red)
activityTestRule.runOnUiThread {
activity.setContent {
- val children: @Composable() () -> Unit = remember {
- @Composable() {
+ val children: @Composable () -> Unit = remember {
+ @Composable {
FixedSize(
size = 10.ipx,
modifier = Modifier.drawLayer()
@@ -2584,7 +2584,7 @@
fun AtLeastSize(
size: IntPx,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit = emptyContent()
+ children: @Composable () -> Unit = emptyContent()
) {
Layout(
measureBlock = { measurables, constraints, _ ->
@@ -2618,7 +2618,7 @@
fun FixedSize(
size: IntPx,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit = emptyContent()
+ children: @Composable () -> Unit = emptyContent()
) {
Layout(children = children, modifier = modifier) { measurables, _, _ ->
val newConstraints = Constraints.fixed(size, size)
@@ -2634,7 +2634,7 @@
}
@Composable
-fun Align(modifier: Modifier = Modifier.None, children: @Composable() () -> Unit) {
+fun Align(modifier: Modifier = Modifier.None, children: @Composable () -> Unit) {
Layout(
modifier = modifier,
measureBlock = { measurables, constraints, _ ->
@@ -2666,7 +2666,7 @@
internal fun Padding(
size: IntPx,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(
modifier = modifier,
@@ -2701,7 +2701,7 @@
size: IntPx,
latch: CountDownLatch,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(modifier = modifier, children = children) { measurables, _, _ ->
val testConstraints = Constraints()
@@ -2728,7 +2728,7 @@
size: IntPx,
offset: OffsetModel,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(modifier = modifier, children = children) { measurables, constraints, _ ->
val placeables = measurables.map { m ->
@@ -2747,7 +2747,7 @@
modifier: Modifier = Modifier,
minWidth: IntPx = 0.ipx,
minHeight: IntPx = 0.ipx,
- children: @Composable() () -> Unit = {}
+ children: @Composable () -> Unit = {}
) {
Layout(modifier = modifier, children = children) { measurables, constraints, _ ->
val placeables = measurables.map { it.measure(constraints) }
@@ -2764,7 +2764,7 @@
modifier: Modifier = Modifier,
onScrollPositionChanged: (position: IntPx, maxPosition: IntPx) -> Unit,
offset: OffsetModel,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
val maxPosition = state { IntPx.Infinity }
ScrollerLayout(
@@ -2783,7 +2783,7 @@
modifier: Modifier = Modifier,
@Suppress("UNUSED_PARAMETER") maxPosition: IntPx,
onMaxPositionChanged: () -> Unit,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
Layout(modifier = modifier, children = child) { measurables, constraints, _ ->
val childConstraints = constraints.copy(
@@ -2804,7 +2804,7 @@
fun WrapForceRelayout(
model: OffsetModel,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(modifier = modifier, children = children) { measurables, constraints, _ ->
val placeables = measurables.map { it.measure(constraints) }
@@ -2818,7 +2818,7 @@
}
@Composable
-fun SimpleRow(modifier: Modifier = Modifier, children: @Composable() () -> Unit) {
+fun SimpleRow(modifier: Modifier = Modifier, children: @Composable () -> Unit) {
Layout(modifier = modifier, children = children) { measurables, constraints, _ ->
var width = 0.ipx
var height = 0.ipx
@@ -2839,7 +2839,7 @@
}
@Composable
-fun JustConstraints(modifier: Modifier, children: @Composable() () -> Unit) {
+fun JustConstraints(modifier: Modifier, children: @Composable () -> Unit) {
Layout(children, modifier) { _, constraints, _ ->
layout(constraints.minWidth, constraints.minHeight) {}
}
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt
index ff888b0..ca59d04 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt
@@ -445,7 +445,7 @@
@Composable
fun Container(
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children, modifier) { measurables, constraints, _ ->
val placeable = measurables[0].measure(constraints)
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
index 5ca90fc..ffa9f55 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
@@ -654,7 +654,7 @@
fun FixedSize(
size: State<IntPx>,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit = emptyContent()
+ children: @Composable () -> Unit = emptyContent()
) {
Layout(children = children, modifier = modifier) { measurables, _, _ ->
val newConstraints = Constraints.fixed(size.value, size.value)
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayerTouchTransformTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayerTouchTransformTest.kt
index f06dad5..b5be2dd 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayerTouchTransformTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayerTouchTransformTest.kt
@@ -142,7 +142,7 @@
}
@Composable
-fun SimpleLayout(modifier: Modifier, children: @Composable() () -> Unit = emptyContent()) {
+fun SimpleLayout(modifier: Modifier, children: @Composable () -> Unit = emptyContent()) {
Layout(
children,
modifier
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt
index ac4bec3..5a14bf0 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt
@@ -232,7 +232,7 @@
}
@Composable
-fun Row(modifier: Modifier = Modifier, children: @Composable() () -> Unit) {
+fun Row(modifier: Modifier = Modifier, children: @Composable () -> Unit) {
Layout(modifier = modifier, children = children) { measurables, constraints, _ ->
val placeables = measurables.map { it.measure(constraints) }
var width = 0.ipx
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
index 219a643f..4acf3dd 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
@@ -348,7 +348,7 @@
}
@Composable
- private fun UpdateLayoutDirection(ld: LayoutDirection, children: @Composable() () -> Unit) {
+ private fun UpdateLayoutDirection(ld: LayoutDirection, children: @Composable () -> Unit) {
Layout(children) { measurables, constraints, _ ->
val placeable = measurables[0].measure(constraints, ld)
layout(placeable.width, placeable.height) {
@@ -363,7 +363,7 @@
top: Dp,
end: Dp,
bottom: Dp,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children) { measurables, constraints, _ ->
val childConstraints = constraints.offset(
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
index 0791514..f7d19a8 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
@@ -841,7 +841,7 @@
width: IntPx,
height: IntPx,
modifier: Modifier = Modifier,
- children: @Composable() () ->
+ children: @Composable () ->
Unit
) {
Layout(
@@ -868,7 +868,7 @@
fun ContainerChildrenAffectsParentSize(
width: IntPx,
height: IntPx,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children = children, measureBlock = remember<MeasureBlock>(width, height) {
{ measurables, _, _ ->
@@ -884,7 +884,7 @@
}
@Composable
-private fun ChangingConstraintsLayout(size: ValueModel<IntPx>, children: @Composable() () -> Unit) {
+private fun ChangingConstraintsLayout(size: ValueModel<IntPx>, children: @Composable () -> Unit) {
Layout(children) { measurables, _, _ ->
layout(100.ipx, 100.ipx) {
val constraints = Constraints.fixed(size.value, size.value)
@@ -896,7 +896,7 @@
@Composable
private fun ChangingLayoutDirectionLayout(
direction: State<LayoutDirection>,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children) { measurables, _, _ ->
layout(100.ipx, 100.ipx) {
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/semantics/SemanticsTests.kt b/ui/ui-core/src/androidTest/java/androidx/ui/semantics/SemanticsTests.kt
index 7cafb2c..8a50d6e 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/semantics/SemanticsTests.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/semantics/SemanticsTests.kt
@@ -392,7 +392,7 @@
* children reasonably. Useful for Semantics hierarchy testing
*/
@Composable
-private fun SimpleTestLayout(children: @Composable() () -> Unit) {
+private fun SimpleTestLayout(children: @Composable () -> Unit) {
Layout(children = children) { measurables, constraints, _ ->
if (measurables.isEmpty()) {
layout(constraints.minWidth, constraints.minHeight) {}
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/ComposedModifier.kt b/ui/ui-core/src/main/java/androidx/ui/core/ComposedModifier.kt
index 8cc3fa2..71f5296 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/ComposedModifier.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/ComposedModifier.kt
@@ -29,11 +29,11 @@
* applying a [Modifier] to an element tree node.
*/
fun Modifier.composed(
- factory: @Composable() Modifier.() -> Modifier
+ factory: @Composable Modifier.() -> Modifier
): Modifier = this + ComposedModifier(factory)
private data class ComposedModifier(
- val factory: @Composable() Modifier.() -> Modifier
+ val factory: @Composable Modifier.() -> Modifier
) : Modifier.Element
/**
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Layout.kt b/ui/ui-core/src/main/java/androidx/ui/core/Layout.kt
index 5718aed..16b05d0 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Layout.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Layout.kt
@@ -73,7 +73,7 @@
@Composable
/*inline*/ fun Layout(
/*crossinline*/
- children: @Composable() () -> Unit,
+ children: @Composable () -> Unit,
/*crossinline*/
minIntrinsicWidthMeasureBlock: IntrinsicMeasureBlock,
/*crossinline*/
@@ -146,7 +146,7 @@
@Composable
/*inline*/ fun Layout(
/*crossinline*/
- children: @Composable() () -> Unit,
+ children: @Composable () -> Unit,
modifier: Modifier = Modifier,
/*noinline*/
measureBlock: MeasureBlock
@@ -158,7 +158,7 @@
/*@PublishedApi*/ @Composable internal /*inline*/ fun Layout(
/*crossinline*/
- children: @Composable() () -> Unit,
+ children: @Composable () -> Unit,
measureBlocks: LayoutNode.MeasureBlocks,
modifier: Modifier
) {
@@ -172,7 +172,7 @@
"It should not be used in app code directly.")
fun MultiMeasureLayout(
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit,
+ children: @Composable () -> Unit,
measureBlock: MeasureBlock
) {
val measureBlocks = remember(measureBlock) { MeasuringIntrinsicsMeasureBlocks(measureBlock) }
@@ -191,7 +191,7 @@
"It should not be used in app code directly.")
fun PassThroughLayout(
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val measureBlocks = remember {
val measureBlock: MeasureBlock = { measurables, constraints, _ ->
@@ -456,7 +456,7 @@
@Composable
fun WithConstraints(
modifier: Modifier = Modifier,
- children: @Composable() WithConstraintsScope.() -> Unit
+ children: @Composable WithConstraintsScope.() -> Unit
) {
val state = remember { WithConstrainsState() }
state.children = children
@@ -532,7 +532,7 @@
var compositionRef: CompositionReference? = null
lateinit var context: Context
val nodeRef = Ref<LayoutNode>()
- var children: @Composable() WithConstraintsScope.() -> Unit = { }
+ var children: @Composable WithConstraintsScope.() -> Unit = { }
var forceRecompose = false
var composition: Composition? = null
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/ParentData.kt b/ui/ui-core/src/main/java/androidx/ui/core/ParentData.kt
index 640dcbd..1767efb 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/ParentData.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/ParentData.kt
@@ -35,7 +35,7 @@
"layout children to recognize them inside the measure block."
)
@Composable
-inline fun ParentData(data: Any, crossinline children: @Composable() () -> Unit) {
+inline fun ParentData(data: Any, crossinline children: @Composable () -> Unit) {
DataNode(key = ParentDataKey, value = data) {
children()
}
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt b/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt
index 38df7ed..e05d427 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt
@@ -59,7 +59,7 @@
noinline cancelHandler: () -> Unit,
noinline initHandler: ((CustomEventDispatcher) -> Unit)? = null,
noinline customEventHandler: ((CustomEvent, PointerEventPass) -> Unit)? = null,
- crossinline children: @Composable() () -> Unit
+ crossinline children: @Composable () -> Unit
) {
// Hide the internals of PointerInputNode.
PointerInputNode(
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Popup.kt b/ui/ui-core/src/main/java/androidx/ui/core/Popup.kt
index 1414e90..00916ec 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Popup.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Popup.kt
@@ -67,7 +67,7 @@
alignment: Alignment = Alignment.TopStart,
offset: IntPxPosition = IntPxPosition(IntPx.Zero, IntPx.Zero),
popupProperties: PopupProperties = PopupProperties(),
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
// Memoize the object, but change the value of the properties if a recomposition happens
val popupPositionProperties = remember {
@@ -103,7 +103,7 @@
dropDownAlignment: DropDownAlignment = DropDownAlignment.Start,
offset: IntPxPosition = IntPxPosition(IntPx.Zero, IntPx.Zero),
popupProperties: PopupProperties = PopupProperties(),
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
// Memoize the object, but change the value of the properties if a recomposition happens
val popupPositionProperties = remember {
@@ -127,7 +127,7 @@
private val PopupTestTagAmbient = ambientOf { "DEFAULT_TEST_TAG" }
@Composable
-internal fun PopupTestTag(tag: String, children: @Composable() () -> Unit) {
+internal fun PopupTestTag(tag: String, children: @Composable () -> Unit) {
Providers(PopupTestTagAmbient provides tag, children = children)
}
@@ -136,7 +136,7 @@
popupProperties: PopupProperties,
popupPositionProperties: PopupPositionProperties,
calculatePopupPosition: ((PopupPositionProperties) -> IntPxPosition),
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val context = ContextAmbient.current
// TODO(b/139866476): Decide if we want to expose the AndroidComposeView
@@ -203,7 +203,7 @@
// Popup's SimpleStack and Stack.
@Suppress("NOTHING_TO_INLINE")
@Composable
-private inline fun SimpleStack(modifier: Modifier, noinline children: @Composable() () -> Unit) {
+private inline fun SimpleStack(modifier: Modifier, noinline children: @Composable () -> Unit) {
Layout(children = children, modifier = modifier) { measurables, constraints, _ ->
when (measurables.size) {
0 -> layout(0.ipx, 0.ipx) {}
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/TestTag.kt b/ui/ui-core/src/main/java/androidx/ui/core/TestTag.kt
index 704dc18..1fd3de9 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/TestTag.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/TestTag.kt
@@ -30,6 +30,6 @@
* setting this on does not already create a boundary, you will need to create one.
*/
@Composable
-fun TestTag(tag: String, children: @Composable() () -> Unit) {
+fun TestTag(tag: String, children: @Composable () -> Unit) {
Semantics(properties = { testTag = tag }, children = children)
}
\ No newline at end of file
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Wrapper.kt b/ui/ui-core/src/main/java/androidx/ui/core/Wrapper.kt
index 9ce65a6..93bdff0 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Wrapper.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Wrapper.kt
@@ -71,7 +71,7 @@
// TODO: Remove this API when View/ComponentNode mixed trees work
fun ViewGroup.setViewContent(
parent: CompositionReference? = null,
- composable: @Composable() () -> Unit
+ composable: @Composable () -> Unit
): Composition = compositionFor(
context = context,
container = this,
@@ -92,7 +92,7 @@
* @see Activity.setContentView
*/
// TODO: Remove this API when View/ComponentNode mixed trees work
-fun Activity.setViewContent(composable: @Composable() () -> Unit): Composition {
+fun Activity.setViewContent(composable: @Composable () -> Unit): Composition {
// TODO(lmr): add ambients here, or remove API entirely if we can
// If there is already a FrameLayout in the root, we assume we want to compose
// into it instead of create a new one. This allows for `setContent` to be
@@ -114,7 +114,7 @@
container: ComponentNode,
recomposer: Recomposer,
parent: CompositionReference? = null,
- composable: @Composable() () -> Unit
+ composable: @Composable () -> Unit
): Composition = compositionFor(context, container, recomposer, parent).apply {
setContent(composable)
}
@@ -131,7 +131,7 @@
container: ComponentNode,
context: Context,
parent: CompositionReference? = null,
- composable: @Composable() () -> Unit
+ composable: @Composable () -> Unit
): Composition = subcomposeInto(context, container, Recomposer.current(), parent, composable)
/**
@@ -147,7 +147,7 @@
// Note: Recomposer.current() is the default here since all Activity view trees are hosted
// on the main thread.
recomposer: Recomposer = Recomposer.current(),
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
): Composition = setContent(this, recomposer, content)
/**
@@ -161,13 +161,13 @@
"or AppCompatActivity"
)
fun Activity.setContent(
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
): Composition = setContent(null, Recomposer.current(), content)
private fun Activity.setContent(
lifecycleOwner: LifecycleOwner?,
recomposer: Recomposer,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
): Composition {
FrameManager.ensureStarted()
val composeView: AndroidOwner = window.decorView
@@ -184,7 +184,7 @@
* level [SelectionContainer] is installed at the root.
*/
@Composable
-private fun WrapWithSelectionContainer(content: @Composable() () -> Unit) {
+private fun WrapWithSelectionContainer(content: @Composable () -> Unit) {
SelectionContainer(children = content)
}
@@ -199,7 +199,7 @@
*/
fun ViewGroup.setContent(
recomposer: Recomposer,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
): Composition {
FrameManager.ensureStarted()
val composeView =
@@ -228,14 +228,14 @@
)
)
fun ViewGroup.setContent(
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
): Composition = setContent(Recomposer.current(), content)
private fun doSetContent(
context: Context,
owner: AndroidOwner,
recomposer: Recomposer,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
): Composition {
val original = compositionFor(context, owner.root, recomposer)
val wrapped = owner.view.getTag(R.id.wrapped_composition_tag)
@@ -255,7 +255,7 @@
private var disposed = false
private var addedToLifecycle: Lifecycle? = null
- override fun setContent(content: @Composable() () -> Unit) {
+ override fun setContent(content: @Composable () -> Unit) {
val lifecycle = owner.lifecycleOwner?.lifecycle
if (lifecycle != null) {
if (addedToLifecycle == null) {
@@ -305,7 +305,7 @@
owner: Owner,
context: Context,
coroutineContext: CoroutineContext,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
// TODO(nona): Tie the focus manger lifecycle to Window, otherwise FocusManager won't work
// with nested AndroidComposeView case
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/selection/SelectionContainer.kt b/ui/ui-core/src/main/java/androidx/ui/core/selection/SelectionContainer.kt
index 81d9d69..8d371c3 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/selection/SelectionContainer.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/selection/SelectionContainer.kt
@@ -50,7 +50,7 @@
* Default SelectionContainer to be used in order to make composables selectable by default.
*/
@Composable
-internal fun SelectionContainer(children: @Composable() () -> Unit) {
+internal fun SelectionContainer(children: @Composable () -> Unit) {
val selection = state<Selection?> { null }
SelectionContainer(
selection = selection.value,
@@ -71,7 +71,7 @@
selection: Selection?,
/** A function containing customized behaviour when selection changes. */
onSelectionChange: (Selection?) -> Unit,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val registrarImpl = remember { SelectionRegistrarImpl() }
val manager = remember { SelectionManager(registrarImpl) }
@@ -119,7 +119,7 @@
private fun Handle(
manager: SelectionManager,
isStartHandle: Boolean,
- handle: @Composable() () -> Unit
+ handle: @Composable () -> Unit
) {
val offset = if (isStartHandle) manager.startHandlePosition else manager.endHandlePosition
val selection = manager.selection
@@ -152,7 +152,7 @@
* the children.
*/
@Composable
-private fun Wrap(modifier: Modifier = Modifier, children: @Composable() () -> Unit) {
+private fun Wrap(modifier: Modifier = Modifier, children: @Composable () -> Unit) {
Layout(modifier = modifier, children = children) { measurables, constraints, _ ->
val placeables = measurables.map { measurable ->
measurable.measure(constraints)
@@ -182,7 +182,7 @@
modifier: Modifier = Modifier,
width: Dp? = null,
height: Dp? = null,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children, modifier) { measurables, incomingConstraints, _ ->
val containerConstraints = Constraints()
diff --git a/ui/ui-core/src/main/java/androidx/ui/focus/Focusable.kt b/ui/ui-core/src/main/java/androidx/ui/focus/Focusable.kt
index c11f08c..a5c081d 100644
--- a/ui/ui-core/src/main/java/androidx/ui/focus/Focusable.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/focus/Focusable.kt
@@ -40,7 +40,7 @@
level = DeprecationLevel.ERROR
)
@Composable
-fun Focusable(focusOperator: Any, children: @Composable() (Any) -> Unit) {
+fun Focusable(focusOperator: Any, children: @Composable (Any) -> Unit) {
}
/**
diff --git a/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorCompose.kt b/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorCompose.kt
index 49211ab..b608828 100644
--- a/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorCompose.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorCompose.kt
@@ -86,7 +86,7 @@
alignment: Alignment = DefaultAlignment,
contentScale: ContentScale = ContentScale.Inside,
name: String = "",
- children: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ children: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): Modifier {
val density = DensityAmbient.current
val widthPx = with(density) { defaultWidth.toPx() }
@@ -135,7 +135,7 @@
alignment: Alignment = DefaultAlignment,
contentScale: ContentScale = ContentScale.Inside,
name: String = "",
- children: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ children: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): Modifier = Modifier.drawVector(
defaultWidth = defaultWidth,
defaultHeight = defaultHeight,
@@ -174,7 +174,7 @@
alignment: Alignment = DefaultAlignment,
contentScale: ContentScale = ContentScale.Inside,
name: String = "",
- children: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ children: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): Modifier = composed {
val vector = remember(name, viewportWidth, viewportHeight) {
VectorComponent(
@@ -236,7 +236,7 @@
translationX: Float = DefaultTranslationX,
translationY: Float = DefaultTranslationY,
clipPathData: List<PathNode> = EmptyPath,
- children: @Composable() VectorScope.() -> Unit
+ children: @Composable VectorScope.() -> Unit
) {
GroupComponent(
name = name,
diff --git a/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorPainter.kt b/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorPainter.kt
index fcecbe0..937238f 100644
--- a/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorPainter.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/graphics/vector/VectorPainter.kt
@@ -60,7 +60,7 @@
viewportWidth: Float = Float.NaN,
viewportHeight: Float = Float.NaN,
name: String = RootGroupName,
- children: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ children: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): VectorPainter {
val density = DensityAmbient.current
val widthPx = with(density) { defaultWidth.toPx() }
@@ -136,7 +136,7 @@
defaultHeight: Px,
viewportWidth: Float = defaultWidth.value,
viewportHeight: Float = defaultHeight.value,
- children: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ children: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): VectorComponent {
val vector =
remember(name, viewportWidth, viewportHeight) {
diff --git a/ui/ui-core/src/main/java/androidx/ui/semantics/Semantics.kt b/ui/ui-core/src/main/java/androidx/ui/semantics/Semantics.kt
index 558ad9d..eecab64 100644
--- a/ui/ui-core/src/main/java/androidx/ui/semantics/Semantics.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/semantics/Semantics.kt
@@ -40,7 +40,7 @@
*/
mergeAllDescendants: Boolean = false,
properties: (SemanticsPropertyReceiver.() -> Unit)? = null,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
@Suppress("DEPRECATION")
PassThroughLayout(
diff --git a/ui/ui-core/src/test/java/androidx/ui/core/ComposedModifierTest.kt b/ui/ui-core/src/test/java/androidx/ui/core/ComposedModifierTest.kt
index c7cade0..a3658b1 100644
--- a/ui/ui-core/src/test/java/androidx/ui/core/ComposedModifierTest.kt
+++ b/ui/ui-core/src/test/java/androidx/ui/core/ComposedModifierTest.kt
@@ -180,7 +180,7 @@
}
private fun compose(
- block: @Composable() () -> Unit
+ block: @Composable () -> Unit
): Composer<Unit> = UnitComposer().apply {
compose(block)
applyChanges()
@@ -209,7 +209,7 @@
Applier(Unit, UnitApplierAdapter),
NoOpSchedulingRecomposer
) {
- fun compose(composable: @Composable() () -> Unit) {
+ fun compose(composable: @Composable () -> Unit) {
composeRoot {
@Suppress("UNCHECKED_CAST")
val fn = composable as (Composer<*>) -> Unit
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/Wrapper.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/Wrapper.kt
index df3974a..85e3647 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/Wrapper.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/Wrapper.kt
@@ -33,7 +33,7 @@
import org.jetbrains.skija.Canvas
-fun SkiaWindow.setContent(content: @Composable() () -> Unit) {
+fun SkiaWindow.setContent(content: @Composable () -> Unit) {
SwingUtilities.invokeLater {
println("start composing!")
diff --git a/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/ListDemos.kt b/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/ListDemos.kt
index b3082ec..c1d73bc 100644
--- a/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/ListDemos.kt
+++ b/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/ListDemos.kt
@@ -82,7 +82,7 @@
}
@Composable
-fun Button(modifier: Modifier, onClick: () -> Unit, children: @Composable() () -> Unit) {
+fun Button(modifier: Modifier, onClick: () -> Unit, children: @Composable () -> Unit) {
Clickable( {
Box(
modifier = modifier,
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
index db92c21..e324658 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
@@ -423,7 +423,7 @@
}
}
- private fun setDraggableContent(draggableFactory: @Composable() () -> Modifier) {
+ private fun setDraggableContent(draggableFactory: @Composable () -> Modifier) {
composeTestRule.setContent {
Stack {
val draggable = draggableFactory()
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt
index 91ef177..27dfc12 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt
@@ -572,7 +572,7 @@
}
}
- private fun setScrollableContent(scrollableModifierFactory: @Composable() () -> Modifier) {
+ private fun setScrollableContent(scrollableModifierFactory: @Composable () -> Modifier) {
composeTestRule.setContent {
Stack {
val scrollable = scrollableModifierFactory()
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt
index 351344c..42934f8 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt
@@ -64,7 +64,7 @@
private class ListState<T> {
lateinit var recomposer: Recomposer
- lateinit var itemCallback: @Composable() (T) -> Unit
+ lateinit var itemCallback: @Composable (T) -> Unit
lateinit var data: List<T>
var forceRecompose = false
@@ -513,7 +513,7 @@
fun <T> AdapterList(
data: List<T>,
modifier: Modifier = Modifier,
- itemCallback: @Composable() (T) -> Unit
+ itemCallback: @Composable (T) -> Unit
) {
val state = remember { ListState<T>() }
state.recomposer = currentComposer.recomposer
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt
index 62b3fcb..14508cc 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt
@@ -77,7 +77,7 @@
paddingEnd: Dp = Dp.Unspecified,
paddingBottom: Dp = Dp.Unspecified,
gravity: ContentGravity = ContentGravity.TopStart,
- children: @Composable() () -> Unit = emptyContent()
+ children: @Composable () -> Unit = emptyContent()
) {
val borderModifier =
if (border != null) Modifier.drawBorder(border, shape) else Modifier
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
index 95b4e25..59fe9002 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
@@ -60,7 +60,7 @@
enabled: Boolean = true,
onClickLabel: String? = null,
interactionState: InteractionState? = null,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Semantics(
container = true,
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/DeterminateProgressIndicator.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/DeterminateProgressIndicator.kt
index a4744cd..c459dfe 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/DeterminateProgressIndicator.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/DeterminateProgressIndicator.kt
@@ -38,7 +38,7 @@
@Composable
fun DeterminateProgressIndicator(
@FloatRange(from = 0.0, to = 1.0) progress: Float,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
if (progress !in 0f..1f) {
throw IllegalArgumentException("Progress must be between 0.0 and 1.0")
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
index 697dec6..06a1553 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
@@ -48,7 +48,7 @@
* @param children The content to be displayed inside the dialog.
*/
@Composable
-fun Dialog(onCloseRequest: () -> Unit, children: @Composable() () -> Unit) {
+fun Dialog(onCloseRequest: () -> Unit, children: @Composable () -> Unit) {
val context = ContextAmbient.current
val recomposer = currentComposer.recomposer
@@ -87,7 +87,7 @@
setContentView(frameLayout)
}
- fun setContent(children: @Composable() () -> Unit) {
+ fun setContent(children: @Composable () -> Unit) {
// TODO: This should probably create a child composition of the original
composition = frameLayout.setContent(recomposer, children)
}
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
index fe81619..c569616 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
@@ -207,7 +207,7 @@
scrollerPosition: ScrollerPosition = ScrollerPosition(),
modifier: Modifier = Modifier,
isScrollable: Boolean = true,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
Scroller(scrollerPosition, modifier, true, isScrollable, child)
}
@@ -237,7 +237,7 @@
scrollerPosition: ScrollerPosition = ScrollerPosition(),
modifier: Modifier = Modifier,
isScrollable: Boolean = true,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
Scroller(scrollerPosition, modifier, false, isScrollable, child)
}
@@ -248,7 +248,7 @@
modifier: Modifier,
isVertical: Boolean,
isScrollable: Boolean,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
val direction =
if (isVertical) DragDirection.Vertical else DragDirection.Horizontal
@@ -282,7 +282,7 @@
scrollerPosition: ScrollerPosition,
modifier: Modifier,
isVertical: Boolean,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
Layout(
modifier = modifier.clipToBounds(),
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Text.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Text.kt
index a06b87c..8d09b84 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Text.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Text.kt
@@ -217,7 +217,7 @@
* styled explicitly.
*/
@Composable
-fun ProvideTextStyle(value: TextStyle, children: @Composable() () -> Unit) {
+fun ProvideTextStyle(value: TextStyle, children: @Composable () -> Unit) {
val mergedStyle = currentTextStyle().merge(value)
Providers(TextStyleAmbient provides mergedStyle, children = children)
}
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/MutuallyExclusiveSetItem.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/MutuallyExclusiveSetItem.kt
index cdc3d5b..fb96bc9 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/MutuallyExclusiveSetItem.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/MutuallyExclusiveSetItem.kt
@@ -44,7 +44,7 @@
selected: Boolean,
onClick: () -> Unit,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
// TODO: when semantics can be merged, we should make this use Clickable internally rather
// than duplicating logic
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
index d179f52..074ac96 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
@@ -53,7 +53,7 @@
onValueChange: (Boolean) -> Unit,
enabled: Boolean = true,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
TriStateToggleable(
state = ToggleableState(value),
@@ -91,7 +91,7 @@
onClick: () -> Unit,
enabled: Boolean = true,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
// TODO(pavlis): Handle multiple states for Semantics
Semantics(container = true, properties = {
diff --git a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt
index fe3ee89..6e4fe92 100644
--- a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt
+++ b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt
@@ -69,7 +69,7 @@
* such as val foo = @Composable {}
* 4. The receiver type of the function call is `Function0` (i.e, we are invoking something
* that matches `() -> Unit` - this both avoids non-lambda invocations but also makes sure
- * that we don't warn for lambdas that have parameters, such as @Composable() (Int) -> Unit
+ * that we don't warn for lambdas that have parameters, such as @Composable (Int) -> Unit
* - this cannot be inlined.)
* 5. The outer function call that contains this lambda is not a call to a `ComponentNode`
* (because these are technically constructor invocations that we just intercept calls to
@@ -189,7 +189,7 @@
*/
private val KtCallableDeclaration.isComposable: Boolean
// Unfortunately as Composability isn't carried through UAST, and there are many types of
- // declarations (types such as foo: @Composable() () -> Unit, properties such as val
+ // declarations (types such as foo: @Composable () -> Unit, properties such as val
// foo = @Composable {}) the best way to cover this is just check if we contain this annotation
// in text. Definitely not ideal, but it should cover most cases and ignores false positives, so
// it's the best solution for now.
diff --git a/ui/ui-internal-lint-checks/src/test/java/androidx/ui/lint/UnnecessaryLambdaCreationDetectorTest.kt b/ui/ui-internal-lint-checks/src/test/java/androidx/ui/lint/UnnecessaryLambdaCreationDetectorTest.kt
index 63f2615..fc75fe7 100644
--- a/ui/ui-internal-lint-checks/src/test/java/androidx/ui/lint/UnnecessaryLambdaCreationDetectorTest.kt
+++ b/ui/ui-internal-lint-checks/src/test/java/androidx/ui/lint/UnnecessaryLambdaCreationDetectorTest.kt
@@ -41,7 +41,7 @@
fun function() {}
@Composable
- fun ComposableFunction(children: @Composable() () -> Unit) {
+ fun ComposableFunction(children: @Composable () -> Unit) {
children()
}
""").indented().within("src")
@@ -99,8 +99,8 @@
@Composable
fun MultipleChildComposableFunction(
- firstChild: @Composable() () -> Unit,
- secondChild: @Composable() () -> Unit
+ firstChild: @Composable () -> Unit,
+ secondChild: @Composable () -> Unit
) {}
@Composable
@@ -140,7 +140,7 @@
check("""
package test
- val property: @Composable() () -> Unit = {
+ val property: @Composable () -> Unit = {
lambda()
}
""").expectClean()
@@ -169,7 +169,7 @@
@Composable
fun ComposableFunctionWithParams(
- child: @Composable() (child: @Composable() () -> Unit) -> Unit
+ child: @Composable (child: @Composable () -> Unit) -> Unit
) {}
@Composable
@@ -179,7 +179,7 @@
}
}
- val parameterizedLambda: (@Composable() () -> Unit) -> Unit = { it() }
+ val parameterizedLambda: (@Composable () -> Unit) -> Unit = { it() }
val differentlyParameterizedLambda: (Int) -> Unit = { }
@Composable
@@ -212,15 +212,15 @@
class OtherScope
@Composable
- fun ScopedComposableFunction(children: @Composable() SomeScope.() -> Unit) {
+ fun ScopedComposableFunction(children: @Composable SomeScope.() -> Unit) {
children()
}
@Composable
fun Test() {
val unscopedLambda: () -> Unit = {}
- val scopedLambda: @Composable() SomeScope.() -> Unit = {}
- val differentlyScopedLambda: @Composable() OtherScope.() -> Unit = {}
+ val scopedLambda: @Composable SomeScope.() -> Unit = {}
+ val differentlyScopedLambda: @Composable OtherScope.() -> Unit = {}
ScopedComposableFunction {
unscopedLambda()
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutDirectionModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutDirectionModifierTest.kt
index 6d8a2ba..54693c6 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutDirectionModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutDirectionModifierTest.kt
@@ -51,7 +51,7 @@
show {
Layout(
- children = @Composable() {},
+ children = @Composable {},
modifier = Modifier.rtl
) { _, _, incomingLayoutDirection ->
layoutDirection.value = incomingLayoutDirection
@@ -71,7 +71,7 @@
show {
Layout(
- children = @Composable() {},
+ children = @Composable {},
modifier = Modifier.preferredWidth(IntrinsicSize.Max).rtl,
minIntrinsicWidthMeasureBlock = { _, _, _ -> 0.ipx },
minIntrinsicHeightMeasureBlock = { _, _, _ -> 0.ipx },
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
index 509eea9..f64384d 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
@@ -122,7 +122,7 @@
@Test
fun paddingAllAppliedToChild() = with(density) {
val padding = 10.dp
- testPaddingIsAppliedImplementation(padding) { child: @Composable() () -> Unit ->
+ testPaddingIsAppliedImplementation(padding) { child: @Composable () -> Unit ->
TestBox(modifier = Modifier.padding(padding), body = child)
}
}
@@ -144,7 +144,7 @@
paddingTop,
paddingRight,
paddingBottom
- ) { child: @Composable() () -> Unit ->
+ ) { child: @Composable () -> Unit ->
TestBox(modifier = padding, body = child)
}
}
@@ -159,7 +159,7 @@
@Test
fun insufficientSpaceAvailable() = with(density) {
val padding = 30.dp
- testPaddingWithInsufficientSpaceImplementation(padding) { child: @Composable() () -> Unit ->
+ testPaddingWithInsufficientSpaceImplementation(padding) { child: @Composable () -> Unit ->
TestBox(modifier = Modifier.padding(padding), body = child)
}
}
@@ -342,7 +342,7 @@
private fun testPaddingIsAppliedImplementation(
padding: Dp,
- paddingContainer: @Composable() (@Composable() () -> Unit) -> Unit
+ paddingContainer: @Composable (@Composable () -> Unit) -> Unit
) = with(density) {
val sizeDp = 50.dp
val size = sizeDp.toIntPx()
@@ -389,7 +389,7 @@
top: Dp,
right: Dp,
bottom: Dp,
- paddingContainer: @Composable() ((@Composable() () -> Unit) -> Unit)
+ paddingContainer: @Composable ((@Composable () -> Unit) -> Unit)
) = with(density) {
val sizeDp = 50.dp
val size = sizeDp.toIntPx()
@@ -441,7 +441,7 @@
private fun testPaddingWithInsufficientSpaceImplementation(
padding: Dp,
- paddingContainer: @Composable() (@Composable() () -> Unit) -> Unit
+ paddingContainer: @Composable (@Composable () -> Unit) -> Unit
) = with(density) {
val sizeDp = 50.dp
val size = sizeDp.toIntPx()
@@ -483,7 +483,7 @@
* with the same constraints it received.
*/
@Composable
- private fun TestBox(modifier: Modifier = Modifier, body: @Composable() () -> Unit) {
+ private fun TestBox(modifier: Modifier = Modifier, body: @Composable () -> Unit) {
Layout(children = body, modifier = modifier) { measurables, constraints, _ ->
require(measurables.size == 1) {
"TestBox received ${measurables.size} children; must have exactly 1"
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
index 0705b47..66abc3d 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
@@ -90,7 +90,7 @@
activityTestRule.runOnUiThread(runnable)
}
- internal fun show(composable: @Composable() () -> Unit) {
+ internal fun show(composable: @Composable () -> Unit) {
val runnable: Runnable = object : Runnable {
override fun run() {
activity.setContent(Recomposer.current(), composable)
@@ -150,7 +150,7 @@
}
internal fun testIntrinsics(
- vararg layouts: @Composable() () -> Unit,
+ vararg layouts: @Composable () -> Unit,
test: ((IntPx) -> IntPx, (IntPx) -> IntPx, (IntPx) -> IntPx, (IntPx) -> IntPx) -> Unit
) {
layouts.forEach { layout ->
@@ -194,7 +194,7 @@
}
@Composable
- internal fun WithInfiniteConstraints(children: @Composable() () -> Unit) {
+ internal fun WithInfiniteConstraints(children: @Composable () -> Unit) {
Layout(children) { measurables, _, _ ->
val placeables = measurables.map { it.measure(Constraints()) }
layout(0.ipx, 0.ipx) {
@@ -207,7 +207,7 @@
internal fun ConstrainedBox(
constraints: DpConstraints,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(
children,
@@ -364,7 +364,7 @@
constraints: DpConstraints = DpConstraints(),
width: Dp? = null,
height: Dp? = null,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children, modifier) { measurables, incomingConstraints, _ ->
val containerConstraints = Constraints(constraints)
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
index e0171bf..3bd6d1f 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
@@ -319,7 +319,7 @@
}
@Composable
- private fun Offset(sizeModel: SizeModel, children: @Composable() () -> Unit) {
+ private fun Offset(sizeModel: SizeModel, children: @Composable () -> Unit) {
// simple copy of Padding which doesn't recompose when the size changes
Layout(children) { measurables, constraints, _ ->
layout(constraints.maxWidth, constraints.maxHeight) {
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/RowColumnTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/RowColumnTest.kt
index cc7a346..65c3be9 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/RowColumnTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/RowColumnTest.kt
@@ -3666,7 +3666,7 @@
height: Dp,
baseline: Dp,
modifier: Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children = children, modifier = modifier, measureBlock = { _, constraints, _ ->
val widthPx = max(width.toIntPx(), constraints.minWidth)
@@ -3680,7 +3680,7 @@
// Center composable function is deprected whereas FlexTest tests heavily depend on it.
@Composable
-private fun Center(children: @Composable() () -> Unit) {
+private fun Center(children: @Composable () -> Unit) {
Layout(children) { measurables, constraints, _ ->
val measurable = measurables.firstOrNull()
// The child cannot be larger than our max constraints, but we ignore min constraints.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
index 95df426..602ff48 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
@@ -61,7 +61,7 @@
modifier: Modifier = Modifier,
before: Dp = 0.dp,
after: Dp = 0.dp,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Layout(children, modifier) { measurables, constraints, _ ->
require(measurables.isNotEmpty()) { "No child found in AlignmentLineOffset" }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
index 87a1cfd..1668665 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
@@ -63,7 +63,7 @@
modifier: Modifier = Modifier,
verticalArrangement: Arrangement.Vertical = Arrangement.Top,
horizontalGravity: Alignment.Horizontal = Alignment.Start,
- children: @Composable() ColumnScope.() -> Unit
+ children: @Composable ColumnScope.() -> Unit
) {
RowColumnImpl(
orientation = LayoutOrientation.Vertical,
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
index 0721c0f..ae5a77d 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
@@ -61,7 +61,7 @@
fun ConstraintLayout(
constraintSet: ConstraintSet,
modifier: Modifier = Modifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val measurer = remember { Measurer() }
@Suppress("Deprecation")
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
index a86f39a..6534ff5 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
@@ -53,7 +53,7 @@
crossAxisAlignment: FlowCrossAxisAlignment = FlowCrossAxisAlignment.Start,
crossAxisSpacing: Dp = 0.dp,
lastLineMainAxisAlignment: FlowMainAxisAlignment = mainAxisAlignment,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Flow(
orientation = LayoutOrientation.Horizontal,
@@ -92,7 +92,7 @@
crossAxisAlignment: FlowCrossAxisAlignment = FlowCrossAxisAlignment.Start,
crossAxisSpacing: Dp = 0.dp,
lastLineMainAxisAlignment: FlowMainAxisAlignment = mainAxisAlignment,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Flow(
orientation = LayoutOrientation.Vertical,
@@ -138,7 +138,7 @@
crossAxisAlignment: FlowCrossAxisAlignment,
crossAxisSpacing: Dp,
lastLineMainAxisAlignment: FlowMainAxisAlignment,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
fun Placeable.mainAxisSize() =
if (orientation == LayoutOrientation.Horizontal) width else height
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
index 8151cfc..2c6843e 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
@@ -192,7 +192,7 @@
@Deprecated("This component is deprecated. " +
"Please use the preferredWidth(IntrinsicSize.Min) modifier instead.")
@Composable
-fun MinIntrinsicWidth(children: @Composable() () -> Unit) {
+fun MinIntrinsicWidth(children: @Composable () -> Unit) {
Layout(
children,
minIntrinsicWidthMeasureBlock = { measurables, h, _ ->
@@ -226,7 +226,7 @@
@Deprecated("This component is deprecated. " +
"Please use the preferredHeight(IntrinsicSize.Min) modifier instead.")
@Composable
-fun MinIntrinsicHeight(children: @Composable() () -> Unit) {
+fun MinIntrinsicHeight(children: @Composable () -> Unit) {
Layout(
children,
minIntrinsicWidthMeasureBlock = { measurables, h, _ ->
@@ -260,7 +260,7 @@
@Deprecated("This component is deprecated. " +
"Please use the preferredWidth(IntrinsicSize.Max) modifier instead.")
@Composable
-fun MaxIntrinsicWidth(children: @Composable() () -> Unit) {
+fun MaxIntrinsicWidth(children: @Composable () -> Unit) {
Layout(
children,
minIntrinsicWidthMeasureBlock = { measurables, h, _ ->
@@ -294,7 +294,7 @@
@Deprecated("This component is deprecated. " +
"Please use the preferredHeight(IntrinsicSize.Max) modifier instead.")
@Composable
-fun MaxIntrinsicHeight(children: @Composable() () -> Unit) {
+fun MaxIntrinsicHeight(children: @Composable () -> Unit) {
Layout(
children,
minIntrinsicWidthMeasureBlock = { measurables, h, _ ->
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
index 05afc48..197ea96 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
@@ -61,7 +61,7 @@
modifier: Modifier = Modifier,
horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
verticalGravity: Alignment.Vertical = Alignment.Top,
- children: @Composable() RowScope.() -> Unit
+ children: @Composable RowScope.() -> Unit
) {
RowColumnImpl(
orientation = LayoutOrientation.Horizontal,
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/RowColumnImpl.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/RowColumnImpl.kt
index fc02438..3f1133b 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/RowColumnImpl.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/RowColumnImpl.kt
@@ -51,7 +51,7 @@
arrangement: Arrangement,
crossAxisSize: SizeMode,
crossAxisAlignment: Any,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
fun Placeable.mainAxisSize() =
if (orientation == LayoutOrientation.Horizontal) width else height
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
index 0f821a1..4b64ad7 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
@@ -44,9 +44,9 @@
@Composable
fun Stack(
modifier: Modifier = Modifier,
- children: @Composable() StackScope.() -> Unit
+ children: @Composable StackScope.() -> Unit
) {
- val stackChildren: @Composable() () -> Unit = { StackScope().children() }
+ val stackChildren: @Composable () -> Unit = { StackScope().children() }
Layout(stackChildren, modifier = modifier) { measurables, constraints, layoutDirection ->
val placeables = arrayOfNulls<Placeable>(measurables.size)
diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt
index f0d423f..625d26d 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt
@@ -213,7 +213,7 @@
visible: Boolean,
maxWidth: Dp,
maxDiameter: Dp,
- children: @Composable() (labelWidth: Dp, selectionDiameter: Dp, opacity: Float) -> Unit
+ children: @Composable (labelWidth: Dp, selectionDiameter: Dp, opacity: Float) -> Unit
) {
val transitionDefinition = remember {
transitionDefinition {
diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/MaterialTextField.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/MaterialTextField.kt
index d16643d..60e5923 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/MaterialTextField.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/MaterialTextField.kt
@@ -88,7 +88,7 @@
val characterCounterChecked by savedInstanceState { false }
var selectedOption by savedInstanceState { Option.None }
- val textField = @Composable() {
+ val textField = @Composable {
FilledTextField(
value = text,
text = it },
@@ -145,7 +145,7 @@
*/
@Composable
private fun TextFieldWithMessage(
- textField: @Composable() () -> Unit,
+ textField: @Composable () -> Unit,
helperMessageOption: Option
) {
val typography = MaterialTheme.typography.caption
diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/OverviewScreen.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/OverviewScreen.kt
index 0b3aedd..27f3290 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/OverviewScreen.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/OverviewScreen.kt
@@ -135,7 +135,7 @@
amount: Float,
onClickSeeAll: () -> Unit,
data: List<T>,
- row: @Composable() (T) -> Unit
+ row: @Composable (T) -> Unit
) {
Card {
Column {
diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyScreenState.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyScreenState.kt
index 907c3bb..1fd4eed 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyScreenState.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyScreenState.kt
@@ -22,7 +22,7 @@
enum class RallyScreenState(
val icon: VectorAsset,
- val body: @Composable() () -> Unit
+ val body: @Composable () -> Unit
) {
Overview(Icons.Filled.PieChart, { OverviewBody() }),
Accounts(Icons.Filled.AttachMoney, { AccountsBody() }),
diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt
index 11ba72b..60abbdf 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt
@@ -30,7 +30,7 @@
val rallyGreen = Color(0xFF1EB980)
@Composable
-fun RallyTheme(content: @Composable() () -> Unit) {
+fun RallyTheme(content: @Composable () -> Unit) {
val colors = darkColorPalette(
primary = Color.White,
surface = Color(0xFF26282F),
@@ -104,7 +104,7 @@
}
@Composable
-fun RallyDialogThemeOverlay(content: @Composable() () -> Unit) {
+fun RallyDialogThemeOverlay(content: @Composable () -> Unit) {
val dialogColors = darkColorPalette(
primary = Color.White,
surface = Color(0xFF1E1E1E),
diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/TopAppBar.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/TopAppBar.kt
index f67a0f3..169f1be 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/TopAppBar.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/TopAppBar.kt
@@ -89,7 +89,7 @@
@Composable
private fun TabTransition(
selected: Boolean,
- children: @Composable() (color: Color) -> Unit
+ children: @Composable (color: Color) -> Unit
) {
val color = MaterialTheme.colors.onSurface
val transitionDefinition = remember {
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
index 36d8dd3..42d5453 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
@@ -505,7 +505,7 @@
private fun assertLeftPaddingIs(
padding: Dp,
- button: @Composable() (@Composable() () -> Unit) -> Unit
+ button: @Composable (@Composable () -> Unit) -> Unit
) {
var parentCoordinates: LayoutCoordinates? = null
var childCoordinates: LayoutCoordinates? = null
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/MaterialTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/MaterialTest.kt
index 62c780b..258729e 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/MaterialTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/MaterialTest.kt
@@ -29,7 +29,7 @@
fun ComposeTestRule.setMaterialContent(
modifier: Modifier = Modifier,
- composable: @Composable() () -> Unit
+ composable: @Composable () -> Unit
) {
setContent {
MaterialTheme {
@@ -45,7 +45,7 @@
fun ComposeTestRule.setMaterialContentAndCollectSizes(
modifier: Modifier = Modifier,
parentConstraints: DpConstraints = BigTestConstraints,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
): CollectedSizes {
val sizes = setMaterialContentAndGetPixelSize(modifier, parentConstraints, children)
return CollectedSizes(sizes, density)
@@ -54,7 +54,7 @@
fun ComposeTestRule.setMaterialContentAndGetPixelSize(
modifier: Modifier = Modifier,
parentConstraints: DpConstraints = BigTestConstraints,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
): PxSize = setContentAndGetPixelSize(
parentConstraints,
{ setMaterialContent(composable = it) }
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/RadioGroupUiTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/RadioGroupUiTest.kt
index a293221..38f0b7d 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/RadioGroupUiTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/RadioGroupUiTest.kt
@@ -63,7 +63,7 @@
private val options = listOf(itemOne, itemTwo, itemThree)
@Composable
- fun VerticalRadioGroupforTests(children: @Composable() RadioGroupScope.() -> Unit) {
+ fun VerticalRadioGroupforTests(children: @Composable RadioGroupScope.() -> Unit) {
RadioGroup {
Column {
children(p1 = this@RadioGroup)
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt
index 4ee94bd..541b3cc 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt
@@ -462,7 +462,7 @@
}
@Composable
- fun DrawRectRippleCallback(children: @Composable() () -> Unit) {
+ fun DrawRectRippleCallback(children: @Composable () -> Unit) {
RippleCallback(
canvas, _ ->
canvas.drawRect(
@@ -478,9 +478,9 @@
onDraw: (Canvas, Color) -> Unit = { _, _ -> },
onDispose: () -> Unit = {},
onEffectCreated: () -> Unit = {},
- defaultColor: @Composable() () -> Color = { Color(0) },
- opacityCallback: @Composable() () -> Float = { 1f },
- children: @Composable() () -> Unit
+ defaultColor: @Composable () -> Color = { Color(0) },
+ opacityCallback: @Composable () -> Float = { 1f },
+ children: @Composable () -> Unit
) {
val theme = RippleTheme(
testRippleEffect(onDraw, onDispose, onEffectCreated),
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt b/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt
index 0782771..542dba8 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt
@@ -67,10 +67,10 @@
@Composable
fun AlertDialog(
onCloseRequest: () -> Unit,
- title: @Composable() (() -> Unit)? = null,
- text: @Composable() () -> Unit,
- confirmButton: @Composable() () -> Unit,
- dismissButton: @Composable() (() -> Unit)? = null,
+ title: @Composable (() -> Unit)? = null,
+ text: @Composable () -> Unit,
+ confirmButton: @Composable () -> Unit,
+ dismissButton: @Composable (() -> Unit)? = null,
buttonLayout: AlertDialogButtonLayout = SideBySide,
shape: Shape = MaterialTheme.shapes.medium
) {
@@ -109,9 +109,9 @@
@Composable
fun AlertDialog(
onCloseRequest: () -> Unit,
- title: (@Composable() () -> Unit)? = null,
- text: @Composable() () -> Unit,
- buttons: @Composable() () -> Unit,
+ title: (@Composable () -> Unit)? = null,
+ text: @Composable () -> Unit,
+ buttons: @Composable () -> Unit,
shape: Shape = MaterialTheme.shapes.medium
) {
// TODO: Find a cleaner way to pass the properties of the MaterialTheme
@@ -167,8 +167,8 @@
@Composable
private fun AlertDialogButtonLayout(
- confirmButton: @Composable() () -> Unit,
- dismissButton: @Composable() (() -> Unit)?,
+ confirmButton: @Composable () -> Unit,
+ dismissButton: @Composable (() -> Unit)?,
buttonLayout: AlertDialogButtonLayout
) {
Box(ButtonsBoxModifier, gravity = ContentGravity.CenterEnd) {
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt b/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
index 4ad8a60..1657d50 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
@@ -79,10 +79,10 @@
*/
@Composable
fun TopAppBar(
- title: @Composable() () -> Unit,
+ title: @Composable () -> Unit,
modifier: Modifier = Modifier,
- navigationIcon: @Composable() (() -> Unit)? = null,
- actions: @Composable() RowScope.() -> Unit = {},
+ navigationIcon: @Composable (() -> Unit)? = null,
+ actions: @Composable RowScope.() -> Unit = {},
backgroundColor: Color = MaterialTheme.colors.primarySurface,
contentColor: Color = contentColorFor(backgroundColor),
elevation: Dp = TopAppBarElevation
@@ -141,7 +141,7 @@
backgroundColor: Color = MaterialTheme.colors.primarySurface,
contentColor: Color = contentColorFor(backgroundColor),
elevation: Dp = TopAppBarElevation,
- content: @Composable() RowScope.() -> Unit
+ content: @Composable RowScope.() -> Unit
) {
AppBar(
backgroundColor,
@@ -235,7 +235,7 @@
contentColor: Color = contentColorFor(backgroundColor),
fabConfiguration: FabConfiguration? = null,
cutoutShape: Shape? = null,
- content: @Composable() RowScope.() -> Unit
+ content: @Composable RowScope.() -> Unit
) {
val shape = if (cutoutShape == null || fabConfiguration == null) {
RectangleShape
@@ -497,7 +497,7 @@
elevation: Dp,
shape: Shape,
modifier: Modifier = Modifier,
- children: @Composable() RowScope.() -> Unit
+ children: @Composable RowScope.() -> Unit
) {
Surface(
color = backgroundColor,
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt b/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt
index 1a3a837..325de84 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt
@@ -85,7 +85,7 @@
backgroundColor: Color = MaterialTheme.colors.primarySurface,
contentColor: Color = contentColorFor(backgroundColor),
elevation: Dp = BottomNavigationElevation,
- content: @Composable() RowScope.() -> Unit
+ content: @Composable RowScope.() -> Unit
) {
Surface(
color = backgroundColor,
@@ -128,8 +128,8 @@
*/
@Composable
fun BottomNavigationItem(
- icon: @Composable() () -> Unit,
- text: @Composable() () -> Unit = emptyContent(),
+ icon: @Composable () -> Unit,
+ text: @Composable () -> Unit = emptyContent(),
selected: Boolean,
onSelected: () -> Unit,
modifier: Modifier = Modifier,
@@ -178,7 +178,7 @@
activeColor: Color,
inactiveColor: Color,
selected: Boolean,
- content: @Composable() (animationProgress: Float) -> Unit
+ content: @Composable (animationProgress: Float) -> Unit
) {
val animationProgress = animate(
target = if (selected) 1f else 0f,
@@ -204,8 +204,8 @@
*/
@Composable
private fun BottomNavigationItemBaselineLayout(
- icon: @Composable() () -> Unit,
- text: @Composable() () -> Unit,
+ icon: @Composable () -> Unit,
+ text: @Composable () -> Unit,
@FloatRange(from = 0.0, to = 1.0) iconPositionAnimationProgress: Float
) {
Layout(
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Button.kt b/ui/ui-material/src/main/java/androidx/ui/material/Button.kt
index 7ca2ce6..7ba06a1 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Button.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Button.kt
@@ -82,7 +82,7 @@
contentColor: Color = contentColorFor(backgroundColor),
disabledContentColor: Color = Button.defaultDisabledContentColor,
padding: InnerPadding = Button.DefaultInnerPadding,
- text: @Composable() () -> Unit
+ text: @Composable () -> Unit
) {
// Since we're adding layouts in between the clickable layer and the content, we need to
// merge all descendants, or we'll get multiple nodes
@@ -165,7 +165,7 @@
contentColor: Color = contentColorFor(backgroundColor),
disabledContentColor: Color = Button.defaultDisabledContentColor,
padding: InnerPadding = Button.DefaultInnerPadding,
- noinline text: @Composable() () -> Unit
+ noinline text: @Composable () -> Unit
) = Button(
modifier = modifier,
>
@@ -224,7 +224,7 @@
contentColor: Color = MaterialTheme.colors.primary,
disabledContentColor: Color = Button.defaultDisabledContentColor,
padding: InnerPadding = TextButton.DefaultInnerPadding,
- noinline text: @Composable() () -> Unit
+ noinline text: @Composable () -> Unit
) = Button(
modifier = modifier,
>
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Card.kt b/ui/ui-material/src/main/java/androidx/ui/material/Card.kt
index 160ddad..85207bf 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Card.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Card.kt
@@ -48,7 +48,7 @@
contentColor: Color = contentColorFor(color),
border: Border? = null,
elevation: Dp = 1.dp,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
Surface(
modifier = modifier,
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Color.kt b/ui/ui-material/src/main/java/androidx/ui/material/Color.kt
index ab21f70..7ccf65b 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Color.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Color.kt
@@ -297,7 +297,7 @@
* just provides the given palette in the [ColorAmbient] [Ambient].
*/
@Composable
-internal fun ProvideColorPalette(colorPalette: ColorPalette, content: @Composable() () -> Unit) {
+internal fun ProvideColorPalette(colorPalette: ColorPalette, content: @Composable () -> Unit) {
val palette = when (colorPalette) {
is ObservableColorPalette -> {
(remember { ObservableColorPalette(colorPalette) }).updateColorsFrom(colorPalette)
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Drawer.kt b/ui/ui-material/src/main/java/androidx/ui/material/Drawer.kt
index 0474a68..4dfc50c 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Drawer.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Drawer.kt
@@ -82,8 +82,8 @@
drawerState: DrawerState,
onStateChange: (DrawerState) -> Unit,
gesturesEnabled: Boolean = true,
- drawerContent: @Composable() () -> Unit,
- bodyContent: @Composable() () -> Unit
+ drawerContent: @Composable () -> Unit,
+ bodyContent: @Composable () -> Unit
) {
Box(Modifier.fillMaxSize()) {
WithConstraints {
@@ -148,8 +148,8 @@
drawerState: DrawerState,
onStateChange: (DrawerState) -> Unit,
gesturesEnabled: Boolean = true,
- drawerContent: @Composable() () -> Unit,
- bodyContent: @Composable() () -> Unit
+ drawerContent: @Composable () -> Unit,
+ bodyContent: @Composable () -> Unit
) {
Box(Modifier.fillMaxSize()) {
WithConstraints {
@@ -207,7 +207,7 @@
private fun DrawerContent(
xOffset: AnimatedFloat,
constraints: DpConstraints,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
WithOffset(xOffset = xOffset) {
Box(
@@ -231,7 +231,7 @@
private fun BottomDrawerContent(
yOffset: AnimatedFloat,
constraints: DpConstraints,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
WithOffset(yOffset = yOffset) {
Box(
@@ -278,7 +278,7 @@
private fun WithOffset(
xOffset: AnimatedFloat? = null,
yOffset: AnimatedFloat? = null,
- child: @Composable() () -> Unit
+ child: @Composable () -> Unit
) {
Layout(children = {
Box(Modifier.clipToBounds(), children = child)
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Emphasis.kt b/ui/ui-material/src/main/java/androidx/ui/material/Emphasis.kt
index d603340..b871977 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Emphasis.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Emphasis.kt
@@ -97,7 +97,7 @@
* @sample androidx.ui.material.samples.EmphasisSample
*/
@Composable
-fun ProvideEmphasis(emphasis: Emphasis, content: @Composable() () -> Unit) {
+fun ProvideEmphasis(emphasis: Emphasis, content: @Composable () -> Unit) {
val emphasizedColor = emphasis.emphasize(contentColor())
Providers(ContentColorAmbient provides emphasizedColor, children = content)
}
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
index 2eba8d1..baf2d6f 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
@@ -65,7 +65,7 @@
backgroundColor: Color = MaterialTheme.colors.secondary,
contentColor: Color = contentColorFor(backgroundColor),
elevation: Dp = 6.dp,
- icon: @Composable() () -> Unit
+ icon: @Composable () -> Unit
) {
// Since we're adding layouts in between the clickable layer and the content, we need to
// merge all descendants, or we'll get multiple nodes
@@ -116,10 +116,10 @@
*/
@Composable
fun ExtendedFloatingActionButton(
- text: @Composable() () -> Unit,
+ text: @Composable () -> Unit,
onClick: () -> Unit,
modifier: Modifier = Modifier,
- icon: @Composable() (() -> Unit)? = null,
+ icon: @Composable (() -> Unit)? = null,
shape: Shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50)),
backgroundColor: Color = MaterialTheme.colors.secondary,
contentColor: Color = contentColorFor(backgroundColor),
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/IconButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/IconButton.kt
index 8a06075..bb3407b 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/IconButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/IconButton.kt
@@ -49,7 +49,7 @@
fun IconButton(
onClick: () -> Unit,
modifier: Modifier = Modifier,
- icon: @Composable() () -> Unit
+ icon: @Composable () -> Unit
) {
Clickable(onClick, Modifier.ripple(bounded = false, radius = RippleRadius)) {
Box(
@@ -80,7 +80,7 @@
onCheckedChange: (Boolean) -> Unit,
enabled: Boolean = true,
modifier: Modifier = Modifier,
- icon: @Composable() () -> Unit
+ icon: @Composable () -> Unit
) {
Toggleable(
value = checked,
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt b/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt
index f639b01..6ceaddb 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt
@@ -76,22 +76,22 @@
overlineText: String? = null,
metaText: String? = null
) {
- val iconComposable: @Composable() (() -> Unit)? = icon?.let {
+ val iconComposable: @Composable (() -> Unit)? = icon?.let {
{ Image(it) }
}
- val textComposable: @Composable() () -> Unit = text.let {
+ val textComposable: @Composable () -> Unit = text.let {
{ Text(it, maxLines = 1, overflow = TextOverflow.Ellipsis) }
}
- val secondaryTextComposable: @Composable() (() -> Unit)? = secondaryText?.let {
+ val secondaryTextComposable: @Composable (() -> Unit)? = secondaryText?.let {
{
val maxLines = if (!singleLineSecondaryText && overlineText == null) 2 else 1
Text(it, maxLines = maxLines, overflow = TextOverflow.Ellipsis)
}
}
- val overlineTextComposable: @Composable() (() -> Unit)? = overlineText?.let {
+ val overlineTextComposable: @Composable (() -> Unit)? = overlineText?.let {
{ Text(it, maxLines = 1, overflow = TextOverflow.Ellipsis) }
}
- val metaTextComposable: @Composable() (() -> Unit)? = metaText?.let {
+ val metaTextComposable: @Composable (() -> Unit)? = metaText?.let {
{ Text(it, maxLines = 1, overflow = TextOverflow.Ellipsis) }
}
ListItem(
@@ -130,12 +130,12 @@
fun ListItem(
modifier: Modifier = Modifier,
onClick: (() -> Unit)? = null,
- icon: @Composable() (() -> Unit)? = null,
- secondaryText: @Composable() (() -> Unit)? = null,
+ icon: @Composable (() -> Unit)? = null,
+ secondaryText: @Composable (() -> Unit)? = null,
singleLineSecondaryText: Boolean = true,
- overlineText: @Composable() (() -> Unit)? = null,
- trailing: @Composable() (() -> Unit)? = null,
- text: @Composable() (() -> Unit)
+ overlineText: @Composable (() -> Unit)? = null,
+ trailing: @Composable (() -> Unit)? = null,
+ text: @Composable (() -> Unit)
) {
val emphasisLevels = EmphasisAmbient.current
val typography = MaterialTheme.typography
@@ -202,9 +202,9 @@
@Composable
fun ListItem(
modifier: Modifier = Modifier,
- icon: @Composable() (() -> Unit)?,
- text: @Composable() (() -> Unit),
- trailing: @Composable() (() -> Unit)?
+ icon: @Composable (() -> Unit)?,
+ text: @Composable (() -> Unit),
+ trailing: @Composable (() -> Unit)?
) {
val minHeight = if (icon == null) MinHeight else MinHeightWithIcon
Row(modifier.preferredHeightIn(minHeight = minHeight)) {
@@ -260,11 +260,11 @@
@Composable
fun ListItem(
modifier: Modifier = Modifier,
- icon: @Composable() (() -> Unit)?,
- text: @Composable() (() -> Unit),
- secondaryText: @Composable() (() -> Unit)?,
- overlineText: @Composable() (() -> Unit)?,
- trailing: @Composable() (() -> Unit)?
+ icon: @Composable (() -> Unit)?,
+ text: @Composable (() -> Unit),
+ secondaryText: @Composable (() -> Unit)?,
+ overlineText: @Composable (() -> Unit)?,
+ trailing: @Composable (() -> Unit)?
) {
val minHeight = if (icon == null) MinHeight else MinHeightWithIcon
Row(modifier.preferredHeightIn(minHeight = minHeight)) {
@@ -354,11 +354,11 @@
@Composable
fun ListItem(
modifier: Modifier = Modifier,
- icon: @Composable() (() -> Unit)?,
- text: @Composable() (() -> Unit),
- secondaryText: @Composable() (() -> Unit),
- overlineText: @Composable() (() -> Unit)?,
- trailing: @Composable() (() -> Unit)?
+ icon: @Composable (() -> Unit)?,
+ text: @Composable (() -> Unit),
+ secondaryText: @Composable (() -> Unit),
+ overlineText: @Composable (() -> Unit)?,
+ trailing: @Composable (() -> Unit)?
) {
Row(modifier.preferredHeightIn(minHeight = MinHeight)) {
if (icon != null) {
@@ -406,7 +406,7 @@
private fun BaselinesOffsetColumn(
offsets: List<Dp>,
modifier: Modifier = Modifier,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
Layout(content, modifier) { measurables, constraints, _ ->
val childConstraints = constraints.copy(minHeight = 0.ipx, maxHeight = IntPx.Infinity)
@@ -448,7 +448,7 @@
private fun OffsetToBaselineOrCenter(
offset: Dp,
modifier: Modifier = Modifier,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
Layout(content, modifier) { measurables, constraints, _ ->
val placeable = measurables[0].measure(constraints.copy(minHeight = 0.ipx))
@@ -472,8 +472,8 @@
private fun applyTextStyle(
textStyle: TextStyle,
emphasis: Emphasis,
- icon: @Composable() (() -> Unit)?
-): @Composable() (() -> Unit)? {
+ icon: @Composable (() -> Unit)?
+): @Composable (() -> Unit)? {
if (icon == null) return null
return {
ProvideEmphasis(emphasis) {
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/MaterialTheme.kt b/ui/ui-material/src/main/java/androidx/ui/material/MaterialTheme.kt
index cd7281d..9228495 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/MaterialTheme.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/MaterialTheme.kt
@@ -50,7 +50,7 @@
colors: ColorPalette = MaterialTheme.colors,
typography: Typography = MaterialTheme.typography,
shapes: Shapes = MaterialTheme.shapes,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
ProvideColorPalette(colors) {
Providers(
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
index eaa5025..9720cfc 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
@@ -129,7 +129,7 @@
fun RadioGroupItem(
selected: Boolean,
onSelect: () -> Unit,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
Semantics(container = true, mergeAllDescendants = true) {
Box {
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt b/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt
index 8407886..1c24800 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt
@@ -123,12 +123,12 @@
@Composable
fun Scaffold(
scaffoldState: ScaffoldState = remember { ScaffoldState() },
- topAppBar: @Composable() (() -> Unit)? = null,
- bottomAppBar: @Composable() ((FabConfiguration?) -> Unit)? = null,
- floatingActionButton: @Composable() (() -> Unit)? = null,
+ topAppBar: @Composable (() -> Unit)? = null,
+ bottomAppBar: @Composable ((FabConfiguration?) -> Unit)? = null,
+ floatingActionButton: @Composable (() -> Unit)? = null,
floatingActionButtonPosition: FabPosition = FabPosition.End,
- drawerContent: @Composable() (() -> Unit)? = null,
- bodyContent: @Composable() (Modifier) -> Unit
+ drawerContent: @Composable (() -> Unit)? = null,
+ bodyContent: @Composable (Modifier) -> Unit
) {
val child = @Composable {
Surface(color = MaterialTheme.colors.background) {
@@ -174,8 +174,8 @@
modifier: Modifier,
scaffoldState: ScaffoldState,
fabPos: FabPosition,
- fab: @Composable() (() -> Unit)? = null,
- bottomBar: @Composable() ((FabConfiguration?) -> Unit)? = null
+ fab: @Composable (() -> Unit)? = null,
+ bottomBar: @Composable ((FabConfiguration?) -> Unit)? = null
) {
if (fabPos != FabPosition.CenterDocked && fabPos != FabPosition.EndDocked) {
Column(modifier.fillMaxWidth()) {
@@ -218,8 +218,8 @@
private fun DockedBottomBar(
modifier: Modifier,
fabPosition: FabPosition,
- fab: @Composable() () -> Unit,
- bottomBar: @Composable() () -> Unit
+ fab: @Composable () -> Unit,
+ bottomBar: @Composable () -> Unit
) {
Layout(
modifier = modifier,
@@ -251,7 +251,7 @@
private fun ScaffoldContent(
modifier: Modifier,
scaffoldState: ScaffoldState,
- content: @Composable() (Modifier) -> Unit
+ content: @Composable (Modifier) -> Unit
) {
ScaffoldSlot(modifier) {
val bottomSpace = with(DensityAmbient.current) {
@@ -264,7 +264,7 @@
@Composable
private fun BottomBarContainer(
scaffoldState: ScaffoldState,
- bottomBar: @Composable() ((FabConfiguration?) -> Unit)
+ bottomBar: @Composable ((FabConfiguration?) -> Unit)
) {
onDispose(callback = { scaffoldState.bottomBarSize = null })
ScaffoldSlot(
@@ -282,7 +282,7 @@
fabPos: FabPosition,
modifier: Modifier,
scaffoldState: ScaffoldState,
- fab: @Composable() () -> Unit
+ fab: @Composable () -> Unit
) {
onDispose { scaffoldState.fabConfiguration = null }
ScaffoldSlot(
@@ -312,7 +312,7 @@
* Default slot implementation for Scaffold slots content
*/
@Composable
-private fun ScaffoldSlot(modifier: Modifier = Modifier, content: @Composable() () -> Unit) {
+private fun ScaffoldSlot(modifier: Modifier = Modifier, content: @Composable () -> Unit) {
Stack(modifier) { content() }
}
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt b/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
index 80ecb6b..0857d41 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
@@ -64,8 +64,8 @@
*/
@Composable
fun Snackbar(
- text: @Composable() () -> Unit,
- action: @Composable() (() -> Unit)? = null,
+ text: @Composable () -> Unit,
+ action: @Composable (() -> Unit)? = null,
modifier: Modifier = Modifier,
actionOnNewLine: Boolean = false,
shape: Shape = MaterialTheme.shapes.small,
@@ -96,7 +96,7 @@
}
@Composable
-private fun TextOnlySnackbar(text: @Composable() () -> Unit) {
+private fun TextOnlySnackbar(text: @Composable () -> Unit) {
Layout(
text,
modifier = Modifier.padding(start = HorizontalSpacing, end = HorizontalSpacing)
@@ -118,8 +118,8 @@
@Composable
private fun NewLineButtonSnackbar(
- text: @Composable() () -> Unit,
- action: @Composable() () -> Unit
+ text: @Composable () -> Unit,
+ action: @Composable () -> Unit
) {
Column(
modifier = Modifier.fillMaxWidth()
@@ -142,8 +142,8 @@
@Composable
private fun OneRowSnackbar(
- text: @Composable() () -> Unit,
- action: @Composable() () -> Unit
+ text: @Composable () -> Unit,
+ action: @Composable () -> Unit
) {
val textTag = "text"
val actionTag = "action"
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt b/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
index a0ed4da..6799e69 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
@@ -86,7 +86,7 @@
contentColor: Color = contentColorFor(color),
border: Border? = null,
elevation: Dp = 0.dp,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
SurfaceLayout(
modifier.drawShadow(elevation = elevation, shape = shape, clip = false)
@@ -119,7 +119,7 @@
*/
// TODO("Andrey: Should be replaced with some basic layout implementation when we have it")
@Composable
-private fun SurfaceLayout(modifier: Modifier = Modifier, children: @Composable() () -> Unit) {
+private fun SurfaceLayout(modifier: Modifier = Modifier, children: @Composable () -> Unit) {
Layout(children, modifier) { measurables, constraints, _ ->
if (measurables.size > 1) {
throw IllegalStateException("Surface can have only one direct measurable child!")
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt b/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
index 8260c92..1b94655 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
@@ -142,15 +142,15 @@
backgroundColor: Color = MaterialTheme.colors.primarySurface,
contentColor: Color = contentColorFor(backgroundColor),
scrollable: Boolean = false,
- indicatorContainer: @Composable() (tabPositions: List<TabPosition>) -> Unit = { tabPositions ->
+ indicatorContainer: @Composable (tabPositions: List<TabPosition>) -> Unit = { tabPositions ->
TabRow.IndicatorContainer(tabPositions, selectedIndex) {
TabRow.Indicator()
}
},
- divider: @Composable() () -> Unit = {
+ divider: @Composable () -> Unit = {
Divider(thickness = 1.dp, color = contentColor().copy(alpha = DividerOpacity))
},
- tab: @Composable() (Int, T) -> Unit
+ tab: @Composable (Int, T) -> Unit
) {
Surface(modifier = modifier, color = backgroundColor, contentColor = contentColor) {
WithConstraints {
@@ -183,9 +183,9 @@
private fun FixedTabRow(
width: IntPx,
tabCount: Int,
- tabs: @Composable() (Modifier) -> Unit,
- indicatorContainer: @Composable() (tabPositions: List<TabPosition>) -> Unit,
- divider: @Composable() () -> Unit
+ tabs: @Composable (Modifier) -> Unit,
+ indicatorContainer: @Composable (tabPositions: List<TabPosition>) -> Unit,
+ divider: @Composable () -> Unit
) {
val tabWidth = width / tabCount
@@ -211,9 +211,9 @@
private fun ScrollableTabRow(
width: IntPx,
selectedIndex: Int,
- tabs: @Composable() () -> Unit,
- indicatorContainer: @Composable() (tabPositions: List<TabPosition>) -> Unit,
- divider: @Composable() () -> Unit
+ tabs: @Composable () -> Unit,
+ indicatorContainer: @Composable (tabPositions: List<TabPosition>) -> Unit,
+ divider: @Composable () -> Unit
) {
val edgeOffset = with(DensityAmbient.current) { ScrollableTabRowEdgeOffset.toIntPx() }
@@ -383,7 +383,7 @@
fun IndicatorContainer(
tabPositions: List<TabPosition>,
selectedIndex: Int,
- indicator: @Composable() () -> Unit
+ indicator: @Composable () -> Unit
) {
// TODO: should we animate the width of the indicator as it moves between tabs of different
// sizes inside a scrollable tab row?
@@ -421,7 +421,7 @@
internal fun IndicatorTransition(
tabPositions: List<TabPosition>,
selectedIndex: Int,
- indicator: @Composable() (indicatorOffset: Px) -> Unit
+ indicator: @Composable (indicatorOffset: Px) -> Unit
) {
val transitionDefinition = remember(tabPositions) {
transitionDefinition {
@@ -476,8 +476,8 @@
*/
@Composable
fun Tab(
- text: @Composable() () -> Unit = emptyContent(),
- icon: @Composable() () -> Unit = emptyContent(),
+ text: @Composable () -> Unit = emptyContent(),
+ icon: @Composable () -> Unit = emptyContent(),
selected: Boolean,
onSelected: () -> Unit,
modifier: Modifier = Modifier,
@@ -514,7 +514,7 @@
selected: Boolean,
onSelected: () -> Unit,
modifier: Modifier = Modifier,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
MutuallyExclusiveSetItem(
selected = selected,
@@ -537,7 +537,7 @@
activeColor: Color,
inactiveColor: Color,
selected: Boolean,
- content: @Composable() () -> Unit
+ content: @Composable () -> Unit
) {
val transitionDefinition = remember(activeColor, inactiveColor) {
transitionDefinition {
@@ -577,8 +577,8 @@
*/
@Composable
private fun TabBaselineLayout(
- text: @Composable() () -> Unit,
- icon: @Composable() () -> Unit
+ text: @Composable () -> Unit,
+ icon: @Composable () -> Unit
) {
Layout(
{
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt b/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt
index d1f1cf1..5d9d446 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt
@@ -151,12 +151,12 @@
fun FilledTextField(
value: String,
onValueChange: (String) -> Unit,
- label: @Composable() () -> Unit,
+ label: @Composable () -> Unit,
modifier: Modifier = Modifier,
textStyle: TextStyle = currentTextStyle(),
- placeholder: @Composable() (() -> Unit)? = null,
- leadingIcon: @Composable() (() -> Unit)? = null,
- trailingIcon: @Composable() (() -> Unit)? = null,
+ placeholder: @Composable (() -> Unit)? = null,
+ leadingIcon: @Composable (() -> Unit)? = null,
+ trailingIcon: @Composable (() -> Unit)? = null,
isErrorValue: Boolean = false,
visualTransformation: VisualTransformation = VisualTransformation.None,
keyboardType: KeyboardType = KeyboardType.Text,
@@ -263,12 +263,12 @@
fun FilledTextField(
value: TextFieldValue,
onValueChange: (TextFieldValue) -> Unit,
- label: @Composable() () -> Unit,
+ label: @Composable () -> Unit,
modifier: Modifier = Modifier,
textStyle: TextStyle = currentTextStyle(),
- placeholder: @Composable() (() -> Unit)? = null,
- leadingIcon: @Composable() (() -> Unit)? = null,
- trailingIcon: @Composable() (() -> Unit)? = null,
+ placeholder: @Composable (() -> Unit)? = null,
+ leadingIcon: @Composable (() -> Unit)? = null,
+ trailingIcon: @Composable (() -> Unit)? = null,
isErrorValue: Boolean = false,
visualTransformation: VisualTransformation = VisualTransformation.None,
keyboardType: KeyboardType = KeyboardType.Text,
@@ -314,10 +314,10 @@
onValueChange: (TextFieldValue) -> Unit,
modifier: Modifier,
textStyle: TextStyle,
- label: @Composable() () -> Unit,
- placeholder: @Composable() (() -> Unit)?,
- leading: @Composable() (() -> Unit)?,
- trailing: @Composable() (() -> Unit)?,
+ label: @Composable () -> Unit,
+ placeholder: @Composable (() -> Unit)?,
+ leading: @Composable (() -> Unit)?,
+ trailing: @Composable (() -> Unit)?,
isErrorValue: Boolean,
visualTransformation: VisualTransformation,
keyboardType: KeyboardType,
@@ -341,7 +341,7 @@
}
}
- val decoratedPlaceholder: @Composable() (() -> Unit)? =
+ val decoratedPlaceholder: @Composable (() -> Unit)? =
if (placeholder != null && inputState.value == InputPhase.Focused && value.text.isEmpty()) {
{
Decoration(
@@ -463,7 +463,7 @@
contentColor: Color,
typography: TextStyle? = null,
emphasis: Emphasis? = null,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val colorAndEmphasis = @Composable {
Providers(ContentColorAmbient provides contentColor) {
@@ -480,9 +480,9 @@
private fun TextFieldLayout(
animationProgress: Float,
modifier: Modifier,
- placeholder: @Composable() (() -> Unit)?,
- label: @Composable() () -> Unit,
- textField: @Composable() (Modifier) -> Unit
+ placeholder: @Composable (() -> Unit)?,
+ label: @Composable () -> Unit,
+ textField: @Composable (Modifier) -> Unit
) {
Layout(
children = {
@@ -557,9 +557,9 @@
@Composable
private fun IconsTextFieldLayout(
modifier: Modifier = Modifier,
- textField: @Composable() () -> Unit,
- leading: @Composable() (() -> Unit)?,
- trailing: @Composable() (() -> Unit)?,
+ textField: @Composable () -> Unit,
+ leading: @Composable (() -> Unit)?,
+ trailing: @Composable (() -> Unit)?,
leadingColor: Color,
trailingColor: Color
) {
@@ -718,7 +718,7 @@
activeColor: Color,
labelInactiveColor: Color,
indicatorInactiveColor: Color,
- children: @Composable() (
+ children: @Composable (
labelProgress: Float,
labelColor: Color,
indicatorWidth: Dp,
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/internal/StateDraggable.kt b/ui/ui-material/src/main/java/androidx/ui/material/internal/StateDraggable.kt
index 53e3034..3b2f6c0 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/internal/StateDraggable.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/internal/StateDraggable.kt
@@ -69,7 +69,7 @@
enabled: Boolean = true,
minValue: Float = Float.MIN_VALUE,
maxValue: Float = Float.MAX_VALUE,
- content: @Composable() (AnimatedFloat) -> Unit
+ content: @Composable (AnimatedFloat) -> Unit
) {
val forceAnimationCheck = state { true }
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/ripple/RippleTheme.kt b/ui/ui-material/src/main/java/androidx/ui/material/ripple/RippleTheme.kt
index 44ce985..5bb17ef 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/ripple/RippleTheme.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/ripple/RippleTheme.kt
@@ -36,12 +36,12 @@
* The effect that will be used to calculate the [ripple] color when it is not explicitly
* set in a [ripple].
*/
- val defaultColor: @Composable() () -> Color,
+ val defaultColor: @Composable () -> Color,
/**
* The effect that will be used to calculate the opacity applied to the [ripple] color.
* For example, it can be different in dark and light modes.
*/
- val opacity: @Composable() () -> Float
+ val opacity: @Composable () -> Float
)
/**
diff --git a/ui/ui-saved-instance-state/src/androidTest/java/androidx/ui/savedinstancestate/RememberSavedInstanceStateTest.kt b/ui/ui-saved-instance-state/src/androidTest/java/androidx/ui/savedinstancestate/RememberSavedInstanceStateTest.kt
index 37fe664..86b2f73 100644
--- a/ui/ui-saved-instance-state/src/androidTest/java/androidx/ui/savedinstancestate/RememberSavedInstanceStateTest.kt
+++ b/ui/ui-saved-instance-state/src/androidTest/java/androidx/ui/savedinstancestate/RememberSavedInstanceStateTest.kt
@@ -345,8 +345,8 @@
@Composable
private fun WrapRegistry(
- wrap: @Composable() (UiSavedStateRegistry) -> UiSavedStateRegistry,
- children: @Composable() () -> Unit
+ wrap: @Composable (UiSavedStateRegistry) -> UiSavedStateRegistry,
+ children: @Composable () -> Unit
) {
Providers(
UiSavedStateRegistryAmbient provides wrap(UiSavedStateRegistryAmbient.current!!),
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
index c2867c3..a7ac8cf 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
@@ -329,7 +329,7 @@
@Composable
fun TestButton(
onClick: (() -> Unit)? = null,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
// Since we're adding layouts in between the clickable layer and the content, we need to
// merge all descendants, or we'll get multiple nodes
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt
index ab9d3c3..9798582 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt
@@ -88,7 +88,7 @@
setContentView(root)
}
- fun setContent(composable: @Composable() () -> Unit) {
+ fun setContent(composable: @Composable () -> Unit) {
composeHolder.setContent(Recomposer.current(), composable)
}
}
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt
index 7214ec4..978612d 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt
@@ -24,7 +24,7 @@
@Composable
fun BoundaryNode(
testTag: String,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
Semantics(container = true, properties = { this.testTag = testTag }) {
Column { children() }
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/ComposeTestRule.kt b/ui/ui-test/src/main/java/androidx/ui/test/ComposeTestRule.kt
index 841be3c..b8c4f25 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/ComposeTestRule.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/ComposeTestRule.kt
@@ -54,13 +54,13 @@
*
* @throws IllegalStateException if called more than once per test.
*/
- fun setContent(composable: @Composable() () -> Unit)
+ fun setContent(composable: @Composable () -> Unit)
/**
* Takes the given content and prepares it for execution-controlled test via
* [ComposeTestCaseSetup].
*/
- fun forGivenContent(composable: @Composable() () -> Unit): ComposeTestCaseSetup
+ fun forGivenContent(composable: @Composable () -> Unit): ComposeTestCaseSetup
/**
* Takes the given test case and prepares it for execution-controlled test via
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/SizesTesting.kt b/ui/ui-test/src/main/java/androidx/ui/test/SizesTesting.kt
index 8ddb5ac..bd1134a 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/SizesTesting.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/SizesTesting.kt
@@ -47,8 +47,8 @@
fun ComposeTestRule.setContentAndGetPixelSize(
parentConstraints: DpConstraints = BigTestConstraints,
// TODO : figure out better way to make it flexible
- performSetContent: (@Composable() () -> Unit) -> Unit = { setContent(it) },
- children: @Composable() () -> Unit
+ performSetContent: (@Composable () -> Unit) -> Unit = { setContent(it) },
+ children: @Composable () -> Unit
): PxSize {
var realSize: PxSize? = null
performSetContent {
@@ -73,7 +73,7 @@
*/
fun ComposeTestRule.setContentAndCollectSizes(
parentConstraints: DpConstraints = BigTestConstraints,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
): CollectedSizes {
val size = setContentAndGetPixelSize(parentConstraints, { setContent(it) }, children)
return CollectedSizes(size, density)
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/StateRestorationTester.kt b/ui/ui-test/src/main/java/androidx/ui/test/StateRestorationTester.kt
index a58cc8c..7c92bab 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/StateRestorationTester.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/StateRestorationTester.kt
@@ -48,7 +48,7 @@
*
* @see ComposeTestRule.setContent
*/
- fun setContent(composable: @Composable() () -> Unit) {
+ fun setContent(composable: @Composable () -> Unit) {
composeTestRule.setContent {
InjectRestorationRegistry { registry ->
this.registry = registry
@@ -79,7 +79,7 @@
}
@Composable
- private fun InjectRestorationRegistry(children: @Composable() (RestorationRegistry) -> Unit) {
+ private fun InjectRestorationRegistry(children: @Composable (RestorationRegistry) -> Unit) {
val original = requireNotNull(UiSavedStateRegistryAmbient.current) {
"StateRestorationTester requires composeTestRule.setContent() to provide " +
"an UiSavedStateRegistry implementation via UiSavedStateRegistryAmbient"
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
index 7ace1e4..348d28e 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
@@ -97,7 +97,7 @@
* @throws IllegalStateException if called more than once per test.
*/
@SuppressWarnings("SyntheticAccessor")
- override fun setContent(composable: @Composable() () -> Unit) {
+ override fun setContent(composable: @Composable () -> Unit) {
check(disposeContentHook == null) {
"Cannot call setContent twice per test!"
}
@@ -125,7 +125,7 @@
}
}
- override fun forGivenContent(composable: @Composable() () -> Unit): ComposeTestCaseSetup {
+ override fun forGivenContent(composable: @Composable () -> Unit): ComposeTestCaseSetup {
return forGivenTestCase(object : ComposeTestCase {
@Composable
override fun emitContent() {
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeVariousInputField.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeVariousInputField.kt
index a03ac2f..1f050cd 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeVariousInputField.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/ComposeVariousInputField.kt
@@ -279,7 +279,7 @@
}
@Composable
-private fun HintEditText(hintText: @Composable() () -> Unit) {
+private fun HintEditText(hintText: @Composable () -> Unit) {
val state = savedInstanceState(saver = TextFieldValue.Saver) { TextFieldValue() }
val inputField = @Composable {
@@ -310,7 +310,7 @@
}
@Composable
-private fun CustomCursorTextField(cursor: @Composable() () -> Unit) {
+private fun CustomCursorTextField(cursor: @Composable () -> Unit) {
val state = savedInstanceState(saver = TextFieldValue.Saver) { TextFieldValue() }
val layoutResult = state<TextLayoutResult?> { null }
Layout({
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/TailFollowingTextField.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/TailFollowingTextField.kt
index fb56411..f9c83f7 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/TailFollowingTextField.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/ui/text/demos/TailFollowingTextField.kt
@@ -76,7 +76,7 @@
textStyle: TextStyle = TextStyle(fontSize = fontSize8)
) {
Layout(
- children = @Composable() {
+ children = @Composable {
TextField(
value = value,
>
@@ -112,7 +112,7 @@
textStyle: TextStyle = TextStyle(fontSize = fontSize8)
) {
Layout(
- children = @Composable() {
+ children = @Composable {
TextField(
value = value,
>
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/TextLayoutTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/TextLayoutTest.kt
index dc8dae0e..ef48a3e 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/TextLayoutTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/TextLayoutTest.kt
@@ -198,7 +198,7 @@
verify(callback, times(1)).invoke(any())
}
- private fun show(composable: @Composable() () -> Unit) {
+ private fun show(composable: @Composable () -> Unit) {
val runnable: Runnable = object : Runnable {
override fun run() {
activity.setContent {
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/CoreTextField.kt b/ui/ui-text/src/main/java/androidx/ui/text/CoreTextField.kt
index a9b9fa9..7792233 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/CoreTextField.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/CoreTextField.kt
@@ -72,7 +72,7 @@
// incrementing generation counter when we callback to the developer and reset the state with
// the latest state.
val generation = state { 0 }
- val Wrapper: @Composable() (Int, @Composable() () -> Unit) -> Unit = { _, child -> child() }
+ val Wrapper: @Composable (Int, @Composable () -> Unit) -> Unit = { _, child -> child() }
val onValueChangeWrapper: (EditorValue) -> Unit = { onValueChange(it); generation.value++ }
Wrapper(generation.value) {
@@ -270,7 +270,7 @@
onFocus: () -> Unit,
onBlur: (hasNextClient: Boolean) -> Unit,
focusModifier: FocusModifier,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
val prevState = state { FocusState.NotFocused }
if (focusModifier.focusState == FocusState.Focused &&
diff --git a/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ToolingTest.kt b/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ToolingTest.kt
index 3435683..4c9fdc3 100644
--- a/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ToolingTest.kt
+++ b/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ToolingTest.kt
@@ -46,7 +46,7 @@
activityTestRule.onUiThread { handler = Handler() }
}
- internal fun show(composable: @Composable() () -> Unit) {
+ internal fun show(composable: @Composable () -> Unit) {
positionedLatch = CountDownLatch(1)
activityTestRule.onUiThread {
activity.setContent {
diff --git a/ui/ui-tooling/src/main/java/androidx/ui/tooling/Inspectable.kt b/ui/ui-tooling/src/main/java/androidx/ui/tooling/Inspectable.kt
index 7e2e5d1..32ed1ee 100644
--- a/ui/ui-tooling/src/main/java/androidx/ui/tooling/Inspectable.kt
+++ b/ui/ui-tooling/src/main/java/androidx/ui/tooling/Inspectable.kt
@@ -50,7 +50,7 @@
@Composable
internal fun Inspectable(
slotTableRecord: SlotTableRecord,
- children: @Composable() () -> Unit
+ children: @Composable () -> Unit
) {
currentComposer.collectKeySourceInformation()
(slotTableRecord as SlotTableRecordImpl).store.add(currentComposer.slotTable)
@@ -62,7 +62,7 @@
* in the composition when the composition is in inspection mode.
*/
@Composable
-fun InInspectionModeOnly(children: @Composable() () -> Unit) {
+fun InInspectionModeOnly(children: @Composable () -> Unit) {
if (InspectionMode.current) {
children()
}
diff --git a/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/ComposeViewAdapter.kt b/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/ComposeViewAdapter.kt
index 3219224..35cfc0c 100644
--- a/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/ComposeViewAdapter.kt
+++ b/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/ComposeViewAdapter.kt
@@ -226,7 +226,7 @@
* Wraps a given [Preview] method an does any necessary setup.
*/
@Composable
- private fun WrapPreview(children: @Composable() () -> Unit) {
+ private fun WrapPreview(children: @Composable () -> Unit) {
// We need to replace the FontResourceLoader to avoid using ResourcesCompat.
// ResourcesCompat can not load fonts within Layoutlib and, since Layoutlib always runs
// the latest version, we do not need it.
diff --git a/ui/ui-vector/src/main/java/androidx/ui/graphics/vector/VectorComposeNonIR.kt b/ui/ui-vector/src/main/java/androidx/ui/graphics/vector/VectorComposeNonIR.kt
index 83075c8..d22fed2 100644
--- a/ui/ui-vector/src/main/java/androidx/ui/graphics/vector/VectorComposeNonIR.kt
+++ b/ui/ui-vector/src/main/java/androidx/ui/graphics/vector/VectorComposeNonIR.kt
@@ -35,7 +35,7 @@
container: VectorComponent,
recomposer: Recomposer,
parent: CompositionReference? = null,
- composable: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ composable: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): Composition = compositionFor(
container = container,
recomposer = recomposer,
@@ -59,7 +59,7 @@
fun composeVector(
container: VectorComponent,
parent: CompositionReference? = null,
- composable: @Composable() VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
+ composable: @Composable VectorScope.(viewportWidth: Float, viewportHeight: Float) -> Unit
): Composition = composeVector(container, Recomposer.current(), parent, composable)
class VectorComposer(