diff --git a/lib/main.dart b/lib/main.dart index 3ee07f5..cb144e5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -17,6 +17,11 @@ import 'package:tetra_stats/views/calc_view.dart'; late final PackageInfo packageInfo; late SharedPreferences prefs; +ColorScheme sheme = ColorScheme.dark(primary: Colors.cyanAccent, secondary: Colors.white); + +void setAccentColor(Color color){ + sheme = ColorScheme.dark(primary: color, secondary: Colors.white); +} void main() async { if (kIsWeb) { @@ -63,7 +68,7 @@ class MyApp extends StatelessWidget { routes: {"/settings": (context) => const SettingsView(), "/states": (context) => const TrackedPlayersView(), "/calc": (context) => const CalcView(), "/customization": (context) => const CustomizationView()}, theme: ThemeData( fontFamily: 'Eurostile Round', - colorScheme: ColorScheme.dark(primary: Colors.cyanAccent, secondary: Colors.white), + colorScheme: sheme, scaffoldBackgroundColor: Colors.black ) ); diff --git a/lib/views/customization_view.dart b/lib/views/customization_view.dart index 7dab3d7..9a41524 100644 --- a/lib/views/customization_view.dart +++ b/lib/views/customization_view.dart @@ -4,6 +4,7 @@ import 'package:flutter_colorpicker/flutter_colorpicker.dart'; import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:tetra_stats/gen/strings.g.dart'; +import 'package:tetra_stats/main.dart'; import 'package:window_manager/window_manager.dart'; late String oldWindowTitle; @@ -45,7 +46,7 @@ class CustomizationState extends State { } ThemeData getTheme(BuildContext context, Color color){ - return Theme.of(context).copyWith(); + return Theme.of(context).copyWith(colorScheme: ColorScheme.dark(primary: color, secondary: Colors.white)); } @override @@ -62,65 +63,62 @@ class CustomizationState extends State { title: Text(t.settings), ), backgroundColor: Colors.black, - body: Theme( - data: getTheme(context, currentColor), - child: SafeArea( - child: ListView( - children: [ - ListTile( - title: Text("Accent Color"), - trailing: ColorIndicator(HSVColor.fromColor(Theme.of(context).primaryColorDark)), - onTap: () { - showDialog( - context: context, - builder: (BuildContext context) => AlertDialog( - title: const Text('Pick a color!'), - content: SingleChildScrollView( - child: ColorPicker( - pickerColor: pickerColor, - onColorChanged: changeColor, - ), - // Use Material color picker: - // - // child: MaterialPicker( - // pickerColor: pickerColor, - // onColorChanged: changeColor, - // showLabel: true, // only on portrait mode - // ), - // - // Use Block color picker: - // - // child: BlockPicker( - // pickerColor: currentColor, - // onColorChanged: changeColor, - // ), - // - // child: MultipleChoiceBlockPicker( - // pickerColors: currentColors, - // onColorsChanged: changeColors, - // ), + body: SafeArea( + child: ListView( + children: [ + ListTile( + title: Text("Accent Color"), + trailing: ColorIndicator(HSVColor.fromColor(Theme.of(context).colorScheme.primary)), + onTap: () { + showDialog( + context: context, + builder: (BuildContext context) => AlertDialog( + title: const Text('Pick a color!'), + content: SingleChildScrollView( + child: ColorPicker( + pickerColor: pickerColor, + onColorChanged: changeColor, ), - actions: [ - ElevatedButton( - child: const Text('Got it'), - onPressed: () { - setState(() { - currentColor = pickerColor; - }); - Navigator.of(context).pop(); - }, - ), - ])); - }), - ListTile( - title: Text("Font"), - ), - ListTile( - title: Text("Stats Table in TL mathes list"), - ), - ], - )), - ), + // Use Material color picker: + // + // child: MaterialPicker( + // pickerColor: pickerColor, + // onColorChanged: changeColor, + // showLabel: true, // only on portrait mode + // ), + // + // Use Block color picker: + // + // child: BlockPicker( + // pickerColor: currentColor, + // onColorChanged: changeColor, + // ), + // + // child: MultipleChoiceBlockPicker( + // pickerColors: currentColors, + // onColorsChanged: changeColors, + // ), + ), + actions: [ + ElevatedButton( + child: const Text('Got it'), + onPressed: () { + setState(() { + setAccentColor(pickerColor); + }); + Navigator.of(context).pop(); + }, + ), + ])); + }), + ListTile( + title: Text("Font"), + ), + ListTile( + title: Text("Stats Table in TL mathes list"), + ), + ], + )), ); } } diff --git a/lib/views/tl_match_view.dart b/lib/views/tl_match_view.dart index e4b9514..a08d02d 100644 --- a/lib/views/tl_match_view.dart +++ b/lib/views/tl_match_view.dart @@ -3,9 +3,7 @@ import 'dart:io'; import 'package:tetra_stats/services/crud_exceptions.dart'; import 'package:tetra_stats/widgets/vs_graphs.dart'; - import 'main_view.dart' show teto; -import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart';