Fixes for review

Author: kl

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/FilterUiStatePreviewParameterProvider.kt

@@ -6,7 +6,8 @@ import net.mullvad.mullvadvpn.lib.model.Ownership
 import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.ProviderId
 
-val PROVIDER = Provider(providerId = ProviderId("provider1"), ownership = Ownership.MullvadOwned)
+private val PROVIDER =
+    Provider(providerId = ProviderId("provider1"), ownership = Ownership.MullvadOwned)
 
 class FilterUiStatePreviewParameterProvider : PreviewParameterProvider<RelayFilterUiState> {
     override val values =

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/SelectLocationsUiStatePreviewParameterProvider.kt

@@ -14,7 +14,7 @@ import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 
-val RELAY =
+private val RELAY =
     RelayItem.Location.Relay(
         id =
             GeoLocationId.Hostname(

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/VpnSettingsUiStatePreviewParameterProvider.kt

@@ -6,12 +6,12 @@ import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.DefaultDnsOptions
 import net.mullvad.mullvadvpn.lib.model.Mtu
 import net.mullvad.mullvadvpn.lib.model.Port
-import net.mullvad.mullvadvpn.lib.model.PortRange
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
 
 private const val MTU = 1337
-private const val PORT = 9001
+@Suppress("MagicNumber") private val PORT1 = Port(9001)
+@Suppress("MagicNumber") private val PORT2 = Port(12433)
 
 class VpnSettingsUiStatePreviewParameterProvider : PreviewParameterProvider<VpnSettingsUiState> {
     override val values =
@@ -35,8 +35,8 @@ class VpnSettingsUiStatePreviewParameterProvider : PreviewParameterProvider<VpnS
                     ),
                 quantumResistant = QuantumResistantState.On,
                 selectedWireguardPort = Constraint.Any,
-                customWireguardPort = Port(PORT),
-                availablePortRanges = listOf(PortRange(IntRange(PORT, PORT + PORT))),
+                customWireguardPort = PORT1,
+                availablePortRanges = listOf(PORT1..PORT2),
                 systemVpnSettingsAvailable = true,
             ),
         )

android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Port.kt

@@ -12,6 +12,8 @@ value class Port(val value: Int) : Parcelable {
 
     override fun toString(): String = value.toString()
 
+    operator fun rangeTo(other: Port): PortRange = PortRange(value..other.value)
+
     companion object {
         fun fromString(value: String): Either<ParsePortError, Port> = either {
             val number = value.toIntOrNull() ?: raise(ParsePortError.NotANumber(value))