From 71c43b08b5630cc7be1fac20f478334792d60c07 Mon Sep 17 00:00:00 2001 From: Yannick Mauray Date: Mon, 8 Nov 2021 00:40:29 +0100 Subject: [PATCH] Dark theme --- lib/src/app.dart | 15 ++++++++++----- .../widgets/downloader/cancel_dismiss_button.dart | 3 +++ lib/src/widgets/home_page/downloader_menu.dart | 2 +- lib/src/widgets/home_page/home_page_button.dart | 4 ++-- lib/src/widgets/home_page/main_menu.dart | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/src/app.dart b/lib/src/app.dart index 83688aa..2308476 100644 --- a/lib/src/app.dart +++ b/lib/src/app.dart @@ -1,15 +1,20 @@ import 'package:flutter/material.dart'; import 'package:quickgui/src/pages/main_page.dart'; -class App extends StatelessWidget { +class App extends StatefulWidget { const App({Key? key}) : super(key: key); + @override + State createState() => _AppState(); +} + +class _AppState extends State { @override Widget build(BuildContext context) { return MaterialApp( - theme: ThemeData( - primarySwatch: Colors.pink, - ), - home: const MainPage(title: 'Quickgui - A Flutter frontend for Quickget and Quickemu')); + theme: ThemeData(primarySwatch: Colors.pink), + darkTheme: ThemeData.dark(), + home: const MainPage(title: 'Quickgui - A Flutter frontend for Quickget and Quickemu'), + ); } } diff --git a/lib/src/widgets/downloader/cancel_dismiss_button.dart b/lib/src/widgets/downloader/cancel_dismiss_button.dart index 1fb5ada..0a2648d 100644 --- a/lib/src/widgets/downloader/cancel_dismiss_button.dart +++ b/lib/src/widgets/downloader/cancel_dismiss_button.dart @@ -18,6 +18,9 @@ class CancelDismissButton extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ ElevatedButton( + style: ElevatedButton.styleFrom( + primary: Theme.of(context).colorScheme.surface, + ), onPressed: !downloadFinished ? onCancel : () { diff --git a/lib/src/widgets/home_page/downloader_menu.dart b/lib/src/widgets/home_page/downloader_menu.dart index 8bab364..c0eb3f1 100644 --- a/lib/src/widgets/home_page/downloader_menu.dart +++ b/lib/src/widgets/home_page/downloader_menu.dart @@ -29,7 +29,7 @@ class _DownloaderMenuState extends State with PreferencesMixin { Widget build(BuildContext context) { return Expanded( child: Container( - color: Colors.pink, + color: Theme.of(context).brightness == Brightness.dark ? Theme.of(context).colorScheme.surface : Theme.of(context).colorScheme.primary, child: Column( children: [ Row( diff --git a/lib/src/widgets/home_page/home_page_button.dart b/lib/src/widgets/home_page/home_page_button.dart index 9df309d..e3194a8 100644 --- a/lib/src/widgets/home_page/home_page_button.dart +++ b/lib/src/widgets/home_page/home_page_button.dart @@ -32,8 +32,8 @@ class HomePageButton extends StatelessWidget { ), ElevatedButton( style: ElevatedButton.styleFrom( - primary: Colors.white, - onPrimary: Colors.pink, + primary: Theme.of(context).canvasColor, //Theme.of(context).canvasColor + onPrimary: Theme.of(context).brightness == Brightness.dark ? Colors.white70 : Theme.of(context).colorScheme.primary, ), onPressed: onPressed, child: Padding( diff --git a/lib/src/widgets/home_page/main_menu.dart b/lib/src/widgets/home_page/main_menu.dart index 27b8020..47de3df 100644 --- a/lib/src/widgets/home_page/main_menu.dart +++ b/lib/src/widgets/home_page/main_menu.dart @@ -10,7 +10,7 @@ class MainMenu extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Container( - color: Colors.pink, + color: Theme.of(context).brightness == Brightness.dark ? Theme.of(context).colorScheme.surface : Theme.of(context).colorScheme.primary, child: Padding( padding: const EdgeInsets.all(8.0), child: Row(