summaryrefslogtreecommitdiffhomepage
path: root/android/lib/map/src
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-10-27 08:08:46 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-10-27 11:08:37 +0100
commit75f4c6b3a2cdaad788b6979891553c502a212e09 (patch)
tree94f3fda41f71f8625d10444257b099d491ac73de /android/lib/map/src
parent6cad18660997c63da7c0db8f4dbd3753e703c594 (diff)
downloadmullvadvpn-75f4c6b3a2cdaad788b6979891553c502a212e09.tar.xz
mullvadvpn-75f4c6b3a2cdaad788b6979891553c502a212e09.zip
Update ktfmt to 0.25.0
Diffstat (limited to 'android/lib/map/src')
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt3
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt12
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt4
3 files changed, 9 insertions, 10 deletions
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt
index b66b0ea657..ba58b334bb 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt
@@ -3,5 +3,4 @@ package net.mullvad.mullvadvpn.lib.map.data
import androidx.compose.runtime.Immutable
import net.mullvad.mullvadvpn.lib.model.LatLong
-@Immutable
-data class CameraPosition(val latLong: LatLong, val zoom: Float, val verticalBias: Float)
+@Immutable data class CameraPosition(val latLong: LatLong, val zoom: Float, val verticalBias: Float)
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
index 29578f5169..a89d9a7428 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
@@ -159,27 +159,27 @@ internal class Globe(resources: Resources) {
private val vertexShaderCode =
"""
attribute vec3 aVertexPosition;
-
+
uniform vec4 uColor;
uniform mat4 uModelViewMatrix;
uniform mat4 uProjectionMatrix;
-
+
varying lowp vec4 vColor;
-
+
void main(void) {
gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
vColor = uColor;
}
- """
+ """
.trimIndent()
private val fragmentShaderCode =
"""
varying lowp vec4 vColor;
-
+
void main(void) {
gl_FragColor = vColor;
}
- """
+ """
.trimIndent()
}
}
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt
index 1955daef70..07caa6ec36 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt
@@ -209,7 +209,7 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
vColor = aVertexColor;
}
- """
+ """
.trimIndent()
private val fragmentShaderCode =
"""
@@ -218,7 +218,7 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
void main(void) {
gl_FragColor = vColor;
}
- """
+ """
.trimIndent()
}
}