Skip to content

Commit ad4489a

Browse files
committed
Remove redundant parenthesis from @composable types.
1 parent afccae6 commit ad4489a

File tree

10 files changed

+14
-22
lines changed

10 files changed

+14
-22
lines changed

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/MainRouter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ class MainRouter(
7070
}
7171

7272
class ChildContent {
73-
internal var fullScreenSlot: MutableState<(@Composable () -> Unit)> = mutableStateOf({})
73+
internal var fullScreenSlot: MutableState<@Composable () -> Unit> = mutableStateOf({})
7474
}
7575
}

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/MainScope.kt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,24 @@ import androidx.compose.runtime.MutableState
2121
import androidx.compose.ui.platform.ComposeView
2222
import com.uber.rib.compose.root.main.loggedin.LoggedInScope
2323
import com.uber.rib.compose.root.main.loggedout.LoggedOutScope
24-
import com.uber.rib.compose.util.AnalyticsClient
25-
import com.uber.rib.compose.util.ExperimentClient
26-
import com.uber.rib.compose.util.LoggerClient
2724
import com.uber.rib.core.ComposePresenter
2825
import motif.Expose
2926

3027
@motif.Scope
3128
interface MainScope {
3229
fun router(): MainRouter
3330

34-
fun loggedOutScope(slot: MutableState<(@Composable () -> Unit)>): LoggedOutScope
31+
fun loggedOutScope(slot: MutableState<@Composable () -> Unit>): LoggedOutScope
3532

36-
fun loggedInScope(slot: MutableState<(@Composable () -> Unit)>, authInfo: AuthInfo): LoggedInScope
33+
fun loggedInScope(slot: MutableState<@Composable () -> Unit>, authInfo: AuthInfo): LoggedInScope
3734

3835
@motif.Objects
3936
abstract class Objects {
4037
abstract fun router(): MainRouter
4138

4239
abstract fun interactor(): MainInteractor
4340

44-
fun presenter(
45-
childContent: MainRouter.ChildContent,
46-
analyticsClient: AnalyticsClient,
47-
experimentClient: ExperimentClient,
48-
loggerClient: LoggerClient,
49-
): ComposePresenter {
41+
fun presenter(childContent: MainRouter.ChildContent): ComposePresenter {
5042
return object : ComposePresenter() {
5143
override val composable = @Composable { MainView(childContent) }
5244
}

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/loggedin/LoggedInRouter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.uber.rib.core.ComposePresenter
2727
class LoggedInRouter(
2828
presenter: ComposePresenter,
2929
interactor: LoggedInInteractor,
30-
slot: MutableState<(@Composable () -> Unit)>,
30+
slot: MutableState<@Composable () -> Unit>,
3131
private val scope: LoggedInScope,
3232
private val childContent: ChildContent,
3333
) : BasicComposeRouter<LoggedInInteractor>(presenter, interactor, slot) {
@@ -62,6 +62,6 @@ class LoggedInRouter(
6262
}
6363

6464
class ChildContent {
65-
internal var fullScreenSlot: MutableState<(@Composable () -> Unit)> = mutableStateOf({})
65+
internal var fullScreenSlot: MutableState<@Composable () -> Unit> = mutableStateOf({})
6666
}
6767
}

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/loggedin/LoggedInScope.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import motif.Expose
3030
interface LoggedInScope {
3131
fun router(): LoggedInRouter
3232

33-
fun offGameScope(slot: MutableState<(@Composable (() -> Unit))>, authInfo: AuthInfo): OffGameScope
33+
fun offGameScope(slot: MutableState<@Composable () -> Unit>, authInfo: AuthInfo): OffGameScope
3434

3535
fun ticTacToeScope(
36-
slot: MutableState<(@Composable (() -> Unit))>,
36+
slot: MutableState<@Composable () -> Unit>,
3737
authInfo: AuthInfo,
3838
): TicTacToeScope
3939

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/loggedin/offgame/OffGameRouter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ import com.uber.rib.core.ComposePresenter
2323
class OffGameRouter(
2424
presenter: ComposePresenter,
2525
interactor: OffGameInteractor,
26-
slot: MutableState<(@Composable () -> Unit)>,
26+
slot: MutableState<@Composable () -> Unit>,
2727
) : BasicComposeRouter<OffGameInteractor>(presenter, interactor, slot)

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/loggedin/tictactoe/TicTacToeRouter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ import com.uber.rib.core.ComposePresenter
2323
class TicTacToeRouter(
2424
presenter: ComposePresenter,
2525
interactor: TicTacToeInteractor,
26-
slot: MutableState<(@Composable () -> Unit)>,
26+
slot: MutableState<@Composable () -> Unit>,
2727
) : BasicComposeRouter<TicTacToeInteractor>(presenter, interactor, slot)

demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/loggedout/LoggedOutRouter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ import com.uber.rib.core.ComposePresenter
2323
class LoggedOutRouter(
2424
presenter: ComposePresenter,
2525
interactor: LoggedOutInteractor,
26-
slot: MutableState<(@Composable () -> Unit)>,
26+
slot: MutableState<@Composable () -> Unit>,
2727
) : BasicComposeRouter<LoggedOutInteractor>(presenter, interactor, slot)

demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/main/MainRouter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ class MainRouter(
5151
}
5252

5353
class ChildContent {
54-
internal var fullScreenSlot: MutableState<(@Composable () -> Unit)> = mutableStateOf({})
54+
internal var fullScreenSlot: MutableState<@Composable () -> Unit> = mutableStateOf({})
5555
}
5656
}

demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/main/MainScope.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.uber.rib.workers.root.main.ribworkerselection.RibWorkerSelectionScope
2626
interface MainScope {
2727
fun router(): MainRouter
2828

29-
fun ribWorkerSelectionScope(slot: MutableState<(@Composable () -> Unit)>): RibWorkerSelectionScope
29+
fun ribWorkerSelectionScope(slot: MutableState<@Composable () -> Unit>): RibWorkerSelectionScope
3030

3131
@motif.Objects
3232
abstract class Objects {

demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/main/ribworkerselection/RibWorkerSelectionRouter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ import com.uber.rib.core.ComposePresenter
2525
open class RibWorkerSelectionRouter(
2626
presenter: ComposePresenter,
2727
interactor: RibWorkerSelectionInteractor,
28-
slot: MutableState<(@Composable () -> Unit)>,
28+
slot: MutableState<@Composable () -> Unit>,
2929
) : BasicComposeRouter<RibWorkerSelectionInteractor>(presenter, interactor, slot)

0 commit comments

Comments
 (0)