2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Contrast in dark mode

Browse source
This commit is contained in:
Krille Fear 2021-11-14 22:15:37 +01:00
commit f818aced60
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/config/themes.dart
View file

@ -132,7 +132,7 @@ abstract class FluffyThemes {
primary: FluffyThemes.lighten(AppConfig.chatColor, 0.33),
secondary: FluffyThemes.lighten(AppConfig.chatColor, 0.33),
secondaryVariant: AppConfig.secondaryColor,
surface: FluffyThemes.darken(AppConfig.chatColor, 0.25, 0.2),
surface: FluffyThemes.darken(AppConfig.chatColor, 0.4),
),
secondaryHeaderColor: Colors.blueGrey.shade900,
textTheme: Typography.material2018().white.merge(fallbackTextTheme),
@ -212,28 +212,21 @@ abstract class FluffyThemes {
? Colors.white
: Colors.black;
static Color darken(Color color, [double amount = .1, double saturation]) {
static Color darken(Color color, [double amount = .1]) {
assert(amount >= 0 && amount <= 1);
final hsl = HSLColor.fromColor(color);
var hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
if (saturation != null) {
hslDark =
hslDark.withSaturation((hsl.saturation - saturation).clamp(0.0, 1.0));
}
final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
return hslDark.toColor();
}
static Color lighten(Color color, [double amount = .1, double saturation]) {
static Color lighten(Color color, [double amount = .1]) {
assert(amount >= 0 && amount <= 1);
final hsl = HSLColor.fromColor(color);
var hslLight = hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0));
if (saturation != null) {
hslLight = hslLight
.withSaturation((hsl.saturation - saturation).clamp(0.0, 1.0));
}
final hslLight =
hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0));
return hslLight.toColor();
}