diff --git a/lib/src/pages/drawer/about.dart b/lib/src/pages/drawer/about.dart index 8f4a509f0c..012ad6b1c0 100644 --- a/lib/src/pages/drawer/about.dart +++ b/lib/src/pages/drawer/about.dart @@ -19,7 +19,8 @@ class AboutPage extends StatelessWidget { }, ), title: Text(AppLocalizations.of(context)!.aboutUs), - backgroundColor: Color(0xFFDC4654), + backgroundColor: + isDarkMode ? Color.fromRGBO(58, 21, 31, 1) : Color(0xFFDC4654), ), body: SingleChildScrollView( padding: EdgeInsets.symmetric(horizontal: 20), diff --git a/lib/src/pages/drawer/legal.dart b/lib/src/pages/drawer/legal.dart index 66544727d8..ac3ce4e0ff 100644 --- a/lib/src/pages/drawer/legal.dart +++ b/lib/src/pages/drawer/legal.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import '../pages_import.dart'; - /// Page stating the legal Terms and Conditions and Privacy /// Policy applying to the BLT project. class LegalPage extends StatelessWidget { @@ -9,6 +8,7 @@ class LegalPage extends StatelessWidget { @override Widget build(BuildContext context) { + final isDarkMode = Theme.of(context).brightness == Brightness.dark; return Scaffold( appBar: AppBar( leading: IconButton( @@ -20,7 +20,8 @@ class LegalPage extends StatelessWidget { }, ), title: Text(AppLocalizations.of(context)!.termsOfService), - backgroundColor: Color(0xFFDC4654), + backgroundColor: + isDarkMode ? Color.fromRGBO(58, 21, 31, 1) : Color(0xFFDC4654), ), body: SingleChildScrollView( padding: EdgeInsets.symmetric(horizontal: 20), diff --git a/lib/src/pages/drawer/referral.dart b/lib/src/pages/drawer/referral.dart index 4e5afc5577..f85a87edeb 100644 --- a/lib/src/pages/drawer/referral.dart +++ b/lib/src/pages/drawer/referral.dart @@ -1,7 +1,6 @@ import 'package:blt/src/pages/pages_import.dart'; import 'package:flutter/material.dart'; - /// Page for allowing users to send referrals to their friends. class ReferralPage extends StatefulWidget { const ReferralPage({Key? key}) : super(key: key); @@ -22,6 +21,7 @@ class _ReferralPageState extends State { @override Widget build(BuildContext context) { final Size size = MediaQuery.of(context).size; + final isDarkMode = Theme.of(context).brightness == Brightness.dark; return Scaffold( appBar: AppBar( @@ -34,7 +34,8 @@ class _ReferralPageState extends State { }, ), title: Text(AppLocalizations.of(context)!.invite), - backgroundColor: Color(0xFFDC4654), + backgroundColor: + isDarkMode ? Color.fromRGBO(58, 21, 31, 1) : Color(0xFFDC4654), ), body: SingleChildScrollView( child: Container( @@ -78,7 +79,9 @@ class _ReferralPageState extends State { children: [ Icon( Icons.group, - color: Color(0xFFDC4654), + color: isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), size: 250, ), Container( @@ -124,7 +127,9 @@ class _ReferralPageState extends State { ), ), backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), ), diff --git a/lib/src/pages/drawer/social.dart b/lib/src/pages/drawer/social.dart index 1ebabbca67..3bbb8b7792 100644 --- a/lib/src/pages/drawer/social.dart +++ b/lib/src/pages/drawer/social.dart @@ -2,7 +2,6 @@ import 'package:blt/src/pages/pages_import.dart'; import 'package:flutter/material.dart'; //import 'package:flutter_inappwebview/flutter_inappwebview.dart'; - class SocialPage extends ConsumerStatefulWidget { const SocialPage({Key? key}) : super(key: key); @@ -23,6 +22,7 @@ class _SocialPageState extends ConsumerState { @override Widget build(BuildContext context) { + final isDarkMode = Theme.of(context).brightness == Brightness.dark; return Scaffold( appBar: AppBar( leading: IconButton( @@ -34,7 +34,8 @@ class _SocialPageState extends ConsumerState { }, ), title: Text(AppLocalizations.of(context)!.social), - backgroundColor: Color(0xFFDC4654), + backgroundColor: + isDarkMode ? Color.fromRGBO(58, 21, 31, 1) : Color(0xFFDC4654), ), body: Column( crossAxisAlignment: CrossAxisAlignment.center, @@ -52,7 +53,8 @@ class _SocialPageState extends ConsumerState { style: GoogleFonts.aBeeZee( textStyle: TextStyle( fontSize: 20, - color: Color(0xFFDC4654), + color: + isDarkMode ? Colors.white : Color(0xFFDC4654), ), fontWeight: FontWeight.bold, ), @@ -70,7 +72,9 @@ class _SocialPageState extends ConsumerState { padding: EdgeInsets.only( top: 10, bottom: 10, left: 20, right: 20), decoration: BoxDecoration( - color: Color(0xFFDC4654), + color: isDarkMode + ? Color.fromRGBO(82, 30, 44, 1) + : Color(0xFFDC4654), borderRadius: BorderRadius.circular(10)), width: MediaQuery.of(context).size.width * 0.85, child: Row( @@ -113,7 +117,9 @@ class _SocialPageState extends ConsumerState { padding: EdgeInsets.only( top: 10, bottom: 10, left: 20, right: 20), decoration: BoxDecoration( - color: Color(0xFFDC4654), + color: isDarkMode + ? Color.fromRGBO(82, 30, 44, 1) + : Color(0xFFDC4654), borderRadius: BorderRadius.circular(10)), width: MediaQuery.of(context).size.width * 0.85, child: Row( @@ -152,7 +158,9 @@ class _SocialPageState extends ConsumerState { padding: EdgeInsets.only( top: 10, bottom: 10, left: 20, right: 20), decoration: BoxDecoration( - color: Color(0xFFDC4654), + color: isDarkMode + ? Color.fromRGBO(82, 30, 44, 1) + : Color(0xFFDC4654), borderRadius: BorderRadius.circular(10)), width: MediaQuery.of(context).size.width * 0.85, child: Row( diff --git a/lib/src/pages/home/home.dart b/lib/src/pages/home/home.dart index 18ff00387b..8a97e01e84 100644 --- a/lib/src/pages/home/home.dart +++ b/lib/src/pages/home/home.dart @@ -233,12 +233,17 @@ class _HomeState extends ConsumerState { : Theme.of(context).canvasColor, appBar: buildAppBar(context: context), drawer: Drawer( + backgroundColor: isDarkMode.isDarkMode + ? Color.fromRGBO(58, 21, 31, 1) + : Theme.of(context).canvasColor, child: ListView( padding: EdgeInsets.zero, children: [ UserAccountsDrawerHeader( decoration: BoxDecoration( - color: Color(0xFFDC4654), + color: isDarkMode.isDarkMode + ? Color.fromRGBO(58, 21, 31, 1) + : Color(0xFFDC4654), ), accountName: Text( currentUser!.username!, @@ -352,7 +357,9 @@ class _HomeState extends ConsumerState { ), ), backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode.isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), onPressed: () async { diff --git a/lib/src/pages/home/issues.dart b/lib/src/pages/home/issues.dart index 072f3a75a8..832b50f7be 100644 --- a/lib/src/pages/home/issues.dart +++ b/lib/src/pages/home/issues.dart @@ -51,10 +51,10 @@ class IssuesPageState extends ConsumerState Widget build(BuildContext context) { final Size size = MediaQuery.of(context).size; final issueState = ref.watch(issueListProvider); - final isDarkMode = ref.watch(darkModeProvider); + final isDarkMode = Theme.of(context).brightness == Brightness.dark; return Scaffold( - backgroundColor: isDarkMode.isDarkMode + backgroundColor: isDarkMode ? Color.fromRGBO(34, 22, 23, 1) : Theme.of(context).canvasColor, body: RefreshIndicator( @@ -69,7 +69,7 @@ class IssuesPageState extends ConsumerState Container( padding: EdgeInsets.symmetric(horizontal: 20), width: size.width, - color: isDarkMode.isDarkMode + color: isDarkMode ? Color.fromRGBO(34, 22, 23, 1) : Theme.of(context).canvasColor, child: Column( diff --git a/lib/src/pages/home/report_bug.dart b/lib/src/pages/home/report_bug.dart index 785172e2b3..850bf21daa 100644 --- a/lib/src/pages/home/report_bug.dart +++ b/lib/src/pages/home/report_bug.dart @@ -367,6 +367,7 @@ class _ReportFormState extends ConsumerState { @override Widget build(BuildContext context) { + final isDarkMode = Theme.of(context).brightness == Brightness.dark; return Form( key: _formKey, child: Column( @@ -409,7 +410,9 @@ class _ReportFormState extends ConsumerState { } }, decoration: InputDecoration( - hintText: (_titleFocusNode.hasFocus) ? AppLocalizations.of(context)!.exampleURL : AppLocalizations.of(context)!.url, + hintText: (_titleFocusNode.hasFocus) + ? AppLocalizations.of(context)!.exampleURL + : AppLocalizations.of(context)!.url, enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all( Radius.circular(8.0), @@ -468,7 +471,9 @@ class _ReportFormState extends ConsumerState { borderRadius: BorderRadius.all( Radius.circular(8), ), - color: Color(0xFFDC4654), + color: isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), child: Center( child: Builder(builder: (context) { @@ -520,7 +525,9 @@ class _ReportFormState extends ConsumerState { backgroundColor: MaterialStateProperty.all( duplicateVerified ? Color(0xFF50C878) - : Color(0xFFDC4654), + : isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), onPressed: () async { @@ -724,7 +731,9 @@ class _ReportFormState extends ConsumerState { ), ), backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), onPressed: () async { @@ -896,7 +905,9 @@ class _ReportFormState extends ConsumerState { ), ), backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), onPressed: () async { diff --git a/lib/src/pages/home/start_hunt.dart b/lib/src/pages/home/start_hunt.dart index 7f0dbbb30d..ba42e861c8 100644 --- a/lib/src/pages/home/start_hunt.dart +++ b/lib/src/pages/home/start_hunt.dart @@ -79,6 +79,7 @@ class _HuntFormState extends State { @override Widget build(BuildContext context) { + final isDarkMode = Theme.of(context).brightness == Brightness.dark; return Form( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -145,7 +146,9 @@ class _HuntFormState extends State { }, style: ButtonStyle( backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), ), @@ -169,7 +172,9 @@ class _HuntFormState extends State { }, style: ButtonStyle( backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), ), @@ -199,7 +204,9 @@ class _HuntFormState extends State { decoration: BoxDecoration( border: _image.path == "" ? Border.all( - color: Color(0xFFDC4654), + color: isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), width: 0.5, ) : null, @@ -280,7 +287,9 @@ class _HuntFormState extends State { ), ), backgroundColor: MaterialStateProperty.all( - Color(0xFFDC4654), + isDarkMode + ? Color.fromRGBO(126, 33, 58, 1) + : Color(0xFFDC4654), ), ), onPressed: () {}, diff --git a/lib/src/util/theme_data.dart b/lib/src/util/theme_data.dart index 897eefa6f1..f73d7961d8 100644 --- a/lib/src/util/theme_data.dart +++ b/lib/src/util/theme_data.dart @@ -2,11 +2,13 @@ import 'package:flutter/material.dart'; class AppTheme { static ThemeData lightTheme = ThemeData( + useMaterial3: true, primarySwatch: Colors.red, primaryColor: Colors.white, visualDensity: VisualDensity.adaptivePlatformDensity, brightness: Brightness.light); - static ThemeData darkTheme = - ThemeData.dark().copyWith(brightness: Brightness.dark); + static ThemeData darkTheme = ThemeData.dark( + useMaterial3: true, + ).copyWith(brightness: Brightness.dark); }