From 50a2403a859f46dbc465dae4614cb1552f937461 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Mon, 24 Oct 2022 11:31:23 +0200 Subject: [PATCH] Reformat code in theme package --- .../java/dev/lonami/talaria/ui/theme/Shape.kt | 8 ++--- .../java/dev/lonami/talaria/ui/theme/Theme.kt | 36 +++++++++---------- .../java/dev/lonami/talaria/ui/theme/Type.kt | 30 ++++++++-------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/dev/lonami/talaria/ui/theme/Shape.kt b/app/src/main/java/dev/lonami/talaria/ui/theme/Shape.kt index 33a9564..04e7a3e 100644 --- a/app/src/main/java/dev/lonami/talaria/ui/theme/Shape.kt +++ b/app/src/main/java/dev/lonami/talaria/ui/theme/Shape.kt @@ -5,7 +5,7 @@ import androidx.compose.material.Shapes import androidx.compose.ui.unit.dp val Shapes = Shapes( - small = RoundedCornerShape(4.dp), - medium = RoundedCornerShape(4.dp), - large = RoundedCornerShape(0.dp) -) \ No newline at end of file + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) diff --git a/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt b/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt index 1530a47..2223771 100644 --- a/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt +++ b/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt @@ -7,24 +7,24 @@ import androidx.compose.material.lightColors import androidx.compose.runtime.Composable private val DarkColorPalette = darkColors( - primary = Purple200, - primaryVariant = Purple700, - secondary = Teal200 + primary = Purple200, + primaryVariant = Purple700, + secondary = Teal200 ) private val LightColorPalette = lightColors( - primary = Purple500, - primaryVariant = Purple700, - secondary = Teal200 + primary = Purple500, + primaryVariant = Purple700, + secondary = Teal200 - /* Other default colors to override - background = Color.White, - surface = Color.White, - onPrimary = Color.White, - onSecondary = Color.Black, - onBackground = Color.Black, - onSurface = Color.Black, - */ + /* Other default colors to override +background = Color.White, +surface = Color.White, +onPrimary = Color.White, +onSecondary = Color.Black, +onBackground = Color.Black, +onSurface = Color.Black, +*/ ) @Composable @@ -36,9 +36,9 @@ fun TalariaTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composabl } MaterialTheme( - colors = colors, - typography = Typography, - shapes = Shapes, - content = content + colors = colors, + typography = Typography, + shapes = Shapes, + content = content ) } diff --git a/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt b/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt index 800950d..4ea971d 100644 --- a/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt +++ b/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt @@ -8,21 +8,21 @@ import androidx.compose.ui.unit.sp // Set of Material typography styles to start with val Typography = Typography( - body1 = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp - ) - /* Other default text styles to override - button = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.W500, - fontSize = 14.sp - ), - caption = TextStyle( + body1 = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, - fontSize = 12.sp + fontSize = 16.sp ) - */ -) \ No newline at end of file + /* Other default text styles to override +button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp +), +caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp +) +*/ +)