From 92a2e4c365f79ad76ebf058f85ef572ea9b939b4 Mon Sep 17 00:00:00 2001 From: debuggerx Date: Mon, 27 Sep 2021 00:14:48 +0800 Subject: [PATCH] feat: update theme colors. --- app/lib/pages/gesture_editor.dart | 70 +++++++++++++++++++++------------------ app/lib/pages/local_manager.dart | 5 ++- app/lib/pages/market.dart | 4 +-- app/lib/themes/dark.dart | 2 ++ app/lib/themes/light.dart | 4 ++- 5 files changed, 47 insertions(+), 38 deletions(-) diff --git a/app/lib/pages/gesture_editor.dart b/app/lib/pages/gesture_editor.dart index 54407a8..f5ae806 100644 --- a/app/lib/pages/gesture_editor.dart +++ b/app/lib/pages/gesture_editor.dart @@ -12,44 +12,50 @@ class GestureEditor extends StatelessWidget { Widget build(BuildContext context) { var layoutProvider = context.watch(); return Flexible( - child: Container( - color: Colors.black45, - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Visibility( - visible: layoutProvider.localManagerOpened == false, - child: IconButton( - onPressed: () => H.openPanel(context, PanelType.local_manager), - icon: Icon( - CupertinoIcons.square_list, + child: Padding( + padding: const EdgeInsets.all(10), + child: Container( + decoration: BoxDecoration( + color: context.t.backgroundColor, + borderRadius: BorderRadius.circular(10), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Visibility( + visible: layoutProvider.localManagerOpened == false, + child: IconButton( + onPressed: () => H.openPanel(context, PanelType.local_manager), + icon: Icon( + CupertinoIcons.square_list, + ), ), ), - ), - Visibility( - visible: layoutProvider.marketOpened == false, - child: IconButton( - onPressed: () => H.openPanel(context, PanelType.market), - icon: Icon( - CupertinoIcons.cart, + Visibility( + visible: layoutProvider.marketOpened == false, + child: IconButton( + onPressed: () => H.openPanel(context, PanelType.market), + icon: Icon( + CupertinoIcons.cart, + ), ), ), - ), - ], - ), - Container( - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text("<编辑器区域"), - Text("编辑器区域>"), ], ), - ), - ], + Container( + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text("<编辑器区域"), + Text("编辑器区域>"), + ], + ), + ), + ], + ), ), ), ); diff --git a/app/lib/pages/local_manager.dart b/app/lib/pages/local_manager.dart index c5ced46..78f4b85 100644 --- a/app/lib/pages/local_manager.dart +++ b/app/lib/pages/local_manager.dart @@ -22,9 +22,8 @@ class LocalManager extends StatelessWidget { maxWidth: localManagerPanelWidth, minWidth: localManagerPanelWidth, child: Material( - // color: context.t.backgroundColor, - color: Colors.deepPurple, - elevation: isOpen ? 20 : 0, + color: context.t.backgroundColor, + elevation: isOpen ? 10 : 0, child: Column( mainAxisAlignment: MainAxisAlignment.start, children: [ diff --git a/app/lib/pages/market.dart b/app/lib/pages/market.dart index 061e3b5..16fc90c 100644 --- a/app/lib/pages/market.dart +++ b/app/lib/pages/market.dart @@ -21,8 +21,8 @@ class Market extends StatelessWidget { maxWidth: marketPanelWidth, minWidth: marketPanelWidth, child: Material( - color: Colors.deepPurpleAccent, - elevation: isOpen ? 20 : 0, + color: context.t.backgroundColor, + elevation: isOpen ? 10 : 0, child: Column( mainAxisAlignment: MainAxisAlignment.start, children: [ diff --git a/app/lib/themes/dark.dart b/app/lib/themes/dark.dart index c7d3266..39f81d5 100644 --- a/app/lib/themes/dark.dart +++ b/app/lib/themes/dark.dart @@ -2,4 +2,6 @@ import 'package:flutter/material.dart'; var darkTheme = ThemeData.dark().copyWith( primaryColor: Colors.grey, + scaffoldBackgroundColor: Color(0xff252525), + backgroundColor: Color(0xff282828), ); diff --git a/app/lib/themes/light.dart b/app/lib/themes/light.dart index 4939083..a10c4b4 100644 --- a/app/lib/themes/light.dart +++ b/app/lib/themes/light.dart @@ -2,4 +2,6 @@ import 'package:flutter/material.dart'; var lightTheme = ThemeData.light().copyWith( primaryColor: Colors.blue, -); \ No newline at end of file + scaffoldBackgroundColor: Color(0xfff8f8f8), + backgroundColor: Color(0xffffffff), +);