From d3cd22ec7cf641d4ad74d778cbe0b2096e083fc4 Mon Sep 17 00:00:00 2001 From: Kima Date: Tue, 23 Apr 2024 20:24:50 +0200 Subject: [PATCH] fixed dark mode issue --- refilc/lib/theme/colors/utils.dart | 19 +++++++++++++++++++ .../lib/pages/absences/absences_page.dart | 12 ++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/refilc/lib/theme/colors/utils.dart b/refilc/lib/theme/colors/utils.dart index d67d7ef..51412fd 100644 --- a/refilc/lib/theme/colors/utils.dart +++ b/refilc/lib/theme/colors/utils.dart @@ -1,4 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:refilc/models/settings.dart'; class ColorsUtils { Color darken(Color color, {double amount = .1}) { @@ -19,4 +21,21 @@ class ColorsUtils { return hslLight.toColor(); } + + Color fade(BuildContext context, Color color, + {double darkenAmount = .1, double lightenAmount = .1}) { + ThemeMode themeMode = + Provider.of(context, listen: false).theme; + if (themeMode == ThemeMode.system) { + if (MediaQuery.of(context).platformBrightness == Brightness.dark) { + return lighten(color, amount: lightenAmount); + } else { + return darken(color, amount: darkenAmount); + } + } else if (themeMode == ThemeMode.dark) { + return lighten(color, amount: lightenAmount); + } else { + return darken(color, amount: darkenAmount); + } + } } diff --git a/refilc_mobile_ui/lib/pages/absences/absences_page.dart b/refilc_mobile_ui/lib/pages/absences/absences_page.dart index 0251f45..0daa176 100644 --- a/refilc_mobile_ui/lib/pages/absences/absences_page.dart +++ b/refilc_mobile_ui/lib/pages/absences/absences_page.dart @@ -507,9 +507,11 @@ class AbsencesPageState extends State fontSize: 16.0, fontWeight: FontWeight.w500, height: 1.1, - color: ColorsUtils().darken( + color: ColorsUtils().fade( + context, AppColors.of(context).green, - amount: 0.5, + darkenAmount: 0.5, + lightenAmount: 0.4, ), ), ), @@ -536,9 +538,11 @@ class AbsencesPageState extends State fontSize: 16.0, fontWeight: FontWeight.w500, height: 1.1, - color: ColorsUtils().darken( + color: ColorsUtils().fade( + context, AppColors.of(context).red, - amount: 0.4, + darkenAmount: 0.4, + lightenAmount: 0.2, ), ), ),