From a15772226eb9648061e4ddddc5eba7f4d18a66fd Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Mon, 8 Nov 2021 10:52:04 +0100 Subject: [PATCH] Remove pink --- .../widgets/home_page/downloader_menu.dart | 71 +++++++++---------- .../widgets/home_page/home_page_button.dart | 4 -- lib/src/widgets/home_page/main_menu.dart | 69 +++++++++--------- 3 files changed, 67 insertions(+), 77 deletions(-) diff --git a/lib/src/widgets/home_page/downloader_menu.dart b/lib/src/widgets/home_page/downloader_menu.dart index da29fd7..400dbb7 100644 --- a/lib/src/widgets/home_page/downloader_menu.dart +++ b/lib/src/widgets/home_page/downloader_menu.dart @@ -28,46 +28,43 @@ class _DownloaderMenuState extends State with PreferencesMixin { @override Widget build(BuildContext context) { return Expanded( - child: Container( - // color: Colors.pink, - child: Column( - children: [ - Row( - children: [ - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: const [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 12), - child: HomePageButtonGroup(), - ) - ], - ), + child: Column( + children: [ + Row( + children: [ + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: const [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 12), + child: HomePageButtonGroup(), + ) + ], ), - ], - ), - InkWell( - onTap: () async { - var folder = await FilePicker.platform - .getDirectoryPath(dialogTitle: "Pick a folder"); - if (folder != null) { - setState(() { - Directory.current = folder; - }); - savePreference(prefWorkingDirectory, Directory.current.path); - } - }, - child: Text( - "Working directory : ${Directory.current.path}", - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith(color: Colors.white), ), + ], + ), + InkWell( + onTap: () async { + var folder = await FilePicker.platform + .getDirectoryPath(dialogTitle: "Pick a folder"); + if (folder != null) { + setState(() { + Directory.current = folder; + }); + savePreference(prefWorkingDirectory, Directory.current.path); + } + }, + child: Text( + "Working directory : ${Directory.current.path}", + style: Theme.of(context) + .textTheme + .subtitle1! + .copyWith(color: Colors.white), ), - ], - ), + ), + ], ), ); } diff --git a/lib/src/widgets/home_page/home_page_button.dart b/lib/src/widgets/home_page/home_page_button.dart index 3ea78b4..53e0d16 100644 --- a/lib/src/widgets/home_page/home_page_button.dart +++ b/lib/src/widgets/home_page/home_page_button.dart @@ -34,10 +34,6 @@ class HomePageButton extends StatelessWidget { ), ), ElevatedButton( - // style: ElevatedButton.styleFrom( - // primary: Colors.white, - // onPrimary: Colors.pink, - // ), onPressed: onPressed, child: Padding( padding: const EdgeInsets.fromLTRB(0, 16, 0, 16), diff --git a/lib/src/widgets/home_page/main_menu.dart b/lib/src/widgets/home_page/main_menu.dart index 6164fce..a0b20e7 100644 --- a/lib/src/widgets/home_page/main_menu.dart +++ b/lib/src/widgets/home_page/main_menu.dart @@ -9,42 +9,39 @@ class MainMenu extends StatelessWidget { @override Widget build(BuildContext context) { return Expanded( - child: Container( - // color: Colors.pink, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - HomePageButton( - onPressed: () { - Navigator.of(context).push( - PageRouteBuilder( - fullscreenDialog: true, - pageBuilder: (context, animation1, animation2) => - const Manager(), - transitionDuration: Duration.zero, - ), - ); - }, - text: 'Manage existing machines', - ), - HomePageButton( - onPressed: () { - //Navigator.of(context).push(MaterialPageRoute(builder: (context) => const DownloaderPage())); - Navigator.of(context).push( - PageRouteBuilder( - fullscreenDialog: true, - pageBuilder: (context, animation1, animation2) => - const DownloaderPage(), - transitionDuration: Duration.zero, - ), - ); - }, - text: 'Create new machines', - ), - ], - ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + HomePageButton( + onPressed: () { + Navigator.of(context).push( + PageRouteBuilder( + fullscreenDialog: true, + pageBuilder: (context, animation1, animation2) => + const Manager(), + transitionDuration: Duration.zero, + ), + ); + }, + text: 'Manage existing machines', + ), + HomePageButton( + onPressed: () { + //Navigator.of(context).push(MaterialPageRoute(builder: (context) => const DownloaderPage())); + Navigator.of(context).push( + PageRouteBuilder( + fullscreenDialog: true, + pageBuilder: (context, animation1, animation2) => + const DownloaderPage(), + transitionDuration: Duration.zero, + ), + ); + }, + text: 'Create new machines', + ), + ], ), ), );