Merge pull request #82 from layground/dev/mvp

Add weekly and six month analytic charts

Author: agil3st

.gitignore

@@ -55,4 +55,5 @@ lib/firebase_options.dart
 
 .github/instructions/pockaw-instruction.instructions.md
 GEMINI.md
-*.txt
+*.txt
+sqlite

README.md

@@ -134,7 +134,7 @@ Connect with other Pockies, share tips, and contribute to the growth of Pockaw.
 
 ## 📆 Roadmap
 
-### Q1 (Closed Testing #1) - Core Setup & MVP Launch ![100%](https://progress-bar.xyz/100/?width=40)
+### Round 1 (Closed Testing #1) - Core Setup & MVP Launch ![100%](https://progress-bar.xyz/100/?width=40)
 
 * [x] **Splash & Onboarding** - Design and implement welcoming splash screen and onboarding process.
 * [x] **Authentication?** - Just fill personal data for offline use, no registration.
@@ -143,7 +143,7 @@ Connect with other Pockies, share tips, and contribute to the growth of Pockaw.
 * [x] **Custom Categories** - Enable users to create and manage custom categories for better personalization.
 * [x] **Publish on GitHub** - The first fully offline experience of Pockaw.
 
-### Q2 (Open Beta) - Goals & Budgeting with Progression ![100%](https://progress-bar.xyz/100/?width=40)
+### Round 2 (Open Beta) - Goals & Budgeting with Progression ![100%](https://progress-bar.xyz/100/?width=40)
 
 * [x] **Goals Tracking** - Create goals and its checklist items to breakdown your target.
 * [x] **Budget Tracking** - Set monthly/weekly spending budgets and get the visualization.
@@ -153,14 +153,14 @@ Connect with other Pockies, share tips, and contribute to the growth of Pockaw.
 * [x] **Basic Transaction Filters** - Add filters for date, category, and other custom criteria for transactions.
 * [x] **Open Beta Test** - Pockaw will be available on **Google PlayStore** as Early Access open beta test.
 
-### Q3 - Enhanced User Experience ![0%](https://progress-bar.xyz/0/?width=40)
+### Round 3 - Enhanced User Experience ![0%](https://progress-bar.xyz/0/?width=40)
 
 * [ ] **Advanced Summary & Analytics** - Add charts for monthly income/expense trends, custom filters, and analytics.
 * [ ] **Advanced Transaction Filters** - Add filters for date, category, and other custom criteria for transactions.
 * [ ] **Transaction Reminder** - Forgetting things? Chill! Pockaw will remind you to record transactions.
 * [ ] **User Reminders & Notifications** - Implement notifications for due dates and spending goals.
 
-### Q4 - Shields On! ![0%](https://progress-bar.xyz/0/?width=40)
+### Round 4 - Shields On! ![0%](https://progress-bar.xyz/0/?width=40)
 
 * [ ] **Release on Web** - Get a wider view and perspective of Pockaw (of course need a network connection).
 * [ ] **Release on Desktop** - Windows users will get the official desktop look and feel of Pockaw. **

lib/core/components/charts/chart_container.dart

@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:pockaw/core/constants/app_colors.dart';
+import 'package:pockaw/core/constants/app_spacing.dart';
+import 'package:pockaw/core/constants/app_text_styles.dart';
+
+class ChartContainer extends StatelessWidget {
+  final String title;
+  final String subtitle;
+  final Widget chart;
+  final EdgeInsets? margin;
+  final EdgeInsets? padding;
+  final double? height;
+  const ChartContainer({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.chart,
+    this.margin,
+    this.padding,
+    this.height,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: height,
+      margin: margin,
+      padding: padding ?? const EdgeInsets.all(AppSpacing.spacing16),
+      decoration: BoxDecoration(
+        color: context.purpleBackground,
+        borderRadius: BorderRadius.circular(16),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withAlpha(10),
+            blurRadius: 10,
+            offset: const Offset(0, 4),
+          ),
+        ],
+      ),
+      child: Column(
+        spacing: AppSpacing.spacing4,
+        children: [
+          Text(
+            title,
+            style: AppTextStyles.heading6.copyWith(
+              color: context.cardTitleText,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          Text(
+            subtitle,
+            style: AppTextStyles.body3.copyWith(
+              color: context.cardSubtitleText,
+            ),
+          ),
+          Expanded(child: chart),
+        ],
+      ),
+    );
+  }
+}

lib/core/constants/app_colors.dart

@@ -242,6 +242,12 @@ extension ColorExtensions on BuildContext {
   Color get disabledText =>
       themeMode == ThemeMode.dark ? AppColors.neutral700 : AppColors.neutral400;
 
+  Color get cardTitleText =>
+      themeMode == ThemeMode.dark ? AppColors.neutral100 : AppColors.neutral900;
+
+  Color get cardSubtitleText =>
+      themeMode == ThemeMode.dark ? AppColors.neutral300 : AppColors.neutral700;
+
   Color get progressBackground => themeMode == ThemeMode.dark
       ? AppColors.neutral900
       : AppColors.purpleAlpha10;

lib/core/database/pockaw_database.dart

@@ -1,9 +1,5 @@
-import 'dart:io';
-
 import 'package:drift/drift.dart';
-import 'package:drift/native.dart';
-import 'package:flutter/foundation.dart';
-import 'package:path/path.dart';
+import 'package:drift_flutter/drift_flutter.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pockaw/core/database/daos/budget_dao.dart';
 import 'package:pockaw/core/database/daos/category_dao.dart';
@@ -274,17 +270,16 @@ class AppDatabase extends _$AppDatabase {
     Log.i('Populating default wallets...', label: 'database');
     await WalletPopulationService.populate(this);
   }
-}
 
-/// https://github.com/simolus3/drift/issues/188
-LazyDatabase _openConnection() {
-  return LazyDatabase(() async {
-    final dbFolder =
-        await getApplicationSupportDirectory(); // Use support directory for database
-    final file = File(join(dbFolder.path, 'pockaw.sqlite'));
-    if (kDebugMode) {
-      // await file.delete(); // Uncomment for fresh DB on every run in debug
-    }
-    return NativeDatabase(file);
-  });
+  static QueryExecutor _openConnection() {
+    return driftDatabase(
+      name: 'my_database',
+      native: const DriftNativeOptions(
+        // By default, `driftDatabase` from `package:drift_flutter` stores the
+        // database files in `getApplicationDocumentsDirectory()`.
+        databaseDirectory: getApplicationSupportDirectory,
+      ),
+      // If you need web support, see https://drift.simonbinder.eu/platforms/web/
+    );
+  }
 }

lib/core/extensions/date_time_extension.dart

@@ -72,6 +72,7 @@ extension DateTimeExtension on DateTime {
         .inDays;
 
     String baseText;
+    bool useComma = differenceInDays == 0 || differenceInDays == 1;
     if (differenceInDays == 0) {
       baseText = 'Today';
     } else if (differenceInDays == 1) {
@@ -84,7 +85,12 @@ extension DateTimeExtension on DateTime {
       final time = use24Hours
           ? DateFormat('HH.mm').format(this)
           : DateFormat('hh.mm a').format(this);
-      return '$baseText, $time';
+
+      if (useComma) {
+        return '$baseText, $time';
+      }
+
+      return '$baseText $time';
     }
     return baseText;
   }

lib/core/extensions/double_extension.dart

@@ -19,6 +19,18 @@ extension DoubleFormattingExtensions on double {
     }
   }
 
+  String toCompact({
+    String? symbol,
+    int? decimalDigits,
+    String? locale,
+  }) {
+    return NumberFormat.compactCurrency(
+      symbol: symbol,
+      decimalDigits: decimalDigits,
+      locale: locale,
+    ).format(this);
+  }
+
   /// Formats the double as a human-readable short price (e.g., 1K, 2,5M)
   /// Uses comma as decimal separator and up to 2 decimals for M, K, etc.
   String toShortPriceFormat() {

lib/core/utils/color_generator.dart

@@ -0,0 +1,19 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+
+class ColorGenerator {
+  /// Generates a completely random color.
+  ///
+  /// This creates a color by randomizing the Red, Green, and Blue channels
+  /// between 0 and 255. The opacity is always set to 1.0 (fully opaque).
+  static Color generateRandomColor() {
+    final Random random = Random();
+    return Color.fromARGB(
+      255, // Alpha (Opacity) - 255 means fully opaque
+      random.nextInt(256), // Red (0-255)
+      random.nextInt(256), // Green (0-255)
+      random.nextInt(256), // Blue (0-255)
+    );
+  }
+}

lib/features/authentication/presentation/screens/login_screen.dart

@@ -5,6 +5,7 @@ import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:hugeicons/hugeicons.dart';
+import 'package:pockaw/core/components/bottom_sheets/alert_bottom_sheet.dart';
 import 'package:pockaw/core/components/bottom_sheets/custom_bottom_sheet.dart';
 import 'package:pockaw/core/components/buttons/custom_icon_button.dart';
 import 'package:pockaw/core/components/buttons/primary_button.dart';
@@ -24,6 +25,7 @@ import 'package:pockaw/features/authentication/presentation/components/create_fi
 import 'package:pockaw/features/authentication/presentation/components/google_signin_button.dart';
 import 'package:pockaw/features/authentication/presentation/riverpod/auth_provider.dart';
 import 'package:pockaw/features/backup_and_restore/presentation/components/restore_dialog.dart';
+import 'package:pockaw/features/backup_and_restore/presentation/riverpod/backup_controller.dart';
 import 'package:pockaw/features/image_picker/presentation/screens/image_picker_dialog.dart';
 import 'package:pockaw/features/settings/presentation/components/report_log_file_dialog.dart';
 import 'package:pockaw/features/theme_switcher/presentation/components/theme_mode_switcher.dart';
@@ -42,17 +44,29 @@ class LoginScreen extends HookConsumerWidget {
     final nameField = useTextEditingController();
 
     void restoreData() {
-      showModalBottomSheet(
-        context: context,
-        showDragHandle: true,
-        builder: (dialogContext) => CustomBottomSheet(
+      context.openBottomSheet(
+        child: AlertBottomSheet(
           title: 'Restore Data',
-          child: RestoreDialog(
+          context: context,
+          confirmText: 'Continue Restore',
+          showCancelButton: false,
+          onConfirm: () async {
+            final success = await ref
+                .read(backupControllerProvider.notifier)
+                .restoreFromLocalFile();
+
+            if (success) {
+              if (context.mounted) {
+                context.pop();
+                context.replace(Routes.main);
+              }
+            }
+          },
+          content: RestoreDialog(
             onSuccess: () async {
               await Future.delayed(Duration(milliseconds: 1500));
 
               if (context.mounted) {
-                dialogContext.pop();
                 context.replace(Routes.main);
               }
             },

lib/features/backup_and_restore/presentation/components/local_backup_section.dart

@@ -50,30 +50,15 @@ class LocalBackupSection extends HookConsumerWidget {
                 context: context,
                 confirmText: 'Select Backup Folder',
                 onConfirm: () async {
-                  Toast.show(
-                    'Starting restore...',
-                    type: ToastificationType.info,
-                  );
-
                   final success = await ref
                       .read(backupControllerProvider.notifier)
                       .restoreFromLocalFile();
 
                   if (success) {
-                    Toast.show(
-                      'Data restored successfully! refreshing app...',
-                      type: ToastificationType.success,
-                    );
-
                     if (context.mounted) {
                       context.pop();
                       context.replace(Routes.main);
                     }
-                  } else {
-                    Toast.show(
-                      'Restore failed or cancelled.',
-                      type: ToastificationType.error,
-                    );
                   }
                 },
                 showCancelButton: false,