Fix and update lint baseline

8 files changed, 42 insertions, 45 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt
index ea19fba8e7..0a332ba385 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt
@@ -8,10 +8,10 @@ import net.mullvad.mullvadvpn.lib.model.GeoIpLocation
 import net.mullvad.mullvadvpn.lib.model.InAppNotification
 
 class ConnectUiStatePreviewParameterProvider : PreviewParameterProvider<ConnectUiState> {
-    override val values = sequenceOf(ConnectUiState.INITIAL) + generateOtherStates()
+    override val values = sequenceOf(ConnectUiState.INITIAL) + otherStates
 }
 
-private fun generateOtherStates(): Sequence<ConnectUiState> =
+private val otherStates =
     sequenceOf(
             TunnelStatePreviewData.generateConnectedState(
                 featureIndicators = 8,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/CustomListLocationUiStatePreviewParameterProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/CustomListLocationUiStatePreviewParameterProvider.kt
index 2598c7a9b2..514005095b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/CustomListLocationUiStatePreviewParameterProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/CustomListLocationUiStatePreviewParameterProvider.kt
@@ -20,7 +20,7 @@ class CustomListLocationUiStatePreviewParameterProvider :
                                 listOf(
                                     RelayLocationListItem(
                                         item =
-                                            RelayItemPreviewData.generateRelayItemCountry(
+                                            generateRelayItemCountry(
                                                 name = "A relay",
                                                 cityNames = listOf("City 1", "City 2"),
                                                 relaysPerCity = 2,
@@ -29,7 +29,7 @@ class CustomListLocationUiStatePreviewParameterProvider :
                                     ),
                                     RelayLocationListItem(
                                         item =
-                                            RelayItemPreviewData.generateRelayItemCountry(
+                                            generateRelayItemCountry(
                                                     name = "Another relay",
                                                     cityNames =
                                                         listOf("City X", "City Y", "City Z"),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemCheckableCellPreviewParameterProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemCheckableCellPreviewParameterProvider.kt
index df6a87602f..c0d4ddc063 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemCheckableCellPreviewParameterProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemCheckableCellPreviewParameterProvider.kt
@@ -1,7 +1,6 @@
 package net.mullvad.mullvadvpn.compose.preview
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import net.mullvad.mullvadvpn.compose.preview.RelayItemPreviewData.generateRelayItemCountry
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 
 class RelayItemCheckableCellPreviewParameterProvider :
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt
index 20f69e3bcd..3d706443d2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt
@@ -5,27 +5,20 @@ import net.mullvad.mullvadvpn.lib.model.Ownership
 import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 
-internal object RelayItemPreviewData {
-    fun generateRelayItemCountry(
-        name: String,
-        cityNames: List<String>,
-        relaysPerCity: Int,
-        active: Boolean = true,
-    ) =
-        RelayItem.Location.Country(
-            name = name,
-            id = name.generateCountryCode(),
-            cities =
-                cityNames.map { cityName ->
-                    generateRelayItemCity(
-                        cityName,
-                        name.generateCountryCode(),
-                        relaysPerCity,
-                        active,
-                    )
-                },
-        )
-}
+fun generateRelayItemCountry(
+    name: String,
+    cityNames: List<String>,
+    relaysPerCity: Int,
+    active: Boolean = true,
+) =
+    RelayItem.Location.Country(
+        name = name,
+        id = name.generateCountryCode(),
+        cities =
+            cityNames.map { cityName ->
+                generateRelayItemCity(cityName, name.generateCountryCode(), relaysPerCity, active)
+            },
+    )
 
 private fun generateRelayItemCity(
     name: String,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemStatusCellPreviewParameterProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemStatusCellPreviewParameterProvider.kt
index 2e3494c79a..fcb1fdd194 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemStatusCellPreviewParameterProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemStatusCellPreviewParameterProvider.kt
@@ -1,7 +1,6 @@
 package net.mullvad.mullvadvpn.compose.preview
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import net.mullvad.mullvadvpn.compose.preview.RelayItemPreviewData.generateRelayItemCountry
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 
 class RelayItemStatusCellPreviewParameterProvider :
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayListItemPreviewData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayListItemPreviewData.kt
index 58bea4810e..aaf5fd5a6e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayListItemPreviewData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayListItemPreviewData.kt
@@ -28,7 +28,7 @@ object RelayListItemPreviewData {
                                 ),
                             locations =
                                 listOf(
-                                    RelayItemPreviewData.generateRelayItemCountry(
+                                    generateRelayItemCountry(
                                         name = "Country",
                                         cityNames = listOf("City"),
                                         relaysPerCity = 2,
@@ -48,13 +48,13 @@ object RelayListItemPreviewData {
         add(RelayListItem.LocationHeader)
         val locations =
             listOf(
-                RelayItemPreviewData.generateRelayItemCountry(
+                generateRelayItemCountry(
                     name = "First Country",
                     cityNames = listOf("Capital City", "Minor City"),
                     relaysPerCity = 2,
                     active = true,
                 ),
-                RelayItemPreviewData.generateRelayItemCountry(
+                generateRelayItemCountry(
                     name = "Second Country",
                     cityNames = listOf("Medium City", "Small City", "Vivec City"),
                     relaysPerCity = 1,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
index 8f3b07806a..6fffdc70e8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
@@ -56,6 +56,7 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
+import net.mullvad.mullvadvpn.compose.screen.PAGES.Companion.annotatedTopText
 import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.lib.common.util.openVpnSettings
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
@@ -300,26 +301,28 @@ private fun buildLockdownTopText() = buildAnnotatedString {
     }
 }
 
-private enum class PAGES(
-    val annotatedTopText: @Composable () -> AnnotatedString,
-    val image: Int,
-    val bottomText: Int,
-) {
+private enum class PAGES(val image: Int, val bottomText: Int) {
     FIRST(
-        annotatedTopText =
-            @Composable { buildTopText(id = R.string.auto_connect_carousel_first_slide_top_text) },
         R.drawable.carousel_slide_1_cogwheel,
         R.string.auto_connect_carousel_first_slide_bottom_text,
     ),
     SECOND(
-        annotatedTopText =
-            @Composable { buildTopText(id = R.string.auto_connect_carousel_second_slide_top_text) },
         R.drawable.carousel_slide_2_always_on,
         R.string.auto_connect_carousel_second_slide_bottom_text,
     ),
     THIRD(
-        annotatedTopText = @Composable { buildLockdownTopText() },
         R.drawable.carousel_slide_3_block_connections,
         R.string.auto_connect_carousel_third_slide_bottom_text,
-    ),
+    );
+
+    companion object {
+
+        @Composable
+        fun PAGES.annotatedTopText(): AnnotatedString =
+            when (this) {
+                FIRST -> buildTopText(id = R.string.auto_connect_carousel_first_slide_top_text)
+                SECOND -> buildTopText(id = R.string.auto_connect_carousel_second_slide_top_text)
+                THIRD -> buildLockdownTopText()
+            }
+    }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt
index ee96248f4b..9dda1ddaff 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt
@@ -22,19 +22,22 @@ data class SplitTunnelingViewModelState(
             ?.let { (excluded, included) ->
                 SplitTunnelingUiState.ShowAppList(
                     enabled = enabled,
-                    excludedApps = excluded.sort(),
+                    excludedApps = excluded.sortedWith(descendingByNameComparator),
                     includedApps =
                         if (showSystemApps) {
                                 included
                             } else {
                                 included.filter { appData -> !appData.isSystemApp }
                             }
-                            .sort(),
+                            .sortedWith(descendingByNameComparator),
                     showSystemApps = showSystemApps,
                     isModal = isModal,
                 )
             } ?: SplitTunnelingUiState.Loading(enabled = enabled, isModal)
     }
-}
 
-private fun List<AppData>.sort() = sortedBy { it.name.lowercase() }
+    companion object {
+        private val descendingByNameComparator =
+            compareByDescending<AppData> { it.name.lowercase() }
+    }
+}