Skip to content

Commit ff33850

Browse files
committed
Fix lint
1 parent c859240 commit ff33850

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

android/lib/map/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ dependencies {
4242
implementation(Dependencies.Compose.foundation)
4343

4444
implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
45-
}
45+
}

android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/CameraAnimation.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fun animatedCameraPosition(
8787
Latitude(latitudeAnimation.value),
8888
Longitude.fromFloat(longitudeAnimation.value)
8989
),
90-
bias = cameraVerticalBias
90+
verticalBias = cameraVerticalBias
9191
)
9292
}
9393

android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ package net.mullvad.mullvadvpn.lib.map.data
33
import androidx.compose.runtime.Immutable
44
import net.mullvad.mullvadvpn.model.LatLong
55

6-
@Immutable data class CameraPosition(val latLong: LatLong, val zoom: Float, val bias: Float)
6+
@Immutable data class CameraPosition(val latLong: LatLong, val zoom: Float, val verticalBias: Float)

android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/MapGLRenderer.kt

+8-3
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,16 @@ internal class MapGLRenderer(private val resources: Resources) : GLSurfaceView.R
7878
private fun Float.toRadians() = this * Math.PI.toFloat() / (COMPLETE_ANGLE / 2)
7979

8080
private fun toOffsetY(cameraPosition: CameraPosition): Float {
81-
val percent = cameraPosition.bias
81+
val percent = cameraPosition.verticalBias
8282
val z = cameraPosition.zoom - 1f
8383
// Calculate the size of the plane at the current z position
84-
val planeSize = tan(FIELD_OF_VIEW.toRadians() / 2f) * z * 2f
85-
return planeSize * (0.5f - percent)
84+
val planeSizeY = tan(FIELD_OF_VIEW.toRadians() / 2f) * z * 2f
85+
86+
// Calculate the start of the plane
87+
val planeStartY = planeSizeY / 2f
88+
89+
// Return offset based on the bias
90+
return planeStartY - planeSizeY * percent
8691
}
8792

8893
private fun clear() {

0 commit comments

Comments
 (0)