From 3bc325763a9ed87364434be6dd5960a3a0e14fa5 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 29 Jan 2025 14:57:46 +0100 Subject: [PATCH] added default theme --- lib/main.dart | 7 +++---- lib/theme.dart | 35 ++++++++++++++++++++++++++++++++++ lib/widgets/reading_graph.dart | 4 +++- 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 lib/theme.dart diff --git a/lib/main.dart b/lib/main.dart index 501bd1a..cdcb44b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,6 +7,8 @@ import 'pages/main_navigation_scaffold.dart'; import 'services/flood_station_provider.dart'; import 'package:timezone/data/latest.dart' as tz; +import 'theme.dart'; + void main() { runApp( ChangeNotifierProvider( @@ -24,10 +26,7 @@ class MyApp extends StatelessWidget { tz.initializeTimeZones(); return MaterialApp( title: 'Floodwatch', - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - useMaterial3: true, - fontFamily: 'UbuntuSansMono'), + theme: defaultTheme, initialRoute: MainNavigationScaffold.routeName, routes: { MainNavigationScaffold.routeName: (context) => MainNavigationScaffold(), diff --git a/lib/theme.dart b/lib/theme.dart new file mode 100644 index 0000000..1df9ad8 --- /dev/null +++ b/lib/theme.dart @@ -0,0 +1,35 @@ +import 'package:flutter/material.dart'; + +ThemeData get defaultTheme { + return ThemeData( + fontFamily: 'UbuntuSansMono', + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.amber, + brightness: Brightness.light, + ), + textTheme: _defaultTextTheme, + ); +} + +ThemeData get defaultDarkTheme { + return ThemeData( + fontFamily: 'UbuntuSansMono', + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.lightGreen, + brightness: Brightness.dark, + ), + textTheme: _defaultTextTheme, + ); +} + +TextTheme get _defaultTextTheme => TextTheme( + titleLarge: TextStyle( + fontWeight: FontWeight.w800, + ), + titleMedium: TextStyle( + fontWeight: FontWeight.w800, + ), + titleSmall: TextStyle( + fontWeight: FontWeight.w800, + ), + ); diff --git a/lib/widgets/reading_graph.dart b/lib/widgets/reading_graph.dart index 7907469..3984051 100644 --- a/lib/widgets/reading_graph.dart +++ b/lib/widgets/reading_graph.dart @@ -48,12 +48,14 @@ class ReadingGraph extends StatelessWidget { ), lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( + getTooltipColor: (touchedSpot) => + Theme.of(context).colorScheme.primaryContainer, getTooltipItems: (touchedSpots) { return touchedSpots.map((touchedSpot) { return LineTooltipItem( '${touchedSpot.y.toString()}\n${_getLongDate(touchedSpot.x)}', TextStyle( - color: Theme.of(context).colorScheme.onPrimary, + color: Theme.of(context).colorScheme.onPrimaryContainer, fontWeight: FontWeight.bold)); }).toList(); },