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

Commit cb46bf43 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Remove ListUtils duplicate 

This CL removes the duplicate definition of fastMap and fastForEach that
were copied in this repository. They are not needed anymore given that
Compose list utils are now public.

Test: atest PlatformComposeSceneTransitionLayoutTests
Change-Id: Id1b12eab1e78b43ab7d929ad88d9caf54f6f0466
parent 247efa91

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import androidx.compose.ui.layout.LookaheadScope 
import androidx.compose.ui.layout.onSizeChanged

import androidx.compose.ui.unit.Density

import androidx.compose.ui.unit.IntSize

import com.android.compose.ui.util.fastForEach

import androidx.compose.ui.util.fastForEach

import kotlinx.coroutines.channels.Channel



@VisibleForTesting

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import androidx.compose.animation.core.AnimationSpec 
import androidx.compose.animation.core.snap

import androidx.compose.ui.geometry.Offset

import androidx.compose.ui.unit.IntSize

import androidx.compose.ui.util.fastForEach

import androidx.compose.ui.util.fastMap

import com.android.compose.animation.scene.transformation.AnchoredSize

import com.android.compose.animation.scene.transformation.AnchoredTranslate

import com.android.compose.animation.scene.transformation.EdgeTranslate
@@ -32,8 +34,6 @@ import com.android.compose.animation.scene.transformation.ScaleSize 
import com.android.compose.animation.scene.transformation.SharedElementTransformation

import com.android.compose.animation.scene.transformation.Transformation

import com.android.compose.animation.scene.transformation.Translate

import com.android.compose.ui.util.fastForEach

import com.android.compose.ui.util.fastMap



/** The transitions configuration of a [SceneTransitionLayout]. */

class SceneTransitions(

packages/SystemUI/compose/scene/src/com/android/compose/ui/util/ListUtils.kt

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.compose.ui.util



import kotlin.contracts.ExperimentalContracts

import kotlin.contracts.contract



/**

 * Iterates through a [List] using the index and calls [action] for each item. This does not

 * allocate an iterator like [Iterable.forEach].

 *

 * **Do not use for collections that come from public APIs**, since they may not support random

 * access in an efficient way, and this method may actually be a lot slower. Only use for

 * collections that are created by code we control and are known to support random access.

 */

@Suppress("BanInlineOptIn")

@OptIn(ExperimentalContracts::class)

internal inline fun <T> List<T>.fastForEach(action: (T) -> Unit) {

    contract { callsInPlace(action) }

    for (index in indices) {

        val item = get(index)

        action(item)

    }

}



/**

 * Returns a list containing the results of applying the given [transform] function to each element

 * in the original collection.

 *

 * **Do not use for collections that come from public APIs**, since they may not support random

 * access in an efficient way, and this method may actually be a lot slower. Only use for

 * collections that are created by code we control and are known to support random access.

 */

@Suppress("BanInlineOptIn")

@OptIn(ExperimentalContracts::class)

internal inline fun <T, R> List<T>.fastMap(transform: (T) -> R): List<R> {

    contract { callsInPlace(transform) }

    val target = ArrayList<R>(size)

    fastForEach { target += transform(it) }

    return target

}