Add custom lists to select location screen

5 files changed, 30 insertions, 2 deletions

diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
index 85d45c4d2b..69096ceccb 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
@@ -33,6 +33,12 @@ import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onSurfaceVariant
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onTertiaryContainer
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_primary
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_secondaryContainer
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceContainer
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceContainerHigh
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceContainerHighest
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceContainerLow
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceContainerLowest
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceTint
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceVariant
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_tertiaryContainer
 import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions
@@ -89,6 +95,12 @@ private val darkColorScheme =
         // surfaceTint = md_theme_dark_surfaceTint,
         outlineVariant = Color.Transparent, // Used by divider,
         // scrim = md_theme_dark_scrim,
+        surfaceContainerHighest = md_theme_dark_surfaceContainerHighest,
+        surfaceContainerHigh = md_theme_dark_surfaceContainerHigh,
+        surfaceContainerLow = md_theme_dark_surfaceContainerLow,
+        surfaceContainerLowest = md_theme_dark_surfaceContainerLowest,
+        surfaceContainer = md_theme_dark_surfaceContainer,
+        surfaceTint = md_theme_dark_surfaceTint
     )
 
 val Shapes =
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
index 82f924ebe0..01959b7934 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
@@ -21,6 +21,7 @@ const val AlphaDescription = 0.6f
 const val AlphaDisconnectButton = 0.6f
 const val AlphaChevron = 0.6f
 const val AlphaScrollbar = 0.6f
+const val Alpha60 = 0.6f
 const val AlphaTopBar = 0.8f
 const val AlphaInvisible = 0f
 
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
index 413a37f93e..1915cc911a 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
@@ -61,6 +61,11 @@ internal val md_theme_dark_outline = Color(0xFF8D9199) // Generated
 internal val md_theme_dark_inverseOnSurface = Color(0xFFFFFFFF) // MullvadWhite
 internal val md_theme_dark_inverseSurface = Color(0xFFFFFFFF) // MullvadWhite
 internal val md_theme_dark_inversePrimary = Color(0xFF0561A3) // Generated
-internal val md_theme_dark_surfaceTint = Color(0xFF9FCAFF) // Generated
+internal val md_theme_dark_surfaceTint = Color(0xFF233953) // Custom list disabled
 internal val md_theme_dark_outlineVariant = Color(0xFF43474E) // Generated
 internal val md_theme_dark_scrim = Color(0xFF000000) // Generated
+internal val md_theme_dark_surfaceContainerHighest = Color(0xFF234161) // Relay list depth 0
+internal val md_theme_dark_surfaceContainerHigh = Color(0xFF1F3A57) // Relay list depth 1
+internal val md_theme_dark_surfaceContainerLow = Color(0xFF1C344E) // Relay list depth 2
+internal val md_theme_dark_surfaceContainerLowest = Color(0xFF1B314A) // Relay list depth 3
+internal val md_theme_dark_surfaceContainer = Color(0xFF192638) // Alert Blue
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
index ef6b04146e..2763033a30 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
@@ -16,8 +16,10 @@ data class Dimensions(
     val cellEndPadding: Dp = 16.dp,
     val cellFooterTopPadding: Dp = 6.dp,
     val cellHeight: Dp = 56.dp,
+    val cellHeightTwoRows: Dp = 72.dp,
     val cellLabelVerticalPadding: Dp = 14.dp,
     val cellStartPadding: Dp = 22.dp,
+    val cellStartPaddingInteractive: Dp = 14.dp,
     val cellTopPadding: Dp = 6.dp,
     val cellVerticalSpacing: Dp = 14.dp,
     val checkBoxSize: Dp = 24.dp,
@@ -36,7 +38,8 @@ data class Dimensions(
     val customPortBoxMinWidth: Dp = 80.dp,
     val deleteIconSize: Dp = 24.dp,
     val dialogIconHeight: Dp = 44.dp,
-    val dialogIconSize: Dp = 48.dp,
+    val dropdownMenuVerticalPadding: Dp = 8.dp, // Used to remove padding from dropdown menu
+    val dropdownMenuBorder: Dp = 1.dp,
     val expandableCellChevronSize: Dp = 30.dp,
     val filterTittlePadding: Dp = 4.dp,
     val iconFailSuccessTopMargin: Dp = 30.dp,
@@ -61,6 +64,7 @@ data class Dimensions(
     val progressIndicatorSize: Dp = 48.dp,
     val relayCircleSize: Dp = 16.dp,
     val relayRowPadding: Dp = 50.dp,
+    val relayRowPaddingExtra: Dp = 66.dp,
     val screenVerticalMargin: Dp = 22.dp,
     val searchFieldHeight: Dp = 42.dp,
     val searchFieldHorizontalPadding: Dp = 22.dp,
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/shape/Shape.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/shape/Shape.kt
index 501cb72946..aa2f40782c 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/shape/Shape.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/shape/Shape.kt
@@ -11,3 +11,9 @@ val Shapes.chipShape: Shape
     get() {
         return RoundedCornerShape(8.dp)
     }
+
+val Shapes.fabShape: Shape
+    @Composable
+    get() {
+        return RoundedCornerShape(16.dp)
+    }