From 76d57724d624dbf0f2c81863f7d0b3c6a2bad7d0 Mon Sep 17 00:00:00 2001 From: LeightonGinty Date: Sat, 16 Nov 2024 12:30:59 +0000 Subject: Initial commit --- .../java/com/example/alcagotchi/ui/theme/Color.kt | 11 ++++ .../java/com/example/alcagotchi/ui/theme/Theme.kt | 58 ++++++++++++++++++++++ .../java/com/example/alcagotchi/ui/theme/Type.kt | 34 +++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 app/src/main/java/com/example/alcagotchi/ui/theme/Color.kt create mode 100644 app/src/main/java/com/example/alcagotchi/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/example/alcagotchi/ui/theme/Type.kt (limited to 'app/src/main/java/com/example/alcagotchi/ui') diff --git a/app/src/main/java/com/example/alcagotchi/ui/theme/Color.kt b/app/src/main/java/com/example/alcagotchi/ui/theme/Color.kt new file mode 100644 index 0000000..56a6a92 --- /dev/null +++ b/app/src/main/java/com/example/alcagotchi/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.alcagotchi.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/com/example/alcagotchi/ui/theme/Theme.kt b/app/src/main/java/com/example/alcagotchi/ui/theme/Theme.kt new file mode 100644 index 0000000..f337f67 --- /dev/null +++ b/app/src/main/java/com/example/alcagotchi/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.example.alcagotchi.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun AlcaGotchiTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/alcagotchi/ui/theme/Type.kt b/app/src/main/java/com/example/alcagotchi/ui/theme/Type.kt new file mode 100644 index 0000000..726e111 --- /dev/null +++ b/app/src/main/java/com/example/alcagotchi/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.alcagotchi.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file -- cgit v1.2.3-70-g09d2