Merge branch 'update-dependencies-droid-2213'

2 files changed, 34 insertions, 34 deletions

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 8b5b834f61..29578f5169 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
@@ -158,28 +158,28 @@ internal class Globe(resources: Resources) {
         // Vertex, and fragment shader code is taken from Mullvad Desktop 3dmap.ts
         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;
-    }
-        """
+            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;
-    }
-        """
+            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 26e69416b9..1955daef70 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
@@ -197,28 +197,28 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
         // Vertex, and fragment shader code is taken from Mullvad Desktop 3dmap.ts
         private val vertexShaderCode =
             """
-    attribute vec3 aVertexPosition;
-    attribute vec4 aVertexColor;
+            attribute vec3 aVertexPosition;
+            attribute vec4 aVertexColor;
 
-    uniform mat4 uModelViewMatrix;
-    uniform mat4 uProjectionMatrix;
+            uniform mat4 uModelViewMatrix;
+            uniform mat4 uProjectionMatrix;
 
-    varying lowp vec4 vColor;
+            varying lowp vec4 vColor;
 
-    void main(void) {
-        gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
-        vColor = aVertexColor;
-    }
-        """
+            void main(void) {
+                gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
+                vColor = aVertexColor;
+            }
+                """
                 .trimIndent()
         private val fragmentShaderCode =
             """
-    varying lowp vec4 vColor;
+            varying lowp vec4 vColor;
 
-    void main(void) {
-        gl_FragColor = vColor;
-    }
-        """
+            void main(void) {
+                gl_FragColor = vColor;
+            }
+                """
                 .trimIndent()
     }
 }