summaryrefslogtreecommitdiffhomepage
path: root/android/lib/theme/src/main
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2024-08-28 20:33:46 +0200
committerAlbin <albin@mullvad.net>2024-08-28 20:44:14 +0200
commitb52c423d777213d5bb92430bccec880c6367a70b (patch)
tree6ce254a809c1555fbde9a1c5692725042803854c /android/lib/theme/src/main
parenta71f1e7a6888bc6af5a9df355afd26d3f56d0e5c (diff)
downloadmullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.tar.xz
mullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.zip
Reformat kotlin code using updated ktfmt plugin
This commit mostly adds trailing commas throughout the project, but also includes a few other formatting changes.
Diffstat (limited to 'android/lib/theme/src/main')
-rw-r--r--android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt10
-rw-r--r--android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt4
-rw-r--r--android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt6
3 files changed, 10 insertions, 10 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 88ed41e6ab..1aa70f5fc2 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
@@ -47,8 +47,8 @@ private val MullvadTypography =
TextStyle(
fontWeight = FontWeight.Normal,
letterSpacing = TextUnit.Unspecified,
- fontSize = TypeScale.TextMedium
- )
+ fontSize = TypeScale.TextMedium,
+ ),
)
private val lightColorScheme =
@@ -136,7 +136,7 @@ val Shapes =
small = RoundedCornerShape(4.dp),
medium = RoundedCornerShape(4.dp),
large = RoundedCornerShape(0.dp),
- extraLarge = RoundedCornerShape(11.dp)
+ extraLarge = RoundedCornerShape(11.dp),
)
val Dimens: Dimensions
@@ -154,7 +154,7 @@ private val rippleAlpha =
pressedAlpha = StateTokens.PressedStateLayerOpacity,
focusedAlpha = StateTokens.FocusStateLayerOpacity,
draggedAlpha = StateTokens.DraggedStateLayerOpacity,
- hoveredAlpha = StateTokens.HoverStateLayerOpacity
+ hoveredAlpha = StateTokens.HoverStateLayerOpacity,
)
@Composable
@@ -183,7 +183,7 @@ fun AppTheme(content: @Composable () -> Unit) {
) {
content()
}
- }
+ },
)
}
}
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt
index 55997a8f71..848e375e1c 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt
@@ -25,9 +25,9 @@ internal val MullvadMaterial3Typography =
fontFamily = FontFamily.SansSerif,
fontWeight = FontWeight.SemiBold,
fontSize = 18.sp,
- lineHeight = 23.sp
+ lineHeight = 23.sp,
),
labelMedium =
TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold),
- labelSmall = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold)
+ labelSmall = TextStyle(fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold),
)
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 5b79b1df15..9ea368382d 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
@@ -13,7 +13,7 @@ val Typography.listItemText: TextStyle
return TextStyle(
fontWeight = FontWeight.Normal,
letterSpacing = TextUnit.Unspecified,
- fontSize = TypeScale.TextMediumPlus
+ fontSize = TypeScale.TextMediumPlus,
)
}
@@ -23,7 +23,7 @@ val Typography.listItemSubText: TextStyle
return TextStyle(
fontWeight = FontWeight.SemiBold,
letterSpacing = TextUnit.Unspecified,
- fontSize = TypeScale.TextSmall
+ fontSize = TypeScale.TextSmall,
)
}
@@ -33,6 +33,6 @@ val Typography.connectionStatus: TextStyle
return TextStyle(
fontWeight = FontWeight.Bold,
letterSpacing = TextUnit.Unspecified,
- fontSize = TypeScale.TextMedium
+ fontSize = TypeScale.TextMedium,
)
}