forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Animate compose content size transitions (#1691)
Animate the size transition of Compose scenes and platform windows when the size of the ComposeUIViewController changes. Example: https://github.com/user-attachments/assets/0054014c-fc8e-419d-8ffb-eaf6497dfb5e Fixes https://youtrack.jetbrains.com/issue/CMP-1491/Fix-interop-views-animation-while-rotating-screen ## Testing ### Features - iOS - Animate the size transition of Compose content when the screen is rotated or other ComposeUIViewController size changes
- Loading branch information
Showing
15 changed files
with
424 additions
and
320 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/animation/Animation.skiko.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* | ||
* 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. | ||
* 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 androidx.compose.ui.animation | ||
|
||
import androidx.compose.runtime.withFrameNanos | ||
import kotlin.math.min | ||
import kotlin.time.Duration | ||
import kotlin.time.Duration.Companion.nanoseconds | ||
|
||
internal fun easeInOutTimingFunction(progress: Float): Float = if (progress < 0.5f) { | ||
2f * progress * progress | ||
} else { | ||
(-2f * progress * progress) + (4f * progress) - 1f | ||
} | ||
|
||
internal suspend fun withAnimationProgress( | ||
duration: Duration, | ||
timingFunction: (Float) -> Float = ::easeInOutTimingFunction, | ||
update: (Float) -> Unit | ||
) { | ||
update(0f) | ||
|
||
var firstFrameTime = 0L | ||
var progressDuration = Duration.ZERO | ||
while (progressDuration < duration) { | ||
withFrameNanos { frameTime -> | ||
if (firstFrameTime == 0L) { | ||
firstFrameTime = frameTime | ||
} | ||
progressDuration = (frameTime - firstFrameTime).nanoseconds | ||
val progress = timingFunction( | ||
min(1.0, progressDuration / duration).toFloat() | ||
) | ||
update(progress) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.