Indicate the active account

lib/ui/navigation.dart

@@ -8,6 +8,7 @@ import 'package:okane/ui/pages/template_list.dart';
 import 'package:okane/ui/pages/transaction_details.dart';
 import 'package:okane/ui/pages/transaction_list.dart';
 import 'package:okane/ui/state/core.dart';
+import 'package:okane/ui/widgets/account_indicator.dart';
 
 enum OkanePage { accounts, transactions, beneficiaries, templates, budgets }
 
@@ -19,6 +20,7 @@ class OkanePageItem {
   final String label;
   final Widget child;
   final OkanePageBuilder? details;
+  final bool showAccountName;
 
   const OkanePageItem(
     this.page,
@@ -26,6 +28,7 @@ class OkanePageItem {
     this.label,
     this.child,
     this.details,
+    this.showAccountName,
   );
 
   NavigationDestination toDestination() =>
@@ -42,6 +45,7 @@ final _pages = <OkanePageItem>[
     "Accounts",
     AccountListPage(isPage: false),
     null,
+    false,
   ),
   OkanePageItem(
     OkanePage.transactions,
@@ -49,6 +53,7 @@ final _pages = <OkanePageItem>[
     "Transactions",
     TransactionListPage(),
     (_) => TransactionDetailsPage(),
+    true,
   ),
   OkanePageItem(
     OkanePage.beneficiaries,
@@ -56,6 +61,7 @@ final _pages = <OkanePageItem>[
     "Beneficiaries",
     Container(),
     null,
+    true,
   ),
   OkanePageItem(
     OkanePage.templates,
@@ -63,6 +69,7 @@ final _pages = <OkanePageItem>[
     "Templates",
     TemplateListPage(),
     null,
+    true,
   ),
   OkanePageItem(
     OkanePage.budgets,
@@ -70,6 +77,7 @@ final _pages = <OkanePageItem>[
     "Budgets",
     BudgetListPage(),
     (_) => BudgetDetailsPage(),
+    true,
   ),
 ];
 
@@ -113,19 +121,25 @@ class OkaneNavigationDrawer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<CoreCubit, CoreState>(
-        builder: (context, state) => Drawer(
+      builder:
-          child: ListView(
+          (context, state) => Drawer(
-            children: _pages.map((p) => ListTile(
+            child: ListView(
-              title: Text(p.label),
+              children:
-              leading: Icon(p.icon),
+                  _pages
-              selected: p.page == state.activePage,
+                      .map(
-              onTap: () {
+                        (p) => ListTile(
-                context.read<CoreCubit>().setPage(p.page);
+                          title: Text(p.label),
-                Navigator.of(context).pop();
+                          leading: Icon(p.icon),
-              },
+                          selected: p.page == state.activePage,
-            )).toList(),
+                          onTap: () {
+                            context.read<CoreCubit>().setPage(p.page);
+                            Navigator.of(context).pop();
+                          },
+                        ),
+                      )
+                      .toList(),
+            ),
           ),
-        ),
     );
   }
 }
@@ -158,6 +172,20 @@ class OkaneNavigationLayout extends StatelessWidget {
                                         Scaffold.of(context).openDrawer();
                                       },
                                     ),
+
+                                    if (p.showAccountName)
+                                    Padding(
+                                      padding: EdgeInsets.only(left: 8),
+                                      child: Text(
+                                        state
+                                            .accounts[state.activeAccountIndex!]
+                                            .name!,
+                                        style:
+                                            Theme.of(
+                                              context,
+                                            ).textTheme.titleLarge,
+                                      ),
+                                    ),
                                   ],
                                 ),
                               ),
@@ -165,15 +193,28 @@ class OkaneNavigationLayout extends StatelessWidget {
                             Expanded(child: p.child),
                           ],
                         ),
-                        ScreenSize.normal =>
+                        ScreenSize.normal => Column(
-                          p.details != null
+                          children: [
-                              ? Row(
+                            if (p.showAccountName)
-                                children: [
+                              AccountIndicator(
-                                  Expanded(child: p.child),
+                                accountName:
-                                  Expanded(child: p.details!(false)),
+                                    state
-                                ],
+                                        .accounts[state.activeAccountIndex!]
-                              )
+                                        .name!,
-                              : p.child,
+                              ),
+                            Expanded(
+                              child:
+                                  p.details != null
+                                      ? Row(
+                                        children: [
+                                          Expanded(child: p.child),
+                                          Expanded(child: p.details!(false)),
+                                        ],
+                                      )
+                                      : p.child,
+                            ),
+                          ],
+                        ),
                       },
                     )
                     .toList(),

lib/ui/pages/budgets/budget_details.dart

@@ -1,6 +1,5 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:get_it/get_it.dart';
 import 'package:okane/database/collections/budget.dart';

lib/ui/widgets/account_indicator.dart

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class AccountIndicator extends StatelessWidget {
+  final String accountName;
+
+  const AccountIndicator({super.key, required this.accountName});
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 50,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          Text(
+            accountName,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+        ],
+      )
+    );
+  }
+}

test/widget_test.dart

@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:okane/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}