fix lint issues

wealth-wave · Jan 2, 2024 · 84cf3a5 · 84cf3a5
1 parent cbb5e9d
commit 84cf3a5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603
 
       - name: Install dependencies
-        run: dart pub get
+        run: flutter pub get
 
       # Uncomment this step to verify the use of 'dart format' on each commit.
       # - name: Verify formatting

diff --git a/lib/api/apis/backup_api.dart b/lib/api/apis/backup_api.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+// ignore: avoid_web_libraries_in_flutter
 import 'dart:html' as html;
 
 

diff --git a/lib/domain/models/goal.dart b/lib/domain/models/goal.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:wealth_wave/api/db/app_database.dart';
 import 'package:wealth_wave/contract/goal_importance.dart';
 import 'package:wealth_wave/domain/models/investment.dart';
@@ -51,14 +53,23 @@ class Goal {
   }
 
   double getInvestedValue() {
-    if(taggedInvestments.isEmpty){
+    if (taggedInvestments.isEmpty) {
       return 0;
     }
     return taggedInvestments.keys
         .map((e) => (e.value / 100) * (taggedInvestments[e] ?? 0))
         .reduce((a, b) => a + b);
   }
 
+  double getFutureValueOnTargetDate() {
+    double yearsLeft = getYearsLeft();
+    double growthRate = getIrr();
+    double value = getInvestedValue();
+
+    double progressedValue = value * pow(1 + growthRate, yearsLeft);
+    return progressedValue;
+  }
+
   double getProgress() {
     double progress = targetAmount > 0 ? getInvestedValue() / targetAmount : 0;
     return progress;

diff --git a/lib/ui/pages/goals_page.dart b/lib/ui/pages/goals_page.dart
@@ -113,6 +113,15 @@ class _GoalsPage extends PageState<GoalsViewState, GoalsPage, GoalsPresenter> {
                           style: Theme.of(context).textTheme.bodyMedium),
                       Text('(Invested Amount)',
                           style: Theme.of(context).textTheme.labelSmall),
+                    ],
+                  ),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Text(formatToCurrency(goal.getFutureValueOnTargetDate()),
+                          style: Theme.of(context).textTheme.bodyMedium),
+                      Text('(Predicted Amount at Target Date)',
+                          style: Theme.of(context).textTheme.labelSmall),
                       Text(formatToPercentage(goal.getIrr()),
                           style: Theme.of(context).textTheme.bodyMedium),
                       Text('(Growth Rate)',

diff --git a/lib/ui/widgets/create_goal_dialog.dart b/lib/ui/widgets/create_goal_dialog.dart
@@ -18,7 +18,7 @@ Future<void> showCreateGoalDialog(
 class _CreateGoalDialog extends StatefulWidget {
   final Goal? goalToUpdate;
 
-  const _CreateGoalDialog({super.key, this.goalToUpdate});
+  const _CreateGoalDialog({this.goalToUpdate});
 
   @override
   State<_CreateGoalDialog> createState() => _CreateGoalPage();

diff --git a/lib/utils/ui_utils.dart b/lib/utils/ui_utils.dart
@@ -10,9 +10,11 @@ String formatDate(DateTime date) {
 
 String formatToPercentage(double value) {
   double percentage = value * 100;
-  return percentage == percentage.round() ? '${percentage.round()}%' : '${percentage.toStringAsFixed(2)}%';
+  return percentage == percentage.round()
+      ? '${percentage.round()}%'
+      : '${percentage.toStringAsFixed(2)}%';
 }
 
 String formatToCurrency(double value) {
-  return NumberFormat.currency(locale: 'en_IN', symbol: '\₹').format(value);
+  return NumberFormat.currency(locale: 'en_IN', symbol: '₹').format(value);
 }