summaryrefslogtreecommitdiffhomepage
path: root/android/lib/theme
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-06-13 16:37:23 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-06-14 13:27:05 +0200
commit7dd2345f65acb9fe9a9b57809603db3a65417a8b (patch)
tree1ed1918cb8742f470b5d7182f6ef92c7ee0ed97e /android/lib/theme
parente80e9ee68559fcd32747c28a829e70d2121e9344 (diff)
downloadmullvadvpn-7dd2345f65acb9fe9a9b57809603db3a65417a8b.tar.xz
mullvadvpn-7dd2345f65acb9fe9a9b57809603db3a65417a8b.zip
Add ui for api access method functionality
Diffstat (limited to 'android/lib/theme')
-rw-r--r--android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt11
-rw-r--r--android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt1
2 files changed, 12 insertions, 0 deletions
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 01959b7934..343e41dc1a 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
@@ -2,6 +2,8 @@ package net.mullvad.mullvadvpn.lib.theme.color
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MenuDefaults
+import androidx.compose.material3.MenuItemColors
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
@@ -33,3 +35,12 @@ val ColorScheme.onVariant: Color
val ColorScheme.selected: Color
@Composable get() = MaterialTheme.colorScheme.surface
+
+val menuItemColors: MenuItemColors
+ @Composable
+ get() =
+ MenuDefaults.itemColors()
+ .copy(
+ leadingIconColor = MaterialTheme.colorScheme.onSurface,
+ textColor = MaterialTheme.colorScheme.onSurface,
+ )
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 2763033a30..ef3564951f 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
@@ -42,6 +42,7 @@ data class Dimensions(
val dropdownMenuBorder: Dp = 1.dp,
val expandableCellChevronSize: Dp = 30.dp,
val filterTittlePadding: Dp = 4.dp,
+ val formTextFieldMinHeight: Dp = 72.dp,
val iconFailSuccessTopMargin: Dp = 30.dp,
val iconHeight: Dp = 44.dp,
val indentedCellStartPadding: Dp = 38.dp,