Skip to content

feat: Support specifying animation duration for camera changes. #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arriolac merged 4 commits into from
Mar 31, 2022
Merged

feat: Support specifying animation duration for camera changes. #83

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e47963
feat: Support specifying animation duration for camera changes.
arriolac Mar 30, 2022
09c990e
Use null to indicate default animation duration.
arriolac Mar 30, 2022
3f8c1d6
Use Int.MAX_VALUE for default animation.
arriolac Mar 31, 2022
3f85be9
Check for MAX_VALUE for default animation.
arriolac Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions maps-compose/src/main/java/com/google/maps/android/compose/CameraPositionState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.suspendCancellableCoroutine
import java.lang.Integer.MAX_VALUE
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException

Expand Down Expand Up @@ -173,9 +174,14 @@ class CameraPositionState(
* suspend until a map is bound and animation will begin.
*
* This method should only be called from a dispatcher bound to the map's UI thread.
*
* @param update the change that should be applied to the camera
* @param durationMs The duration of the animation in milliseconds. If [Int.MAX_VALUE] is
* provided, the default animation duration will be used. Otherwise, the value provided must be
* strictly positive, otherwise an [IllegalArgumentException] will be thrown.
*/
@UiThread
suspend fun animate(update: CameraUpdate) {
suspend fun animate(update: CameraUpdate, durationMs: Int = MAX_VALUE) {
val myJob = currentCoroutineContext()[Job]
try {
suspendCancellableCoroutine<Unit> { continuation ->
Expand All @@ -195,7 +201,7 @@ class CameraPositionState(
"internal error; no GoogleMap available to animate position"
)
}
performAnimateCameraLocked(newMap, update, continuation)
performAnimateCameraLocked(newMap, update, durationMs, continuation)
}

override fun onCancelLocked() {
Expand All @@ -216,7 +222,7 @@ class CameraPositionState(
}
}
} else {
performAnimateCameraLocked(map, update, continuation)
performAnimateCameraLocked(map, update, durationMs, continuation)
}
}
}
Expand All @@ -235,17 +241,23 @@ class CameraPositionState(
private fun performAnimateCameraLocked(
map: GoogleMap,
update: CameraUpdate,
durationMs: Int,
continuation: CancellableContinuation<Unit>
) {
map.animateCamera(update, object : GoogleMap.CancelableCallback {
val cancelableCallback = object : GoogleMap.CancelableCallback {
override fun onCancel() {
continuation.resumeWithException(CancellationException("Animation cancelled"))
}

override fun onFinish() {
continuation.resume(Unit)
}
})
}
if (durationMs == MAX_VALUE) {
map.animateCamera(update, cancelableCallback)
} else {
map.animateCamera(update, durationMs, cancelableCallback)
}
doOnMapChangedLocked {
check(it == null) {
"New GoogleMap unexpectedly set while an animation was still running"
Expand Down