Merge branch 'add-feature-indicators-to-the-main-screen-droid-1108'

4 files changed, 19 insertions, 24 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 1aa70f5fc2..f38602bf16 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
@@ -135,7 +135,7 @@ val Shapes =
     Shapes(
         small = RoundedCornerShape(4.dp),
         medium = RoundedCornerShape(4.dp),
-        large = RoundedCornerShape(0.dp),
+        large = RoundedCornerShape(12.dp),
         extraLarge = RoundedCornerShape(11.dp),
     )
 
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 1f37088911..f1cdeea4a0 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
@@ -16,6 +16,7 @@ const val Alpha40 = 0.4f
 const val AlphaDisconnectButton = 0.6f
 const val AlphaScrollbar = 0.6f
 const val AlphaInvisible = 0f
+const val Alpha80 = 0.8f
 
 // Custom colors, they only link to normal material 3 colors for now
 val ColorScheme.selected: Color
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 4ce5c8b57c..8d2660878c 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
@@ -7,7 +7,6 @@ data class Dimensions(
     val accountRowMinHeight: Dp = 48.dp,
     val accountRowSpacing: Dp = 24.dp,
     val addIconSize: Dp = 24.dp,
-    val backButtonSideMargin: Dp = 30.dp,
     val bigIconSize: Dp = 44.dp,
     val bottomPadding: Dp = 4.dp,
     val buttonHeight: Dp = 44.dp,
@@ -19,11 +18,8 @@ data class Dimensions(
     val cellHeightTwoRows: Dp = 72.dp,
     val cellLabelVerticalPadding: Dp = 14.dp,
     val cellStartPadding: Dp = 14.dp,
-    val cellStartPaddingInteractive: Dp = 14.dp,
     val cellTopPadding: Dp = 6.dp,
     val cellVerticalSpacing: Dp = 14.dp,
-    val checkBoxSize: Dp = 24.dp,
-    val chevronMargin: Dp = 4.dp,
     val chipSpace: Dp = 8.dp,
     val chipVerticalPadding: Dp = 4.dp,
     val circularProgressBarLargeSize: Dp = 44.dp,
@@ -32,48 +28,35 @@ data class Dimensions(
     val circularProgressBarMediumStrokeWidth: Dp = 4.dp,
     val circularProgressBarSmallSize: Dp = 24.dp,
     val circularProgressBarSmallStrokeWidth: Dp = 3.dp,
-    val cityRowPadding: Dp = 34.dp,
     val connectButtonExtraPadding: Dp = 4.dp,
-    val countryRowPadding: Dp = 18.dp,
+    val connectionCardMaxWidth: Dp = 480.dp,
     val customPortBoxMinWidth: Dp = 80.dp,
     val deleteIconSize: Dp = 24.dp,
     val dialogIconHeight: Dp = 44.dp,
-    val dropdownMenuVerticalPadding: Dp = 8.dp, // Used to remove padding from dropdown menu
-    val dropdownMenuBorder: Dp = 1.dp,
-    val expandableCellChevronSize: Dp = 30.dp,
-    val filterTitlePadding: Dp = 4.dp,
     val formTextFieldMinHeight: Dp = 72.dp,
     val iconFailSuccessTopMargin: Dp = 30.dp,
-    val iconHeight: Dp = 44.dp,
     val indentedCellStartPadding: Dp = 38.dp,
     val indicatorPadding: Dp = 2.dp,
     val indicatorSize: Dp = 6.dp,
-    val infoButtonVerticalPadding: Dp = 13.dp,
     val largePadding: Dp = 32.dp,
     val listIconSize: Dp = 24.dp,
     val listItemDivider: Dp = 1.dp,
-    val loadingSpinnerPadding: Dp = 12.dp,
-    val loadingSpinnerSize: Dp = 24.dp,
-    val loadingSpinnerSizeMedium: Dp = 28.dp,
-    val loginIconContainerSize: Dp = 44.dp,
     val miniPadding: Dp = 4.dp,
     val mediumPadding: Dp = 16.dp,
+    val mediumSpacer: Dp = 16.dp,
+    val smallSpacer: Dp = 8.dp,
     val notificationBannerEndPadding: Dp = 8.dp,
     val notificationBannerStartPadding: Dp = 16.dp,
     val notificationEndIconPadding: Dp = 4.dp,
     val notificationStatusIconSize: Dp = 10.dp,
     val obfuscationNavigationPadding: Dp = 24.dp,
     val problemReportIconToTitlePadding: Dp = 60.dp,
-    val progressIndicatorSize: Dp = 48.dp,
     val reconnectButtonMinInteractiveComponentSize: Dp = 40.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,
     val searchIconSize: Dp = 24.dp,
-    val selectFilterTitlePadding: Dp = 12.dp,
     val selectLocationTitlePadding: Dp = 12.dp,
     val selectableCellTextMargin: Dp = 12.dp,
     val sideMargin: Dp = 22.dp,
@@ -84,9 +67,10 @@ data class Dimensions(
     val splashLogoTextHeight: Dp = 18.dp,
     val successIconVerticalPadding: Dp = 26.dp,
     val switchIconSize: Dp = 24.dp,
+    val switchLocationRetryMinWidth: Dp = 48.dp,
     val titleIconSize: Dp = 48.dp,
-    val topBarHeight: Dp = 64.dp,
     val topPadding: Dp = 20.dp,
+    val tinyPadding: Dp = 4.dp,
     val verticalDividerPadding: Dp = 12.dp,
     val verticalSpace: Dp = 20.dp,
     val verticalSpacer: Dp = 1.dp,
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt
index 9ea368382d..179b417014 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt
@@ -31,8 +31,18 @@ val Typography.connectionStatus: TextStyle
     @Composable
     get() {
         return TextStyle(
-            fontWeight = FontWeight.Bold,
+            fontWeight = FontWeight.SemiBold,
+            letterSpacing = TextUnit.Unspecified,
+            fontSize = TypeScale.TitleLarge,
+        )
+    }
+
+val Typography.hostname: TextStyle
+    @Composable
+    get() {
+        return TextStyle(
+            fontWeight = FontWeight.Normal,
             letterSpacing = TextUnit.Unspecified,
-            fontSize = TypeScale.TextMedium,
+            fontSize = TypeScale.TextMediumPlus,
         )
     }