wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/material-3

Browse Source 
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/nutritional_plan_detail.dart
This commit is contained in:
Roland Geider
2023-11-09 19:16:17 +01:00
parent a046cb1736 09f60fe432
commit 81ed85c2f2
78 changed files with 2460 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/theme/theme.dart
View File

@@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import 'package:charts_flutter/flutter.dart' as charts;
import 'package:flex_seed_scheme/flex_seed_scheme.dart';
import 'package:flutter/material.dart';
import 'package:table_calendar/table_calendar.dart';
@@ -61,8 +60,6 @@ final ColorScheme schemeDarkHc = SeedColorScheme.fromSeeds(
tones: FlexTones.ultraContrast(Brightness.dark),
);
// Chart colors
const charts.Color wgerChartSecondaryColor = charts.Color(r: 0xe6, g: 0x39, b: 0x46);
final wgerLightTheme = ThemeData.from(
colorScheme: schemeLight,