diff --git a/lib/main.dart b/lib/main.dart index c821939..467ab94 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -20,7 +20,19 @@ class WealthWaveApp extends StatelessWidget { title: 'Wealth Wave', debugShowCheckedModeBanner: false, theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.teal), + colorScheme: const ColorScheme.light( + primary: Colors.teal, // A deep green, conveys stability and growth + secondary: Colors.white, // A lighter teal, for a refreshing, modern feel + surface: Colors.white, // A very light teal for backgrounds, provides contrast + background: Colors.white, // A soft blue, calming and trustworthy + error: Colors.red, // Standard error color for visibility + onPrimary: Colors.white, // White text/icons on primary color for readability + onSecondary: Colors.black, // Black text/icons on secondary for contrast and readability + onSurface: Colors.black, // Black text/icons on surface color for readability + onBackground: Colors.black, // Black text/icons on background for readability + onError: Colors.white, // White text/icons on error color for readability + brightness: Brightness.light, // Overall brightness, light theme + ), useMaterial3: true, ), onGenerateRoute: (settings) { diff --git a/lib/ui/pages/baskets_page.dart b/lib/ui/pages/baskets_page.dart index 2bb1e0f..ba2927d 100644 --- a/lib/ui/pages/baskets_page.dart +++ b/lib/ui/pages/baskets_page.dart @@ -26,7 +26,6 @@ class _BasketsPage return Scaffold( appBar: AppBar( title: const Text('Baskets'), - backgroundColor: Theme.of(context).colorScheme.inversePrimary, ), body: Center( child: ListView.builder( diff --git a/lib/ui/pages/dashboard_page.dart b/lib/ui/pages/dashboard_page.dart index cf9e2c9..72e9bba 100644 --- a/lib/ui/pages/dashboard_page.dart +++ b/lib/ui/pages/dashboard_page.dart @@ -31,11 +31,7 @@ class _DashboardPage final irrComposition = snapshot.irrComposition.entries.toList(); irrComposition.sort((a, b) => a.key.compareTo(b.key)); - return Scaffold( - appBar: AppBar( - title: const Text('Investment Portfolio Dashboard'), - ), - body: SingleChildScrollView( + return SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(AppDimen.defaultPadding), child: Column( @@ -78,8 +74,7 @@ class _DashboardPage ], ), ), - ), - ); + ); } Widget _buildPieChart(Map data) { @@ -226,11 +221,13 @@ class _DashboardPage dataSource: invested, xValueMapper: (data, _) => data.key, yValueMapper: (data, _) => data.value, + color: Colors.blue, ), StackedBarSeries( dataSource: value, xValueMapper: (data, _) => data.key, yValueMapper: (data, _) => data.value, + color: Colors.green, ), ], ); diff --git a/lib/ui/pages/expense_tags_page.dart b/lib/ui/pages/expense_tags_page.dart index 1583be6..77878bf 100644 --- a/lib/ui/pages/expense_tags_page.dart +++ b/lib/ui/pages/expense_tags_page.dart @@ -27,7 +27,6 @@ class _ExpenseTagsPage return Scaffold( appBar: AppBar( title: const Text('Expense Tags'), - backgroundColor: Theme.of(context).colorScheme.inversePrimary, ), body: Center( child: ListView.builder( diff --git a/lib/ui/pages/goal_page.dart b/lib/ui/pages/goal_page.dart index 62485f8..6e0f229 100644 --- a/lib/ui/pages/goal_page.dart +++ b/lib/ui/pages/goal_page.dart @@ -35,7 +35,6 @@ class _GoalPage extends PageState { return Scaffold( appBar: AppBar( title: const Text('Goal'), - backgroundColor: Theme.of(context).colorScheme.inversePrimary, ), body: SingleChildScrollView( child: _goalWidget(context: context, goalVO: goalVO))); diff --git a/lib/ui/pages/investment_page.dart b/lib/ui/pages/investment_page.dart index 3e21ddb..253d7d1 100644 --- a/lib/ui/pages/investment_page.dart +++ b/lib/ui/pages/investment_page.dart @@ -31,7 +31,6 @@ class _InvestmentPage extends PageState { if (snapshot.contentLoading) { return Scaffold( appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.inversePrimary, title: const Text("Wealth Wave"), ), body: const Center( @@ -47,7 +46,6 @@ class _MainPageState extends PageState { return Scaffold( appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.inversePrimary, title: const Text("Wealth Wave"), actions: [ PopupMenuButton(