Formatting Negative Balances Proper

rasheedmhd · Apr 14, 2024 · 38f2034 · 38f2034
1 parent 716de52
commit 38f2034
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 20 deletions.
diff --git a/lib/accounts/transactions.dart b/lib/accounts/transactions.dart
@@ -4,7 +4,7 @@ import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:app/providers/spends_provider.dart";
 import "package:app/providers/wallets_provider.dart";
-import "package:app/utility/util/subString.dart";
+import "package:app/utility/util/sub_string.dart";
 
 class TransactionsPage extends ConsumerStatefulWidget {
   final Wallet wallet;

diff --git a/lib/cards/subscriptions.dart b/lib/cards/subscriptions.dart
@@ -6,7 +6,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:app/providers/subs_provider.dart";
 import "package:flutter_slidable/flutter_slidable.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
-import "package:app/utility/util/subString.dart";
+import "package:app/utility/util/sub_string.dart";
 import "package:intl/intl.dart";
 
 class SubscriptionItem extends ConsumerWidget {

diff --git a/lib/cards/wallets.dart b/lib/cards/wallets.dart
@@ -1,5 +1,6 @@
 import "package:app/accounts/transactions.dart";
 import "package:app/ops/update/topUpWallet.dart";
+import "package:app/utility/util/fmt_neg_bal.dart";
 import "package:flutter/material.dart";
 import "package:app/models/schemas.dart";
 import "package:app/ops/update/editWallet.dart";
@@ -174,9 +175,9 @@ class WalletItem extends ConsumerWidget {
                     ),
                   ),
                 subtitle: Text(
-                  "GHS ${wallet.bal}",
+                  fmtBalance(wallet.bal),
                   style: const TextStyle(
-                    fontSize: 19.0,
+                    fontSize: 21.0,
                     color: Color.fromARGB(255, 48, 136, 6),
                   ),
                 ),

diff --git a/lib/home/allSpends.dart b/lib/home/allSpends.dart
@@ -3,7 +3,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:app/providers/spends_provider.dart";
 import "package:app/models/schemas.dart";
 import "package:app/ops/update/editSpend.dart";
-import "package:app/utility/util/subString.dart";
+import "package:app/utility/util/sub_string.dart";
 import "package:flutter_slidable/flutter_slidable.dart";
 
 class SpendItem extends ConsumerWidget {

diff --git a/lib/home/spends.dart b/lib/home/spends.dart
@@ -2,7 +2,7 @@ import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:app/providers/spends_provider.dart";
 import "package:app/models/schemas.dart";
-import "package:app/utility/util/subString.dart";
+import "package:app/utility/util/sub_string.dart";
 import "package:app/ops/update/editSpend.dart";
 import "package:flutter_slidable/flutter_slidable.dart";
 

diff --git a/lib/ops/update/editWallet.dart b/lib/ops/update/editWallet.dart
@@ -16,7 +16,7 @@ class EditWalletCardState extends ConsumerState<EditWalletCard> {
   late Wallet? walletToEdit = ref.read(getWallet(widget.wallet.id));
 
   late String name = walletToEdit!.name;
-  late String balance = walletToEdit!.balance.toString();
+  late String balance = walletToEdit!.bal;
 
   void _newName(String typedName) {
     name = typedName;

diff --git a/lib/ops/update/topUpWallet.dart b/lib/ops/update/topUpWallet.dart
@@ -3,7 +3,8 @@ import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:app/providers/wallets_provider.dart";
 import 'package:flutter/services.dart';
-import "package:app/utility/util/subString.dart";
+import "package:app/utility/util/sub_string.dart";
+import "package:app/utility/util/fmt_neg_bal.dart";
 
 class TopUpWalletCard extends ConsumerStatefulWidget {
   final Wallet wallet;
@@ -20,6 +21,7 @@ class TopUpWalletCardState extends ConsumerState<TopUpWalletCard> {
 
   late String name = walletToEdit!.name;
   late double balance = walletToEdit!.balance;
+  late String balanceAsString = walletToEdit!.balance.toStringAsFixed(2);
 
   void _newBalance(String typedBalance) {
     balance += double.parse(_balanceController.text);
@@ -75,7 +77,7 @@ class TopUpWalletCardState extends ConsumerState<TopUpWalletCard> {
               Align(
                 alignment: Alignment.topLeft,
                 child: Text(
-                  "GHS ${walletToEdit!.balance.toStringAsFixed(2)}",
+                  fmtBalance(balanceAsString),
                   style: const TextStyle(
                     fontSize: 30.0,
                     color: Color.fromARGB(255, 5, 61, 135),

diff --git a/lib/utility/util/fmt_neg_bal.dart b/lib/utility/util/fmt_neg_bal.dart
@@ -0,0 +1,11 @@
+// import "dart:num";
+
+String fmtBalance(String amount) {
+  if (double.parse(amount) < 0) {
+    String withoutNegativeSign = amount.substring(1, amount.length);
+    String formattedBal = "-GHS$withoutNegativeSign";
+    return formattedBal;
+  } else {
+    return "GHS$amount";
+  }
+}
diff --git a/lib/utility/util/subString.dart b/lib/utility/util/subString.dart
diff --git a/lib/utility/util/sub_string.dart b/lib/utility/util/sub_string.dart
@@ -0,0 +1,11 @@
+String getSubString(String string, int start, int end) {
+  // Ensure end index is within bounds
+  if (end > string.length) {
+    end = string.length;
+    return string.substring(start, end);
+  }
+
+  // Return the slice of the string
+  final slicedString = string.substring(start, end);
+  return "$slicedString...";
+}