summaryrefslogtreecommitdiffhomepage
path: root/android/lib/map/src
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2024-08-28 20:33:46 +0200
committerAlbin <albin@mullvad.net>2024-08-28 20:44:14 +0200
commitb52c423d777213d5bb92430bccec880c6367a70b (patch)
tree6ce254a809c1555fbde9a1c5692725042803854c /android/lib/map/src
parenta71f1e7a6888bc6af5a9df355afd26d3f56d0e5c (diff)
downloadmullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.tar.xz
mullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.zip
Reformat kotlin code using updated ktfmt plugin
This commit mostly adds trailing commas throughout the project, but also includes a few other formatting changes.
Diffstat (limited to 'android/lib/map/src')
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/CameraAnimation.kt6
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt6
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/LocationMarkerColors.kt2
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/MapViewState.kt2
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/Marker.kt2
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt6
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/MapGLRenderer.kt4
-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.kt6
9 files changed, 23 insertions, 23 deletions
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/CameraAnimation.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/CameraAnimation.kt
index 4047783825..2e0b2fcf05 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/CameraAnimation.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/CameraAnimation.kt
@@ -81,7 +81,7 @@ fun animatedCameraPosition(
EaseInOut
1f at duration using EaseInOut
}
- }
+ },
)
}
}
@@ -91,9 +91,9 @@ fun animatedCameraPosition(
latLong =
LatLong(
Latitude(latitudeAnimation.value),
- Longitude.fromFloat(longitudeAnimation.value)
+ Longitude.fromFloat(longitudeAnimation.value),
),
- verticalBias = cameraVerticalBias
+ verticalBias = cameraVerticalBias,
)
}
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt
index b1ea1144f9..a1e411bece 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt
@@ -33,7 +33,7 @@ fun AnimatedMap(
cameraBaseZoom: Float,
cameraVerticalBias: Float,
markers: List<Marker>,
- globeColors: GlobeColors
+ globeColors: GlobeColors,
) {
Map(
modifier = modifier,
@@ -41,10 +41,10 @@ fun AnimatedMap(
animatedCameraPosition(
baseZoom = cameraBaseZoom,
targetCameraLocation = cameraLocation,
- cameraVerticalBias = cameraVerticalBias
+ cameraVerticalBias = cameraVerticalBias,
),
markers = markers,
- globeColors
+ globeColors,
)
}
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/LocationMarkerColors.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/LocationMarkerColors.kt
index 7d4edb09cb..4e0959912b 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/LocationMarkerColors.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/LocationMarkerColors.kt
@@ -8,7 +8,7 @@ data class LocationMarkerColors(
val centerColor: Color,
val ringBorderColor: Color = Color.White,
val shadowColor: Color = Color.Black.copy(alpha = DEFAULT_SHADOW_ALPHA),
- val perimeterColors: Color = centerColor.copy(alpha = DEFAULT_PERIMETER_ALPHA)
+ val perimeterColors: Color = centerColor.copy(alpha = DEFAULT_PERIMETER_ALPHA),
) {
companion object {
private const val DEFAULT_SHADOW_ALPHA = 0.55f
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/MapViewState.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/MapViewState.kt
index 1e1a211115..5430a4fe1c 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/MapViewState.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/MapViewState.kt
@@ -6,5 +6,5 @@ import androidx.compose.runtime.Immutable
class MapViewState(
val cameraPosition: CameraPosition,
val locationMarker: List<Marker>,
- val globeColors: GlobeColors
+ val globeColors: GlobeColors,
)
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/Marker.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/Marker.kt
index 4d26348d45..a7f25ec545 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/Marker.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/Marker.kt
@@ -7,7 +7,7 @@ import net.mullvad.mullvadvpn.lib.model.LatLong
data class Marker(
val latLong: LatLong,
val size: Float = DEFAULT_MARKER_SIZE,
- val colors: LocationMarkerColors
+ val colors: LocationMarkerColors,
) {
companion object {
private const val DEFAULT_MARKER_SIZE = 0.02f
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt
index b60dc83c7f..b54fd97e4b 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt
@@ -76,7 +76,7 @@ private fun initArrayBuffer(dataBuffer: Buffer, unitSizeInBytes: Int = 1): Int {
GLES20.GL_ARRAY_BUFFER,
dataBuffer.capacity() * unitSizeInBytes,
dataBuffer,
- GLES20.GL_STATIC_DRAW
+ GLES20.GL_STATIC_DRAW,
)
return buffer[0]
}
@@ -90,11 +90,11 @@ internal fun initIndexBuffer(dataBuffer: Buffer): IndexBufferWithLength {
GLES20.GL_ELEMENT_ARRAY_BUFFER,
dataBuffer.capacity(),
dataBuffer,
- GLES20.GL_STATIC_DRAW
+ GLES20.GL_STATIC_DRAW,
)
return IndexBufferWithLength(
indexBuffer = buffer[0],
- length = dataBuffer.capacity() / Float.SIZE_BYTES
+ length = dataBuffer.capacity() / Float.SIZE_BYTES,
)
}
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/MapGLRenderer.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/MapGLRenderer.kt
index 887e64bebd..b767d894b7 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/MapGLRenderer.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/MapGLRenderer.kt
@@ -27,7 +27,7 @@ internal class MapGLRenderer(private val resources: Resources) : GLSurfaceView.R
evicted: Boolean,
key: LocationMarkerColors,
oldValue: LocationMarker,
- newValue: LocationMarker?
+ newValue: LocationMarker?,
) {
oldValue.onRemove()
}
@@ -114,7 +114,7 @@ internal class MapGLRenderer(private val resources: Resources) : GLSurfaceView.R
FIELD_OF_VIEW,
ratio,
PERSPECTIVE_Z_NEAR,
- PERSPECTIVE_Z_FAR
+ PERSPECTIVE_Z_FAR,
)
}
}
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 7e862ef59e..8b5b834f61 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
@@ -61,7 +61,7 @@ internal class Globe(resources: Resources) {
UniformLocation(
color = GLES20.glGetUniformLocation(shaderProgram, "uColor"),
projectionMatrix = GLES20.glGetUniformLocation(shaderProgram, "uProjectionMatrix"),
- modelViewMatrix = GLES20.glGetUniformLocation(shaderProgram, "uModelViewMatrix")
+ modelViewMatrix = GLES20.glGetUniformLocation(shaderProgram, "uModelViewMatrix"),
)
}
@@ -69,7 +69,7 @@ internal class Globe(resources: Resources) {
projectionMatrix: FloatArray,
viewMatrix: FloatArray,
colors: GlobeColors,
- contourWidth: Float = 3f
+ contourWidth: Float = 3f,
) {
val globeViewMatrix = viewMatrix.copyOf()
@@ -84,7 +84,7 @@ internal class Globe(resources: Resources) {
landVertexBuffer,
landContour,
colors.contourColorArray,
- GLES20.GL_LINE_STRIP
+ GLES20.GL_LINE_STRIP,
)
// Scale the globe to avoid z-fighting
@@ -93,7 +93,7 @@ internal class Globe(resources: Resources) {
0,
LAND_OCEAN_SCALE_FACTOR,
LAND_OCEAN_SCALE_FACTOR,
- LAND_OCEAN_SCALE_FACTOR
+ LAND_OCEAN_SCALE_FACTOR,
)
// Draw land
@@ -113,7 +113,7 @@ internal class Globe(resources: Resources) {
oceanVertexBuffer,
oceanIndices,
colors.oceanColorArray,
- GLES20.GL_TRIANGLES
+ GLES20.GL_TRIANGLES,
)
}
@@ -149,7 +149,7 @@ internal class Globe(resources: Resources) {
private data class UniformLocation(
val color: Int,
val projectionMatrix: Int,
- val modelViewMatrix: Int
+ val modelViewMatrix: Int,
)
companion object {
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 c67a0a1bb7..26e69416b9 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
@@ -41,12 +41,12 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
attribLocations =
AttribLocations(
vertexPosition = GLES20.glGetAttribLocation(shaderProgram, "aVertexPosition"),
- vertexColor = GLES20.glGetAttribLocation(shaderProgram, "aVertexColor")
+ vertexColor = GLES20.glGetAttribLocation(shaderProgram, "aVertexColor"),
)
uniformLocation =
UniformLocation(
projectionMatrix = GLES20.glGetUniformLocation(shaderProgram, "uProjectionMatrix"),
- modelViewMatrix = GLES20.glGetUniformLocation(shaderProgram, "uModelViewMatrix")
+ modelViewMatrix = GLES20.glGetUniformLocation(shaderProgram, "uModelViewMatrix"),
)
}
@@ -177,7 +177,7 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
floatArrayOf(0.0f, 0.0f, 0.00003f),
colors.centerColor,
colors.centerColor,
- ) // Center colored circle
+ ), // Center colored circle
)
fun onRemove() {