Skip to content

Commit

Permalink
Lint indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@birkskyum
birkskyum committed Sep 8, 2022
1 parent 45a4b6d commit 06de7a5
Show file tree
Hide file tree
Showing 8 changed files with 310 additions and 305 deletions.
78 changes: 39 additions & 39 deletions ...src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ import timber.log.Timber
*/
class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
private val callback: CancelableCallback =
object : CancelableCallback {
override fun onCancel() {
Timber.i("Duration onCancel Callback called.")
Toast.makeText(
this@CameraAnimationTypeActivity.applicationContext,
"Ease onCancel Callback called.",
Toast.LENGTH_LONG
)
.show()
}

override fun onFinish() {
Timber.i("Duration onFinish Callback called.")
Toast.makeText(
this@CameraAnimationTypeActivity.applicationContext,
"Ease onFinish Callback called.",
Toast.LENGTH_LONG
)
.show()
}
object : CancelableCallback {
override fun onCancel() {
Timber.i("Duration onCancel Callback called.")
Toast.makeText(
this@CameraAnimationTypeActivity.applicationContext,
"Ease onCancel Callback called.",
Toast.LENGTH_LONG
)
.show()
}

override fun onFinish() {
Timber.i("Duration onFinish Callback called.")
Toast.makeText(
this@CameraAnimationTypeActivity.applicationContext,
"Ease onFinish Callback called.",
Toast.LENGTH_LONG
)
.show()
}
}
private lateinit var mapboxMap: MapboxMap
private lateinit var mapView: MapView
private var cameraState = false
Expand Down Expand Up @@ -73,41 +73,41 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
val moveButton = findViewById<View>(R.id.cameraMoveButton)
moveButton?.setOnClickListener { view: View? ->
val cameraPosition =
CameraPosition.Builder()
.target(nextLatLng)
.zoom(14.0)
.tilt(30.0)
.tilt(0.0)
.build()
CameraPosition.Builder()
.target(nextLatLng)
.zoom(14.0)
.tilt(30.0)
.tilt(0.0)
.build()
mapboxMap!!.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
}

// handle ease button clicks
val easeButton = findViewById<View>(R.id.cameraEaseButton)
easeButton?.setOnClickListener { view: View? ->
val cameraPosition =
CameraPosition.Builder()
.target(nextLatLng)
.zoom(15.0)
.bearing(180.0)
.tilt(30.0)
.build()
CameraPosition.Builder()
.target(nextLatLng)
.zoom(15.0)
.bearing(180.0)
.tilt(30.0)
.build()
mapboxMap!!.easeCamera(
CameraUpdateFactory.newCameraPosition(cameraPosition),
7500,
callback
CameraUpdateFactory.newCameraPosition(cameraPosition),
7500,
callback
)
}

// handle animate button clicks
val animateButton = findViewById<View>(R.id.cameraAnimateButton)
animateButton?.setOnClickListener { view: View? ->
val cameraPosition =
CameraPosition.Builder().target(nextLatLng).bearing(270.0).tilt(20.0).build()
CameraPosition.Builder().target(nextLatLng).bearing(270.0).tilt(20.0).build()
mapboxMap!!.animateCamera(
CameraUpdateFactory.newCameraPosition(cameraPosition),
7500,
callback
CameraUpdateFactory.newCameraPosition(cameraPosition),
7500,
callback
)
}
}
Expand Down
76 changes: 38 additions & 38 deletions ...tApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
findViewById<View>(R.id.fab).setOnClickListener { view: View ->
view.visibility = View.GONE
val animatedPosition =
CameraPosition.Builder()
.target(LatLng(37.789992, -122.402214))
.tilt(60.0)
.zoom(14.5)
.bearing(135.0)
.build()
CameraPosition.Builder()
.target(LatLng(37.789992, -122.402214))
.tilt(60.0)
.zoom(14.5)
.bearing(135.0)
.build()
set = createExampleAnimator(mapboxMap!!.cameraPosition, animatedPosition)
set!!.start()
}
Expand All @@ -63,8 +63,8 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
// Animator API used for the animation on the FAB
//
private fun createExampleAnimator(
currentPosition: CameraPosition,
targetPosition: CameraPosition
currentPosition: CameraPosition,
targetPosition: CameraPosition
): Animator {
val animatorSet = AnimatorSet()
animatorSet.play(createLatLngAnimator(currentPosition.target, targetPosition.target))
Expand All @@ -76,12 +76,12 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {

private fun createLatLngAnimator(currentPosition: LatLng, targetPosition: LatLng): Animator {
val latLngAnimator =
ValueAnimator.ofObject(LatLngEvaluator(), currentPosition, targetPosition)
ValueAnimator.ofObject(LatLngEvaluator(), currentPosition, targetPosition)
latLngAnimator.duration = (1000 * ANIMATION_DELAY_FACTOR).toLong()
latLngAnimator.interpolator = FastOutSlowInInterpolator()
latLngAnimator.addUpdateListener { animation: ValueAnimator ->
mapboxMap!!.moveCamera(
CameraUpdateFactory.newLatLng((animation.animatedValue as LatLng))
CameraUpdateFactory.newLatLng((animation.animatedValue as LatLng))
)
}
return latLngAnimator
Expand All @@ -94,21 +94,21 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
zoomAnimator.interpolator = AnticipateOvershootInterpolator()
zoomAnimator.addUpdateListener { animation: ValueAnimator ->
mapboxMap!!.moveCamera(
CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
)
}
return zoomAnimator
}

private fun createBearingAnimator(currentBearing: Double, targetBearing: Double): Animator {
val bearingAnimator =
ValueAnimator.ofFloat(currentBearing.toFloat(), targetBearing.toFloat())
ValueAnimator.ofFloat(currentBearing.toFloat(), targetBearing.toFloat())
bearingAnimator.duration = (1000 * ANIMATION_DELAY_FACTOR).toLong()
bearingAnimator.startDelay = (1000 * ANIMATION_DELAY_FACTOR).toLong()
bearingAnimator.interpolator = FastOutLinearInInterpolator()
bearingAnimator.addUpdateListener { animation: ValueAnimator ->
mapboxMap!!.moveCamera(
CameraUpdateFactory.bearingTo((animation.animatedValue as Float).toDouble())
CameraUpdateFactory.bearingTo((animation.animatedValue as Float).toDouble())
)
}
return bearingAnimator
Expand All @@ -120,7 +120,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
tiltAnimator.startDelay = (1500 * ANIMATION_DELAY_FACTOR).toLong()
tiltAnimator.addUpdateListener { animation: ValueAnimator ->
mapboxMap!!.moveCamera(
CameraUpdateFactory.tiltTo((animation.animatedValue as Float).toDouble())
CameraUpdateFactory.tiltTo((animation.animatedValue as Float).toDouble())
)
}
return tiltAnimator
Expand Down Expand Up @@ -152,14 +152,14 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {

private fun resetCameraPosition() {
mapboxMap!!.moveCamera(
CameraUpdateFactory.newCameraPosition(
CameraPosition.Builder()
.target(START_LAT_LNG)
.zoom(11.0)
.bearing(0.0)
.tilt(0.0)
.build()
)
CameraUpdateFactory.newCameraPosition(
CameraPosition.Builder()
.target(START_LAT_LNG)
.zoom(11.0)
.bearing(0.0)
.tilt(0.0)
.build()
)
)
}

Expand All @@ -177,7 +177,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
zoomAnimator.interpolator = interpolator
zoomAnimator.addUpdateListener { animation: ValueAnimator ->
mapboxMap!!.moveCamera(
CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
)
}
return zoomAnimator
Expand Down Expand Up @@ -232,9 +232,9 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
private val latLng = LatLng()
override fun evaluate(fraction: Float, startValue: LatLng, endValue: LatLng): LatLng {
latLng.latitude =
(startValue.latitude + (endValue.latitude - startValue.latitude) * fraction)
(startValue.latitude + (endValue.latitude - startValue.latitude) * fraction)
latLng.longitude =
(startValue.longitude + (endValue.longitude - startValue.longitude) * fraction)
(startValue.longitude + (endValue.longitude - startValue.longitude) * fraction)
return latLng
}
}
Expand All @@ -247,29 +247,29 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
init {
val accelerateDecelerateAnimatorSet = AnimatorSet()
accelerateDecelerateAnimatorSet.playTogether(
createLatLngAnimator(START_LAT_LNG, LatLng(37.826715, -122.422795)),
obtainExampleInterpolator(FastOutSlowInInterpolator(), 2500)
createLatLngAnimator(START_LAT_LNG, LatLng(37.826715, -122.422795)),
obtainExampleInterpolator(FastOutSlowInInterpolator(), 2500)
)
animators.put(
R.id.menu_action_accelerate_decelerate_interpolator.toLong(),
accelerateDecelerateAnimatorSet
R.id.menu_action_accelerate_decelerate_interpolator.toLong(),
accelerateDecelerateAnimatorSet
)
val bounceAnimatorSet = AnimatorSet()
bounceAnimatorSet.playTogether(
createLatLngAnimator(START_LAT_LNG, LatLng(37.787947, -122.407432)),
obtainExampleInterpolator(BounceInterpolator(), 3750)
createLatLngAnimator(START_LAT_LNG, LatLng(37.787947, -122.407432)),
obtainExampleInterpolator(BounceInterpolator(), 3750)
)
animators.put(R.id.menu_action_bounce_interpolator.toLong(), bounceAnimatorSet)
animators.put(
R.id.menu_action_anticipate_overshoot_interpolator.toLong(),
obtainExampleInterpolator(AnticipateOvershootInterpolator(), 2500)
R.id.menu_action_anticipate_overshoot_interpolator.toLong(),
obtainExampleInterpolator(AnticipateOvershootInterpolator(), 2500)
)
animators.put(
R.id.menu_action_path_interpolator.toLong(),
obtainExampleInterpolator(
PathInterpolatorCompat.create(.22f, .68f, 0f, 1.71f),
2500
)
R.id.menu_action_path_interpolator.toLong(),
obtainExampleInterpolator(
PathInterpolatorCompat.create(.22f, .68f, 0f, 1.71f),
2500
)
)
}
}
Loading

0 comments on commit 06de7a5

Please sign in to comment.