devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

color (theme) fixes, NOT FINISHED

Browse Source
This commit is contained in:
Kima
2024-03-05 23:08:47 +01:00
parent 0dc9a0640a
commit e2ac4303f3
17 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
refilc/lib/theme/theme.dart
View File

@@ -62,27 +62,32 @@ class AppTheme {
: _paletteHighlightLight(palette)) ??
lightColors.highlight;
Color newPrimary = ColorsUtils().darken(accent, amount: 0.4);
Color newSecondary = ColorsUtils().darken(accent, amount: 0.4);
// Color newScaffoldBg = ColorsUtils().lighten(accent, amount: 0.4);
Color newScaffoldBg = backgroundColor;
Color newTertiary = ColorsUtils().darken(accent, amount: 0.5);
return ThemeData(
brightness: Brightness.light,
useMaterial3: true,
fontFamily: _defaultFontFamily,
textTheme: googleFontsMap[settings.fontFamily],
scaffoldBackgroundColor: newScaffoldBg,
scaffoldBackgroundColor: backgroundColor,
primaryColor: lightColors.filc,
dividerColor: const Color(0x00000000),
colorScheme: ColorScheme(
primary: newPrimary,
primary: accent,
onPrimary:
(newPrimary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
secondary: accent,
onSecondary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
secondary: newSecondary,
onSecondary: (newSecondary.computeLuminance() > 0.5
? Colors.black
: Colors.white)
.withOpacity(.9),
tertiary: newTertiary,
onTertiary:
(newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
background: highlightColor,
onBackground: Colors.black.withOpacity(.9),
brightness: Brightness.light,
@@ -150,6 +155,9 @@ class AppTheme {
: _paletteHighlightDark(palette)) ??
darkColors.highlight;
Color newSecondary = ColorsUtils().lighten(accent, amount: 0.4);
Color newTertiary = ColorsUtils().lighten(accent, amount: 0.5);
return ThemeData(
brightness: Brightness.dark,
useMaterial3: true,
@@ -163,9 +171,14 @@ class AppTheme {
onPrimary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
secondary: accent,
onSecondary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
secondary: newSecondary,
onSecondary: (newSecondary.computeLuminance() > 0.5
? Colors.black
: Colors.white)
.withOpacity(.9),
tertiary: newTertiary,
onTertiary:
(newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
background: highlightColor,
onBackground: Colors.white.withOpacity(.9),