From d89d5003192cf11bd9701dddce63d5782b40a071 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 26 Jan 2022 22:41:04 +0530 Subject: Move Compose code to ui-compose module (#1687) --- .../main/java/dev/msfjarvis/aps/ui/theme/Color.kt | 58 --------- .../main/java/dev/msfjarvis/aps/ui/theme/Theme.kt | 76 ----------- .../main/java/dev/msfjarvis/aps/ui/theme/Type.kt | 145 --------------------- 3 files changed, 279 deletions(-) delete mode 100644 app/src/main/java/dev/msfjarvis/aps/ui/theme/Color.kt delete mode 100644 app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt delete mode 100644 app/src/main/java/dev/msfjarvis/aps/ui/theme/Type.kt (limited to 'app/src/main') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Color.kt b/app/src/main/java/dev/msfjarvis/aps/ui/theme/Color.kt deleted file mode 100644 index 8566e734..00000000 --- a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Color.kt +++ /dev/null @@ -1,58 +0,0 @@ -package dev.msfjarvis.aps.ui.theme - -import androidx.compose.ui.graphics.Color - -val md_theme_light_primary = Color(0xFF006591) -val md_theme_light_onPrimary = Color(0xFFffffff) -val md_theme_light_primaryContainer = Color(0xFFc7e6ff) -val md_theme_light_onPrimaryContainer = Color(0xFF001e30) -val md_theme_light_secondary = Color(0xFF4f606e) -val md_theme_light_onSecondary = Color(0xFFffffff) -val md_theme_light_secondaryContainer = Color(0xFFd3e5f5) -val md_theme_light_onSecondaryContainer = Color(0xFF0b1d29) -val md_theme_light_tertiary = Color(0xFF006494) -val md_theme_light_onTertiary = Color(0xFFffffff) -val md_theme_light_tertiaryContainer = Color(0xFFc8e6ff) -val md_theme_light_onTertiaryContainer = Color(0xFF001e31) -val md_theme_light_error = Color(0xFFba1b1b) -val md_theme_light_errorContainer = Color(0xFFffdad4) -val md_theme_light_onError = Color(0xFFffffff) -val md_theme_light_onErrorContainer = Color(0xFF410001) -val md_theme_light_background = Color(0xFFfcfcff) -val md_theme_light_onBackground = Color(0xFF1a1c1e) -val md_theme_light_surface = Color(0xFFfcfcff) -val md_theme_light_onSurface = Color(0xFF1a1c1e) -val md_theme_light_surfaceVariant = Color(0xFFdde3ea) -val md_theme_light_onSurfaceVariant = Color(0xFF41474d) -val md_theme_light_outline = Color(0xFF72787e) -val md_theme_light_inverseOnSurface = Color(0xFFf0f0f3) -val md_theme_light_inverseSurface = Color(0xFF2e3133) - -val md_theme_dark_primary = Color(0xFF85ceff) -val md_theme_dark_onPrimary = Color(0xFF00344e) -val md_theme_dark_primaryContainer = Color(0xFF004c6f) -val md_theme_dark_onPrimaryContainer = Color(0xFFc7e6ff) -val md_theme_dark_secondary = Color(0xFFb7c9d9) -val md_theme_dark_onSecondary = Color(0xFF21323e) -val md_theme_dark_secondaryContainer = Color(0xFF384956) -val md_theme_dark_onSecondaryContainer = Color(0xFFd3e5f5) -val md_theme_dark_tertiary = Color(0xFF8aceff) -val md_theme_dark_onTertiary = Color(0xFF003450) -val md_theme_dark_tertiaryContainer = Color(0xFF004b70) -val md_theme_dark_onTertiaryContainer = Color(0xFFc8e6ff) -val md_theme_dark_error = Color(0xFFffb4a9) -val md_theme_dark_errorContainer = Color(0xFF930006) -val md_theme_dark_onError = Color(0xFF680003) -val md_theme_dark_onErrorContainer = Color(0xFFffdad4) -val md_theme_dark_background = Color(0xFF1a1c1e) -val md_theme_dark_onBackground = Color(0xFFe1e2e5) -val md_theme_dark_surface = Color(0xFF1a1c1e) -val md_theme_dark_onSurface = Color(0xFFe1e2e5) -val md_theme_dark_surfaceVariant = Color(0xFF41474d) -val md_theme_dark_onSurfaceVariant = Color(0xFFc1c7ce) -val md_theme_dark_outline = Color(0xFF8b9197) -val md_theme_dark_inverseOnSurface = Color(0xFF1a1c1e) -val md_theme_dark_inverseSurface = Color(0xFFe1e2e5) - -val seed = Color(0xFF003e5b) -val error = Color(0xFFba1b1b) diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt b/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt deleted file mode 100644 index 55fb600d..00000000 --- a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt +++ /dev/null @@ -1,76 +0,0 @@ -package dev.msfjarvis.aps.ui.theme - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable - -private val LightThemeColors = - lightColorScheme( - primary = md_theme_light_primary, - onPrimary = md_theme_light_onPrimary, - primaryContainer = md_theme_light_primaryContainer, - onPrimaryContainer = md_theme_light_onPrimaryContainer, - secondary = md_theme_light_secondary, - onSecondary = md_theme_light_onSecondary, - secondaryContainer = md_theme_light_secondaryContainer, - onSecondaryContainer = md_theme_light_onSecondaryContainer, - tertiary = md_theme_light_tertiary, - onTertiary = md_theme_light_onTertiary, - tertiaryContainer = md_theme_light_tertiaryContainer, - onTertiaryContainer = md_theme_light_onTertiaryContainer, - error = md_theme_light_error, - errorContainer = md_theme_light_errorContainer, - onError = md_theme_light_onError, - onErrorContainer = md_theme_light_onErrorContainer, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface, - surfaceVariant = md_theme_light_surfaceVariant, - onSurfaceVariant = md_theme_light_onSurfaceVariant, - outline = md_theme_light_outline, - inverseOnSurface = md_theme_light_inverseOnSurface, - inverseSurface = md_theme_light_inverseSurface, - ) -private val DarkThemeColors = - darkColorScheme( - primary = md_theme_dark_primary, - onPrimary = md_theme_dark_onPrimary, - primaryContainer = md_theme_dark_primaryContainer, - onPrimaryContainer = md_theme_dark_onPrimaryContainer, - secondary = md_theme_dark_secondary, - onSecondary = md_theme_dark_onSecondary, - secondaryContainer = md_theme_dark_secondaryContainer, - onSecondaryContainer = md_theme_dark_onSecondaryContainer, - tertiary = md_theme_dark_tertiary, - onTertiary = md_theme_dark_onTertiary, - tertiaryContainer = md_theme_dark_tertiaryContainer, - onTertiaryContainer = md_theme_dark_onTertiaryContainer, - error = md_theme_dark_error, - errorContainer = md_theme_dark_errorContainer, - onError = md_theme_dark_onError, - onErrorContainer = md_theme_dark_onErrorContainer, - background = md_theme_dark_background, - onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, - onSurface = md_theme_dark_onSurface, - surfaceVariant = md_theme_dark_surfaceVariant, - onSurfaceVariant = md_theme_dark_onSurfaceVariant, - outline = md_theme_dark_outline, - inverseOnSurface = md_theme_dark_inverseOnSurface, - inverseSurface = md_theme_dark_inverseSurface, - ) - -@Composable -fun APSTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { - val colors = - if (!useDarkTheme) { - LightThemeColors - } else { - DarkThemeColors - } - - MaterialTheme(colorScheme = colors, typography = AppTypography, content = content) -} diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Type.kt b/app/src/main/java/dev/msfjarvis/aps/ui/theme/Type.kt deleted file mode 100644 index 55ee448c..00000000 --- a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Type.kt +++ /dev/null @@ -1,145 +0,0 @@ -package dev.msfjarvis.aps.ui.theme - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp -import dev.msfjarvis.aps.R - -// Replace with your font locations -val Manrope = - FontFamily( - Font(R.font.manrope_bold, FontWeight.Bold), - Font(R.font.manrope_extrabold, FontWeight.ExtraBold), - Font(R.font.manrope_extralight, FontWeight.ExtraLight), - Font(R.font.manrope_light, FontWeight.Light), - Font(R.font.manrope_medium, FontWeight.Medium), - Font(R.font.manrope_regular, FontWeight.Normal), - Font(R.font.manrope_semibold, FontWeight.SemiBold), - ) - -val AppTypography = - Typography( - displayLarge = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 57.sp, - lineHeight = 64.sp, - letterSpacing = (-0.25).sp, - ), - displayMedium = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 45.sp, - lineHeight = 52.sp, - letterSpacing = 0.sp, - ), - displaySmall = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 36.sp, - lineHeight = 44.sp, - letterSpacing = 0.sp, - ), - headlineLarge = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 32.sp, - lineHeight = 40.sp, - letterSpacing = 0.sp, - ), - headlineMedium = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 28.sp, - lineHeight = 36.sp, - letterSpacing = 0.sp, - ), - headlineSmall = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 24.sp, - lineHeight = 32.sp, - letterSpacing = 0.sp, - ), - titleLarge = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp, - ), - titleMedium = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.Medium, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.1.sp, - ), - titleSmall = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.Medium, - fontSize = 14.sp, - lineHeight = 20.sp, - letterSpacing = 0.1.sp, - ), - labelLarge = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.Medium, - fontSize = 14.sp, - lineHeight = 20.sp, - letterSpacing = 0.1.sp, - ), - bodyLarge = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp, - ), - bodyMedium = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 14.sp, - lineHeight = 20.sp, - letterSpacing = 0.25.sp, - ), - bodySmall = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.W400, - fontSize = 12.sp, - lineHeight = 16.sp, - letterSpacing = 0.4.sp, - ), - labelMedium = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.Medium, - fontSize = 12.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp, - ), - labelSmall = - TextStyle( - fontFamily = Manrope, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp, - ), - ) -- cgit v1.2.3