mirror of
https://github.com/revanced/revanced-manager
synced 2024-05-14 13:56:57 +02:00
feat: ReVanced theme colors
This commit is contained in:
CnC-Robert
parent
d2dcd4209d
commit
955e7a4f1c
@ -2,10 +2,64 @@ package app.revanced.manager.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
val Purple80 = Color(0xFFD0BCFF)
|
||||
val PurpleGrey80 = Color(0xFFCCC2DC)
|
||||
val Pink80 = Color(0xFFEFB8C8)
|
||||
val rv_theme_light_primary = Color(0xFF005FAC)
|
||||
val rv_theme_light_onPrimary = Color(0xFFFFFFFF)
|
||||
val rv_theme_light_primaryContainer = Color(0xFFD4E3FF)
|
||||
val rv_theme_light_onPrimaryContainer = Color(0xFF001C39)
|
||||
val rv_theme_light_secondary = Color(0xFF545F71)
|
||||
val rv_theme_light_onSecondary = Color(0xFFFFFFFF)
|
||||
val rv_theme_light_secondaryContainer = Color(0xFFD8E3F8)
|
||||
val rv_theme_light_onSecondaryContainer = Color(0xFF111C2B)
|
||||
val rv_theme_light_tertiary = Color(0xFF6D5677)
|
||||
val rv_theme_light_onTertiary = Color(0xFFFFFFFF)
|
||||
val rv_theme_light_tertiaryContainer = Color(0xFFF6D9FF)
|
||||
val rv_theme_light_onTertiaryContainer = Color(0xFF271430)
|
||||
val rv_theme_light_error = Color(0xFFBA1A1A)
|
||||
val rv_theme_light_errorContainer = Color(0xFFFFDAD6)
|
||||
val rv_theme_light_onError = Color(0xFFFFFFFF)
|
||||
val rv_theme_light_onErrorContainer = Color(0xFF410002)
|
||||
val rv_theme_light_background = Color(0xFFFDFCFF)
|
||||
val rv_theme_light_onBackground = Color(0xFF1A1C1E)
|
||||
val rv_theme_light_surface = Color(0xFFFDFCFF)
|
||||
val rv_theme_light_onSurface = Color(0xFF1A1C1E)
|
||||
val rv_theme_light_surfaceVariant = Color(0xFFDFE2EB)
|
||||
val rv_theme_light_onSurfaceVariant = Color(0xFF43474E)
|
||||
val rv_theme_light_outline = Color(0xFF73777F)
|
||||
val rv_theme_light_inverseOnSurface = Color(0xFFF1F0F4)
|
||||
val rv_theme_light_inverseSurface = Color(0xFF2F3033)
|
||||
val rv_theme_light_inversePrimary = Color(0xFFA4C9FF)
|
||||
//val rv_theme_light_shadow = Color(0xFF000000)
|
||||
val rv_theme_light_surfaceTint = Color(0xFF005FAC)
|
||||
val rv_theme_light_outlineVariant = Color(0xFFC3C6CF)
|
||||
val rv_theme_light_scrim = Color(0xFF000000)
|
||||
|
||||
val Purple40 = Color(0xFF6650a4)
|
||||
val PurpleGrey40 = Color(0xFF625b71)
|
||||
val Pink40 = Color(0xFF7D5260)
|
||||
val rv_theme_dark_primary = Color(0xFFA4C9FF)
|
||||
val rv_theme_dark_onPrimary = Color(0xFF00315D)
|
||||
val rv_theme_dark_primaryContainer = Color(0xFF004884)
|
||||
val rv_theme_dark_onPrimaryContainer = Color(0xFFD4E3FF)
|
||||
val rv_theme_dark_secondary = Color(0xFFBCC7DB)
|
||||
val rv_theme_dark_onSecondary = Color(0xFF263141)
|
||||
val rv_theme_dark_secondaryContainer = Color(0xFF3D4758)
|
||||
val rv_theme_dark_onSecondaryContainer = Color(0xFFD8E3F8)
|
||||
val rv_theme_dark_tertiary = Color(0xFFD9BDE3)
|
||||
val rv_theme_dark_onTertiary = Color(0xFF3D2946)
|
||||
val rv_theme_dark_tertiaryContainer = Color(0xFF543F5E)
|
||||
val rv_theme_dark_onTertiaryContainer = Color(0xFFF6D9FF)
|
||||
val rv_theme_dark_error = Color(0xFFFFB4AB)
|
||||
val rv_theme_dark_errorContainer = Color(0xFF93000A)
|
||||
val rv_theme_dark_onError = Color(0xFF690005)
|
||||
val rv_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
|
||||
val rv_theme_dark_background = Color(0xFF1A1C1E)
|
||||
val rv_theme_dark_onBackground = Color(0xFFE3E2E6)
|
||||
val rv_theme_dark_surface = Color(0xFF1A1C1E)
|
||||
val rv_theme_dark_onSurface = Color(0xFFE3E2E6)
|
||||
val rv_theme_dark_surfaceVariant = Color(0xFF43474E)
|
||||
val rv_theme_dark_onSurfaceVariant = Color(0xFFC3C6CF)
|
||||
val rv_theme_dark_outline = Color(0xFF8D9199)
|
||||
val rv_theme_dark_inverseOnSurface = Color(0xFF1A1C1E)
|
||||
val rv_theme_dark_inverseSurface = Color(0xFFE3E2E6)
|
||||
val rv_theme_dark_inversePrimary = Color(0xFF005FAC)
|
||||
//val rv_theme_dark_shadow = Color(0xFF000000)
|
||||
val rv_theme_dark_surfaceTint = Color(0xFFA4C9FF)
|
||||
val rv_theme_dark_outlineVariant = Color(0xFF43474E)
|
||||
val rv_theme_dark_scrim = Color(0xFF000000)
|
||||
@ -13,15 +13,67 @@ import androidx.core.view.WindowCompat
|
||||
import app.revanced.manager.R
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = Purple80,
|
||||
secondary = PurpleGrey80,
|
||||
tertiary = Pink80
|
||||
primary = rv_theme_dark_primary,
|
||||
onPrimary = rv_theme_dark_onPrimary,
|
||||
primaryContainer = rv_theme_dark_primaryContainer,
|
||||
onPrimaryContainer = rv_theme_dark_onPrimaryContainer,
|
||||
secondary = rv_theme_dark_secondary,
|
||||
onSecondary = rv_theme_dark_onSecondary,
|
||||
secondaryContainer = rv_theme_dark_secondaryContainer,
|
||||
onSecondaryContainer = rv_theme_dark_onSecondaryContainer,
|
||||
tertiary = rv_theme_dark_tertiary,
|
||||
onTertiary = rv_theme_dark_onTertiary,
|
||||
tertiaryContainer = rv_theme_dark_tertiaryContainer,
|
||||
onTertiaryContainer = rv_theme_dark_onTertiaryContainer,
|
||||
error = rv_theme_dark_error,
|
||||
errorContainer = rv_theme_dark_errorContainer,
|
||||
onError = rv_theme_dark_onError,
|
||||
onErrorContainer = rv_theme_dark_onErrorContainer,
|
||||
background = rv_theme_dark_background,
|
||||
onBackground = rv_theme_dark_onBackground,
|
||||
surface = rv_theme_dark_surface,
|
||||
onSurface = rv_theme_dark_onSurface,
|
||||
surfaceVariant = rv_theme_dark_surfaceVariant,
|
||||
onSurfaceVariant = rv_theme_dark_onSurfaceVariant,
|
||||
outline = rv_theme_dark_outline,
|
||||
inverseOnSurface = rv_theme_dark_inverseOnSurface,
|
||||
inverseSurface = rv_theme_dark_inverseSurface,
|
||||
inversePrimary = rv_theme_dark_inversePrimary,
|
||||
surfaceTint = rv_theme_dark_surfaceTint,
|
||||
outlineVariant = rv_theme_dark_outlineVariant,
|
||||
scrim = rv_theme_dark_scrim,
|
||||
)
|
||||
|
||||
private val LightColorScheme = lightColorScheme(
|
||||
primary = Purple40,
|
||||
secondary = PurpleGrey40,
|
||||
tertiary = Pink40
|
||||
primary = rv_theme_light_primary,
|
||||
onPrimary = rv_theme_light_onPrimary,
|
||||
primaryContainer = rv_theme_light_primaryContainer,
|
||||
onPrimaryContainer = rv_theme_light_onPrimaryContainer,
|
||||
secondary = rv_theme_light_secondary,
|
||||
onSecondary = rv_theme_light_onSecondary,
|
||||
secondaryContainer = rv_theme_light_secondaryContainer,
|
||||
onSecondaryContainer = rv_theme_light_onSecondaryContainer,
|
||||
tertiary = rv_theme_light_tertiary,
|
||||
onTertiary = rv_theme_light_onTertiary,
|
||||
tertiaryContainer = rv_theme_light_tertiaryContainer,
|
||||
onTertiaryContainer = rv_theme_light_onTertiaryContainer,
|
||||
error = rv_theme_light_error,
|
||||
errorContainer = rv_theme_light_errorContainer,
|
||||
onError = rv_theme_light_onError,
|
||||
onErrorContainer = rv_theme_light_onErrorContainer,
|
||||
background = rv_theme_light_background,
|
||||
onBackground = rv_theme_light_onBackground,
|
||||
surface = rv_theme_light_surface,
|
||||
onSurface = rv_theme_light_onSurface,
|
||||
surfaceVariant = rv_theme_light_surfaceVariant,
|
||||
onSurfaceVariant = rv_theme_light_onSurfaceVariant,
|
||||
outline = rv_theme_light_outline,
|
||||
inverseOnSurface = rv_theme_light_inverseOnSurface,
|
||||
inverseSurface = rv_theme_light_inverseSurface,
|
||||
inversePrimary = rv_theme_light_inversePrimary,
|
||||
surfaceTint = rv_theme_light_surfaceTint,
|
||||
outlineVariant = rv_theme_light_outlineVariant,
|
||||
scrim = rv_theme_light_scrim,
|
||||
)
|
||||
|
||||
@Composable
|
||||
@ -33,7 +85,10 @@ fun ReVancedManagerTheme(
|
||||
val colorScheme = when {
|
||||
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
||||
val context = LocalContext.current
|
||||
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||
if (darkTheme)
|
||||
dynamicDarkColorScheme(context)
|
||||
else
|
||||
dynamicLightColorScheme(context)
|
||||
}
|
||||
|
||||
darkTheme -> DarkColorScheme
|
||||
@ -47,8 +102,8 @@ fun ReVancedManagerTheme(
|
||||
|
||||
WindowCompat.setDecorFitsSystemWindows(activity.window, false)
|
||||
|
||||
activity.window.navigationBarColor = colorScheme.background.toArgb()
|
||||
activity.window.statusBarColor = Color.Transparent.toArgb()
|
||||
activity.window.navigationBarColor = Color.Transparent.toArgb()
|
||||
|
||||
WindowCompat.getInsetsController(activity.window, view).isAppearanceLightStatusBars = !darkTheme
|
||||
WindowCompat.getInsetsController(activity.window, view).isAppearanceLightNavigationBars = !darkTheme
|
||||
|
||||
Loading…
Reference in New Issue
Block a user