Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80eefdf4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Further simplification of collectValues." into udc-dev am: 52339c91 am: 25c2d8d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22290550



Change-Id: If66c382c83265599b54c689c85530da85106ece7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36438ff6 25c2d8d9

packages/SystemUI/tests/utils/src/com/android/systemui/coroutines/Flow.kt

+2 −12
Original line number Original line Diff line number Diff line
@@ -69,10 +69,10 @@ fun <T> TestScope.collectValues( 
    flow: Flow<T>,

    flow: Flow<T>,

    context: CoroutineContext = EmptyCoroutineContext,

    context: CoroutineContext = EmptyCoroutineContext,

    start: CoroutineStart = CoroutineStart.DEFAULT,

    start: CoroutineStart = CoroutineStart.DEFAULT,

): FlowValues<T> {

): FlowValue<List<T>> {

    val values = mutableListOf<T>()

    val values = mutableListOf<T>()

    backgroundScope.launch(context, start) { flow.collect(values::add) }

    backgroundScope.launch(context, start) { flow.collect(values::add) }

    return FlowValuesImpl {

    return FlowValueImpl {

        runCurrent()

        runCurrent()

        values.toList()

        values.toList()

    }

    }
@@ -83,17 +83,7 @@ interface FlowValue<T> : ReadOnlyProperty<Any?, T> { 
    operator fun invoke(): T

    operator fun invoke(): T

}

}





/** @see collectValues */

interface FlowValues<T> : ReadOnlyProperty<Any?, List<T>> {

    operator fun invoke(): List<T>

}



private class FlowValueImpl<T>(private val block: () -> T) : FlowValue<T> {

private class FlowValueImpl<T>(private val block: () -> T) : FlowValue<T> {

    override operator fun invoke(): T = block()

    override operator fun invoke(): T = block()

    override fun getValue(thisRef: Any?, property: KProperty<*>): T = invoke()

    override fun getValue(thisRef: Any?, property: KProperty<*>): T = invoke()

}
 
}
 


private class FlowValuesImpl<T>(private val block: () -> List<T>) : FlowValues<T> {

    override operator fun invoke(): List<T> = block()

    override fun getValue(thisRef: Any?, property: KProperty<*>): List<T> = invoke()

}