diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-25 10:57:49 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-29 09:49:30 +0200 |
| commit | 25db79346b3c7e1fab93a389287a5c13dce09c43 (patch) | |
| tree | 7f6ea588788e592d37e4f2c94183073dc7b53fa4 /android | |
| parent | 943eaf8d5b583576e63b8c278141deb98d1502dd (diff) | |
| download | mullvadvpn-25db79346b3c7e1fab93a389287a5c13dce09c43.tar.xz mullvadvpn-25db79346b3c7e1fab93a389287a5c13dce09c43.zip | |
Format code
Diffstat (limited to 'android')
6 files changed, 79 insertions, 80 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt index fb210b1661..6c1ab3cebd 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt @@ -2,12 +2,10 @@ package net.mullvad.mullvadvpn.compose.component import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.SheetState -import androidx.compose.material3.SheetValue import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import androidx.compose.ui.unit.Density import de.mannodermaus.junit5.compose.ComposeContext import io.mockk.every import io.mockk.mockk diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt index 57a473d085..2c522b7c7e 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt @@ -34,7 +34,6 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter -import androidx.compose.ui.unit.Density import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt index cd3a6938ff..a100776f78 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt @@ -38,7 +38,9 @@ fun MullvadExposedDropdownMenuBox( modifier = modifier.clickable { expanded = !expanded }, ) { TextField( - modifier = Modifier.fillMaxWidth().menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, true), + modifier = + Modifier.fillMaxWidth() + .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, true), readOnly = true, value = title, onValueChange = { /* Do nothing */ }, 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() } } diff --git a/android/test/detekt/src/test/kotlin/net/mullvad/mullvadvpn/detekt/extensions/ScreenAndDialogNamedArgumentsTest.kt b/android/test/detekt/src/test/kotlin/net/mullvad/mullvadvpn/detekt/extensions/ScreenAndDialogNamedArgumentsTest.kt index fd7250ed6b..f060febec4 100644 --- a/android/test/detekt/src/test/kotlin/net/mullvad/mullvadvpn/detekt/extensions/ScreenAndDialogNamedArgumentsTest.kt +++ b/android/test/detekt/src/test/kotlin/net/mullvad/mullvadvpn/detekt/extensions/ScreenAndDialogNamedArgumentsTest.kt @@ -36,63 +36,63 @@ class ScreenAndDialogNamedArgumentsTest { private val incorrectCall: String = """ - @Composable - fun ExampleComposeScreen( - arg1: Int, - arg2: String = "", - ) {} + @Composable + fun ExampleComposeScreen( + arg1: Int, + arg2: String = "", + ) {} - @Composable - fun Caller() { - ExampleComposeScreen(2, args2 = "named") - } -""" + @Composable + fun Caller() { + ExampleComposeScreen(2, args2 = "named") + } + """ .trimIndent() private val correctCall: String = """ - @Composable - fun ExampleComposeScreen( - arg1: Int, - arg2: String = "", - ) {} + @Composable + fun ExampleComposeScreen( + arg1: Int, + arg2: String = "", + ) {} - @Composable - fun Caller() { - ExampleComposeScreen(arg1 = 2, args2 = "named") - } -""" + @Composable + fun Caller() { + ExampleComposeScreen(arg1 = 2, args2 = "named") + } + """ .trimIndent() private val ignoredCall: String = """ - @Composable - fun ExampleComposable( - arg1: Int, - arg2: String = "", - ) {} + @Composable + fun ExampleComposable( + arg1: Int, + arg2: String = "", + ) {} - fun initScreen(arg: Int) {} + fun initScreen(arg: Int) {} - @Composable - fun Caller() { - ExampleComposable(2, args2 = "named") - initScreen(2) - } -""" + @Composable + fun Caller() { + ExampleComposable(2, args2 = "named") + initScreen(2) + } + """ .trimIndent() private val trailingLambda: String = """ - @Composable - fun TrailingLambdaDialog(arg: Int, callback: (Int) -> Unit) { - callback(arg) - } - @Composable - fun Caller() { - TrailingLambdaDialog(arg = 2) { - println(it) + @Composable + fun TrailingLambdaDialog(arg: Int, callback: (Int) -> Unit) { + callback(arg) } - } -""" + @Composable + fun Caller() { + TrailingLambdaDialog(arg = 2) { + println(it) + } + } + """ .trimIndent() |
