diff options
| author | Albin <albin@mullvad.net> | 2024-06-26 13:24:33 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-06-26 13:24:33 +0200 |
| commit | f511be6302af0f17e1cb1dd3de727938f32c7f01 (patch) | |
| tree | 962cec1a268ed739783e020f2acec79a345456d2 /android/lib/map | |
| parent | ac70101c713139244221889a61e96ecf9a56c9c6 (diff) | |
| parent | a4fbed079435932febfb3314918b1d2c2744fc7c (diff) | |
| download | mullvadvpn-f511be6302af0f17e1cb1dd3de727938f32c7f01.tar.xz mullvadvpn-f511be6302af0f17e1cb1dd3de727938f32c7f01.zip | |
Merge branch 'replace-default-logging-tool-with-kermit-droid-704'
Diffstat (limited to 'android/lib/map')
| -rw-r--r-- | android/lib/map/build.gradle.kts | 6 | ||||
| -rw-r--r-- | android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts index 7ca04c16da..f4606de5bd 100644 --- a/android/lib/map/build.gradle.kts +++ b/android/lib/map/build.gradle.kts @@ -35,12 +35,10 @@ android { } dependencies { - - //Model implementation(project(Dependencies.Mullvad.modelLib)) + implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) implementation(Dependencies.Compose.ui) implementation(Dependencies.Compose.foundation) - - implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) + implementation(Dependencies.kermit) } 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 e416988d8d..b60dc83c7f 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 @@ -2,8 +2,8 @@ package net.mullvad.mullvadvpn.lib.map.internal import android.opengl.GLES20 import android.opengl.Matrix -import android.util.Log import androidx.compose.ui.graphics.Color +import co.touchlab.kermit.Logger import java.nio.Buffer import java.nio.ByteBuffer import java.nio.FloatBuffer @@ -31,7 +31,7 @@ internal fun initShaderProgram(vsSource: String, fsSource: String): Int { GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linked, 0) if (linked[0] == GLES20.GL_FALSE) { val infoLog = GLES20.glGetProgramInfoLog(program) - Log.e("GLHelper", "Could not link program: $infoLog") + Logger.e("Could not link program: $infoLog") GLES20.glDeleteProgram(program) error("Could not link program with vsSource: $vsSource and fsSource: $fsSource") } @@ -54,7 +54,7 @@ private fun loadShader(type: Int, shaderCode: String): Int { GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0) if (compiled[0] == GLES20.GL_FALSE) { val infoLog = GLES20.glGetShaderInfoLog(shader) - Log.e("GLHelper", "Could not compile shader $type:$infoLog") + Logger.e("Could not compile shader $type:$infoLog") GLES20.glDeleteShader(shader) error("Could not compile shader with shaderCode: $shaderCode") |