From 1957c0711cecd2ab2a8ea23cac40376daea7a089 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Sun, 11 May 2025 22:53:10 +0200
Subject: [PATCH] Make the account screen a bit nicer

---
 lib/ui/pages/account/account.dart             | 18 ++++++------
 lib/ui/pages/account/total_balance_card.dart  | 29 +++++++------------
 .../account/upcoming_transactions_card.dart   | 15 +++-------
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/lib/ui/pages/account/account.dart b/lib/ui/pages/account/account.dart
index 165d082..3c9cb05 100644
--- a/lib/ui/pages/account/account.dart
+++ b/lib/ui/pages/account/account.dart
@@ -169,17 +169,17 @@ class AccountListPageState extends State<AccountListPage> {
               ),
             ),
 
-            Padding(
-              padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
-              child: TotalBalanceCard(),
-            ),
-
-            Padding(
-              padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
-              child: UpcomingTransactionsCard(),
-            ),
             Wrap(
               children: [
+                Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+                  child: TotalBalanceCard(),
+                ),
+
+                Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+                  child: UpcomingTransactionsCard(),
+                ),
                 Padding(padding: EdgeInsets.all(8), child: BreakdownCard()),
               ],
             ),
diff --git a/lib/ui/pages/account/total_balance_card.dart b/lib/ui/pages/account/total_balance_card.dart
index 8cdbc66..2d629ec 100644
--- a/lib/ui/pages/account/total_balance_card.dart
+++ b/lib/ui/pages/account/total_balance_card.dart
@@ -4,6 +4,7 @@ import 'package:okane/database/collections/account.dart';
 import 'package:okane/database/database.dart';
 import 'package:okane/ui/state/core.dart';
 import 'package:okane/ui/utils.dart';
+import 'package:okane/ui/widgets/piechart_card.dart';
 
 class TotalBalanceCard extends StatelessWidget {
   const TotalBalanceCard({super.key});
@@ -22,26 +23,18 @@ class TotalBalanceCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<CoreCubit, CoreState>(
       builder: (context, state) {
-        return Card(
+        return ResponsiveCard(
+          titleText: "Total Balance",
           child: Padding(
             padding: EdgeInsets.all(16),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Text(
-                  "Total balance",
-                  style: Theme.of(context).textTheme.titleLarge,
-                ),
-                FutureBuilder(
-                  future: _getTotalBalance(state.accounts),
-                  builder: (context, snapshot) {
-                    return Text(
-                      snapshot.hasData ? formatCurrency(snapshot.data!) : "...",
-                      style: Theme.of(context).textTheme.bodyLarge,
-                    );
-                  },
-                ),
-              ],
+            child: FutureBuilder(
+              future: _getTotalBalance(state.accounts),
+              builder: (context, snapshot) {
+                return Text(
+                  snapshot.hasData ? formatCurrency(snapshot.data!) : "...",
+                  style: Theme.of(context).textTheme.bodyLarge,
+                );
+              },
             ),
           ),
         );
diff --git a/lib/ui/pages/account/upcoming_transactions_card.dart b/lib/ui/pages/account/upcoming_transactions_card.dart
index 857fab1..7498728 100644
--- a/lib/ui/pages/account/upcoming_transactions_card.dart
+++ b/lib/ui/pages/account/upcoming_transactions_card.dart
@@ -7,6 +7,7 @@ import 'package:okane/database/database.dart';
 import 'package:okane/ui/state/core.dart';
 import 'package:okane/ui/utils.dart';
 import 'package:okane/ui/widgets/add_transaction.dart';
+import 'package:okane/ui/widgets/piechart_card.dart';
 
 class UpcomingTransactionsCard extends StatelessWidget {
   const UpcomingTransactionsCard({super.key});
@@ -72,19 +73,11 @@ class UpcomingTransactionsCard extends StatelessWidget {
                       ),
                     )
                     .toList();
-        return Card(
+        return ResponsiveCard(
+          titleText: "Upcoming Transactions",
           child: Padding(
             padding: const EdgeInsets.all(16),
-            child: Column(
-              children:
-                  <Widget>[
-                    Text(
-                      "Upcoming Transactions",
-                      style: Theme.of(context).textTheme.titleLarge,
-                    ),
-                  ] +
-                  transactions,
-            ),
+            child: Column(children: transactions),
           ),
         );
       },