More clean up

Author: Rawa

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt

@@ -20,7 +20,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableLongStateOf
@@ -211,8 +210,8 @@ fun ConnectScreen(
                 animationSpec = tween(SECURE_ZOOM_ANIMATION_MILLIS)
             )
 
-        val markers = uiState.tunnelRealState.toMarker(uiState.location)?.let { listOf(it) }
-            ?: emptyList()
+        val markers =
+            uiState.tunnelRealState.toMarker(uiState.location)?.let { listOf(it) } ?: emptyList()
 
         AnimatedMap(
             modifier = Modifier.padding(top = it.calculateTopPadding()),

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

@@ -62,7 +62,7 @@ internal fun Map(modifier: Modifier = Modifier, mapViewState: MapViewState) {
                     view?.onResume()
                 }
                 Lifecycle.Event.ON_PAUSE -> {
-                   view?.onPause()
+                    view?.onPause()
                 }
                 else -> {}
             }

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

@@ -6,14 +6,14 @@ internal const val MATRIX_SIZE = 16
 
 // Constant what will talk the distance in LatLng multiply it to determine the animation duration,
 // the result is then confined to the MIN_ANIMATION_MILLIS and MAX_ANIMATION_MILLIS
-const val DISTANCE_DURATION_SCALE_FACTOR = 20
-const val MIN_ANIMATION_MILLIS = 1300
-const val MAX_ANIMATION_MILLIS = 2500
+internal const val DISTANCE_DURATION_SCALE_FACTOR = 20
+internal const val MIN_ANIMATION_MILLIS = 1300
+internal const val MAX_ANIMATION_MILLIS = 2500
 // The cut off where we go from a short animation (camera pans) to a far animation (camera pans +
 // zoom out)
-const val SHORT_ANIMATION_CUTOFF_MILLIS = 1700
+internal const val SHORT_ANIMATION_CUTOFF_MILLIS = 1700
 
 // Multiplier for the zoom out animation
-const val FAR_ANIMATION_MAX_ZOOM_MULTIPLIER = 1.30f
+internal const val FAR_ANIMATION_MAX_ZOOM_MULTIPLIER = 1.30f
 // When in the far animation we reach the MAX_ZOOM_MULTIPLIER, value is between 0 and 1
-const val MAX_MULTIPLIER_PEAK_TIMING = .35f
+internal const val MAX_MULTIPLIER_PEAK_TIMING = .35f

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

@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.lib.map.internal
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.opengl.GLSurfaceView
 import net.mullvad.mullvadvpn.lib.map.data.MapViewState

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

@@ -12,29 +12,7 @@ import net.mullvad.mullvadvpn.lib.map.internal.initArrayBuffer
 import net.mullvad.mullvadvpn.lib.map.internal.initIndexBuffer
 import net.mullvad.mullvadvpn.lib.map.internal.initShaderProgram
 
-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()
+internal class Globe(resources: Resources) {
 
     private val shaderProgram: Int
 
@@ -172,5 +150,32 @@ class Globe(resources: Resources) {
 
     companion object {
         private const val LAND_OCEAN_SCALE_FACTOR = 0.999f
+
+        // 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;
+    }
+        """
+                .trimIndent()
+        private val fragmentShaderCode =
+            """
+    varying lowp vec4 vColor;
+    
+    void main(void) {
+      gl_FragColor = vColor;
+    }
+        """
+                .trimIndent()
     }
 }

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

@@ -16,33 +16,6 @@ import net.mullvad.mullvadvpn.model.LatLong
 
 internal class LocationMarker(val colors: LocationMarkerColors) {
 
-    private val vertexShaderCode =
-        """
-    attribute vec3 aVertexPosition;
-    attribute vec4 aVertexColor;
-
-    uniform mat4 uModelViewMatrix;
-    uniform mat4 uProjectionMatrix;
-
-    varying lowp vec4 vColor;
-
-    void main(void) {
-        gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
-        vColor = aVertexColor;
-    }
-        """
-            .trimIndent()
-
-    private val fragmentShaderCode =
-        """
-    varying lowp vec4 vColor;
-
-    void main(void) {
-        gl_FragColor = vColor;
-    }
-        """
-            .trimIndent()
-
     private val rings =
         listOf(
             circleFanVertices(
@@ -79,9 +52,9 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
     private val attribLocations: AttribLocations
     private val uniformLocation: UniformLocation
 
-    data class AttribLocations(val vertexPosition: Int, val vertexColor: Int)
+    private data class AttribLocations(val vertexPosition: Int, val vertexColor: Int)
 
-    data class UniformLocation(val projectionMatrix: Int, val modelViewMatrix: Int)
+    private data class UniformLocation(val projectionMatrix: Int, val modelViewMatrix: Int)
 
     private val positionBuffer: Int
     private val colorBuffer: Int
@@ -213,6 +186,34 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
 
     companion object {
         private const val MARKER_TRANSLATE_Z_FACTOR = 1.0001f
+
+        // Vertex, and fragment shader code is taken from Mullvad Desktop 3dmap.ts
+        private val vertexShaderCode =
+            """
+    attribute vec3 aVertexPosition;
+    attribute vec4 aVertexColor;
+
+    uniform mat4 uModelViewMatrix;
+    uniform mat4 uProjectionMatrix;
+
+    varying lowp vec4 vColor;
+
+    void main(void) {
+        gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
+        vColor = aVertexColor;
+    }
+        """
+                .trimIndent()
+
+        private val fragmentShaderCode =
+            """
+    varying lowp vec4 vColor;
+
+    void main(void) {
+        gl_FragColor = vColor;
+    }
+        """
+                .trimIndent()
     }
 }