Restore commonMain to AOSP state (small fixes)

Partially fixes https://youtrack.jetbrains.com/issue/CMP-5740/Upstreaming.-compilation.-other-fixes Restore to the last merged Jetpack Compose (1.8.0-alpha07) and Material3 (1.4.0-alpha04): - restore imports - restore file names - formatting - TODO/comments removed (if we still need them, we should only keep issues) - remove unused code The provided functionality is no longer needed as it is implemented in `clickable` (discovered in https://youtrack.jetbrains.com/issue/CMP-5750/Upstreaming.-feature.-foundation.-toggle-on-Space) ## Testing - CI passes ## Release Notes N/A
JetBrains · Dec 20, 2024 · e431376 · e431376
1 parent 0c234a4
commit e431376
Show file tree

Hide file tree

Showing 55 changed files with 106 additions and 466 deletions.
diff --git a/...ion/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimationSpec.kt b/...ion/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimationSpec.kt
@@ -657,7 +657,6 @@ public class KeyframesSpec<T>(public val config: KeyframesSpecConfig<T>) :
         if (!config.keyframes.contains(config.durationMillis)) {
             timestamps.add(config.durationMillis)
         }
-
         timestamps.sort()
 
         return VectorizedKeyframesSpec(
@@ -772,7 +771,6 @@ public class KeyframesWithSplineSpec<T>(
         if (!keyframes.contains(config.durationMillis)) {
             timestamps.add(config.durationMillis)
         }
-
         timestamps.sort()
         return VectorizedMonoSplineKeyframesSpec(
             timestamps = timestamps,

diff --git a/...mation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/PathEasing.kt b/...mation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/PathEasing.kt
@@ -16,7 +16,6 @@
 
 package androidx.compose.animation.core
 
-import androidx.compose.animation.core.internal.binarySearch
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.IntervalTree
 import androidx.compose.ui.graphics.Path

diff --git a/...ion-core/src/commonMain/kotlin/androidx/compose/animation/core/VectorizedAnimationSpec.kt b/...ion-core/src/commonMain/kotlin/androidx/compose/animation/core/VectorizedAnimationSpec.kt
@@ -250,7 +250,6 @@ internal constructor(
                 if (!keyframes.containsKey(durationMillis)) {
                     times.add(durationMillis)
                 }
-
                 times.sort()
                 return@run times
             },

diff --git a/...commonMain/kotlin/androidx/compose/animation/core/internal/JvmDefaultWithCompatibility.kt b/...commonMain/kotlin/androidx/compose/animation/core/internal/JvmDefaultWithCompatibility.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2024 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.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package androidx.compose.animation.core.internal;
+package androidx.compose.animation.core.internal
 
 internal expect annotation class JvmDefaultWithCompatibility()
diff --git a/...e/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/BasicMarquee.kt b/...e/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/BasicMarquee.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2022 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.

diff --git a/...dation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropTarget.kt b/...dation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropTarget.kt
@@ -41,12 +41,12 @@ import androidx.compose.ui.platform.InspectorInfo
 fun Modifier.dragAndDropTarget(
     shouldStartDragAndDrop: (startEvent: DragAndDropEvent) -> Boolean,
     target: DragAndDropTarget,
-): Modifier {
-    return this then DropTargetElement(
-        target = target,
-        shouldStartDragAndDrop = shouldStartDragAndDrop,
-    )
-}
+): Modifier =
+    this then
+        DropTargetElement(
+            target = target,
+            shouldStartDragAndDrop = shouldStartDragAndDrop,
+        )
 
 private class DropTargetElement(
     val shouldStartDragAndDrop: (event: DragAndDropEvent) -> Boolean,

diff --git a/...oundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ContentInViewNode.kt b/...oundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/ContentInViewNode.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2022 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.

diff --git a/...n/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfo.kt b/...n/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListLayoutInfo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2020 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.

diff --git a/...monMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt b/...monMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2022 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.

diff --git a/...foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerScrollPosition.kt b/...foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerScrollPosition.kt
@@ -17,19 +17,13 @@
 package androidx.compose.foundation.pager
 
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.snapping.calculateDistanceToDesiredSnapPosition
 import androidx.compose.foundation.lazy.layout.LazyLayoutNearestRangeState
 import androidx.compose.foundation.lazy.layout.findIndexByKey
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.setValue
 import kotlin.math.roundToLong
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.util.fastMaxBy
-import kotlin.math.absoluteValue
-import kotlin.math.roundToInt
 
 /**
  * Contains the current scroll position represented by the first visible page and the first visible

diff --git a/...ation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicTextField.kt b/...ation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicTextField.kt
@@ -45,7 +45,6 @@ import androidx.compose.foundation.text.input.internal.TextFieldDecoratorModifie
 import androidx.compose.foundation.text.input.internal.TextFieldTextLayoutModifier
 import androidx.compose.foundation.text.input.internal.TextLayoutState
 import androidx.compose.foundation.text.input.internal.TransformedTextFieldState
-import androidx.compose.foundation.text.input.internal.selection.TextFieldHandleState
 import androidx.compose.foundation.text.input.internal.selection.TextFieldSelectionState
 import androidx.compose.foundation.text.input.internal.selection.TextFieldSelectionState.InputType
 import androidx.compose.foundation.text.selection.SelectionHandle

diff --git a/...tion/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldScroll.kt b/...tion/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldScroll.kt
@@ -66,53 +66,55 @@ internal fun Modifier.textFieldScrollable(
     interactionSource: MutableInteractionSource? = null,
     enabled: Boolean = true,
     overscrollEffect: OverscrollEffect? = null
-) = composed(
-    inspectorInfo =
-        debugInspectorInfo {
-            name = "textFieldScrollable"
-            properties["scrollerPosition"] = scrollerPosition
-            properties["interactionSource"] = interactionSource
-            properties["enabled"] = enabled
-        }
-) {
-    // do not reverse direction only in case of RTL in horizontal orientation
-    val rtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    val reverseDirection = scrollerPosition.orientation == Orientation.Vertical || !rtl
-    val scrollableState = rememberScrollableState { delta ->
-        val newOffset = scrollerPosition.offset + delta
-        val consumedDelta =
-            when {
-                newOffset > scrollerPosition.maximum ->
-                    scrollerPosition.maximum - scrollerPosition.offset
-                newOffset < 0f -> -scrollerPosition.offset
-                else -> delta
+) =
+    composed(
+        inspectorInfo =
+            debugInspectorInfo {
+                name = "textFieldScrollable"
+                properties["scrollerPosition"] = scrollerPosition
+                properties["interactionSource"] = interactionSource
+                properties["enabled"] = enabled
             }
-        scrollerPosition.offset += consumedDelta
-        consumedDelta
-    }
-    // TODO: b/255557085 remove when / if rememberScrollableState exposes lambda parameters for
-    //  setting these
-    val wrappedScrollableState =
-        remember(scrollableState, scrollerPosition) {
-            object : ScrollableState by scrollableState {
-                override val canScrollForward by derivedStateOf {
-                    scrollerPosition.offset < scrollerPosition.maximum
+    ) {
+        // do not reverse direction only in case of RTL in horizontal orientation
+        val rtl = LocalLayoutDirection.current == LayoutDirection.Rtl
+        val reverseDirection = scrollerPosition.orientation == Orientation.Vertical || !rtl
+        val scrollableState = rememberScrollableState { delta ->
+            val newOffset = scrollerPosition.offset + delta
+            val consumedDelta =
+                when {
+                    newOffset > scrollerPosition.maximum ->
+                        scrollerPosition.maximum - scrollerPosition.offset
+                    newOffset < 0f -> -scrollerPosition.offset
+                    else -> delta
                 }
-                override val canScrollBackward by derivedStateOf {
-                    scrollerPosition.offset > 0f
+            scrollerPosition.offset += consumedDelta
+            consumedDelta
+        }
+        // TODO: b/255557085 remove when / if rememberScrollableState exposes lambda parameters for
+        //  setting these
+        val wrappedScrollableState =
+            remember(scrollableState, scrollerPosition) {
+                object : ScrollableState by scrollableState {
+                    override val canScrollForward by derivedStateOf {
+                        scrollerPosition.offset < scrollerPosition.maximum
+                    }
+                    override val canScrollBackward by derivedStateOf {
+                        scrollerPosition.offset > 0f
+                    }
                 }
             }
-        }
-    val scroll = Modifier.scrollable(
-        orientation = scrollerPosition.orientation,
-        reverseDirection = reverseDirection,
-        overscrollEffect = overscrollEffect,
-        state = wrappedScrollableState,
-        interactionSource = interactionSource,
-        enabled = enabled && scrollerPosition.maximum != 0f
-    )
-    scroll
-}
+        val scroll =
+            Modifier.scrollable(
+                orientation = scrollerPosition.orientation,
+                reverseDirection = reverseDirection,
+                overscrollEffect = overscrollEffect,
+                state = wrappedScrollableState,
+                interactionSource = interactionSource,
+                enabled = enabled && scrollerPosition.maximum != 0f
+            )
+        scroll
+    }
 
 // Layout
 // Expect/actual is needed due to a different implementation in uikit

diff --git a/...tion/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.kt b/...tion/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.kt
@@ -18,9 +18,5 @@ package androidx.compose.foundation.text
 
 import androidx.compose.ui.input.pointer.PointerIcon
 
-// TODO Replace to PointerIcon.Text. No need for expect/actual
 internal expect val textPointerIcon: PointerIcon
-
-// TODO Add appropriate property to PointerIcon interface instead of bypassing abstraction layer.
-//  https://youtrack.jetbrains.com/issue/CMP-7145/Properly-adopt-stylus-handwriting-hover-icon
 internal expect val handwritingPointerIcon: PointerIcon
diff --git a/...ation/src/commonMain/kotlin/androidx/compose/foundation/text/input/InputTransformation.kt b/...ation/src/commonMain/kotlin/androidx/compose/foundation/text/input/InputTransformation.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.substring
 import androidx.compose.ui.text.toUpperCase
-import kotlin.jvm.JvmName
 
 /**
  * A function that is ran after every change made to a [TextFieldState] by user input and can change

diff --git a/...src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/CodepointHelpers.kt b/...src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/CodepointHelpers.kt
@@ -20,5 +20,4 @@ internal expect fun CharSequence.codePointAt(index: Int): Int
 
 internal expect fun charCount(codePoint: Int): Int
 
-// TODO: It's not used from common, consider to remove
 internal expect fun CharSequence.codePointBefore(index: Int): Int
diff --git a/...commonMain/kotlin/androidx/compose/foundation/text/input/internal/CursorAnimationState.kt b/...commonMain/kotlin/androidx/compose/foundation/text/input/internal/CursorAnimationState.kt
@@ -95,4 +95,4 @@ internal class CursorAnimationState(val animate: Boolean) {
         val job = animationJob.getAndSet(null)
         job?.cancel()
     }
-}
+}
diff --git a/.../material/material/src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt b/.../material/material/src/commonMain/kotlin/androidx/compose/material/BottomSheetScaffold.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2020 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.

diff --git a/...ose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt b/...ose/material/material/src/commonMain/kotlin/androidx/compose/material/ModalBottomSheet.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2020 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.
@@ -63,8 +63,8 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.Velocity
 import androidx.compose.ui.unit.dp
-import kotlin.math.abs
 import kotlin.jvm.JvmName
+import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 import kotlinx.coroutines.launch

diff --git a/.../material/material/src/commonMain/kotlin/androidx/compose/material/NavigationKeyEvents.kt b/.../material/material/src/commonMain/kotlin/androidx/compose/material/NavigationKeyEvents.kt
diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Strings.kt
@@ -31,8 +31,6 @@ internal value class Strings private constructor(@Suppress("unused") private val
         val SliderRangeStart = Strings(5)
         val SliderRangeEnd = Strings(6)
         val SnackbarPaneTitle = Strings(7)
-        // When adding values here, make sure to also add them in material/build.gradle,
-        // updateTranslations task (stringByResourceName parameter), and re-run the task
     }
 }
 

diff --git a/...se/material/material/src/commonMain/kotlin/androidx/compose/material/TextFieldDefaults.kt b/...se/material/material/src/commonMain/kotlin/androidx/compose/material/TextFieldDefaults.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2021 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.

diff --git a/...l/src/commonMain/kotlin/androidx/compose/material/internal/JvmDefaultWithCompatibility.kt b/...l/src/commonMain/kotlin/androidx/compose/material/internal/JvmDefaultWithCompatibility.kt
diff --git a/.../material/src/desktopMain/kotlin/androidx/compose/material/NavigationKeyEvents.desktop.kt b/.../material/src/desktopMain/kotlin/androidx/compose/material/NavigationKeyEvents.desktop.kt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,5 +20,4 @@ internal expect fun CharSequence.codePointAt(index: Int): Int

		internal expect fun charCount(codePoint: Int): Int

		// TODO: It's not used from common, consider to remove
		internal expect fun CharSequence.codePointBefore(index: Int): Int
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,4 +95,4 @@ internal class CursorAnimationState(val animate: Boolean) { @@
             val job = animationJob.getAndSet(null)
             job?.cancel()
         }
-    }
+    }