improve ui of static asset & use dollar sign in prefix (#55)

ozgunozerk · Jan 1, 2024 · 657d25d · 657d25d
1 parent 1d32d3d
commit 657d25d
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/lib/controllers/helpers/currency.dart b/lib/controllers/helpers/currency.dart
@@ -50,12 +50,13 @@ class CurrencyController extends GetxController {
   }
 
   String displayCurrencyWithoutSign(double value) {
-    return formatWithoutSign(value * getCurrencyConversionRate) +
-        getCurrencySymbol;
+    return getCurrencySymbol +
+        formatWithoutSign(value * getCurrencyConversionRate);
   }
 
-  String displayCurrencyWithSign2Decimals(double value) {
-    return formatWithSign2Decimal(value * getCurrencyConversionRate) +
-        getCurrencySymbol;
+  String displayCurrencyWithSign(double value,
+      {bool displayPositiveSign = false}) {
+    return formatWithSign2Decimal(value * getCurrencyConversionRate,
+        displayPositiveSign: displayPositiveSign, symbol: getCurrencySymbol);
   }
 }
diff --git a/lib/presentation/pages/main/settings.dart b/lib/presentation/pages/main/settings.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 import 'package:how_much/presentation/ui/colours.dart';
-import 'package:how_much/util/helper_funcs.dart';
 import 'package:ionicons/ionicons.dart';
 
 import 'package:how_much/controllers/auth.dart';

diff --git a/lib/presentation/ui/text_styles.dart b/lib/presentation/ui/text_styles.dart
@@ -61,7 +61,7 @@ const TextStyle assetTextStyle = TextStyle(
 
 TextStyle changeTextStyle(double change) {
   return TextStyle(
-    fontSize: 14,
+    fontSize: 13,
     color: change.isNegative ? red : green,
   );
 }

diff --git a/lib/presentation/widgets/cards/category_card.dart b/lib/presentation/widgets/cards/category_card.dart
@@ -150,7 +150,7 @@ class CategoryCard extends StatelessWidget {
         Column(
           crossAxisAlignment: CrossAxisAlignment.end,
           children: [
-            Text(controller.displayCurrencyWithSign2Decimals(profit),
+            Text(controller.displayCurrencyWithSign(profit),
                 style: categoryProfitDepositAmountTextStyle),
             const Text("profit",
                 style: categoryProfitDepositDescriptorTextStyle)

diff --git a/lib/presentation/widgets/cards/small_category_card.dart b/lib/presentation/widgets/cards/small_category_card.dart
@@ -62,7 +62,8 @@ class SmallCategoryCard extends StatelessWidget {
                         controller.displayCurrencyWithoutSign(totalAmount),
                         style: smallCategoryHeaderTextStyle)),
                     Obx(() => Text(
-                        controller.displayCurrencyWithSign2Decimals(profit),
+                        controller.displayCurrencyWithSign(profit,
+                            displayPositiveSign: true),
                         style: smallCategoryChangeTextStyle(profit))),
                   ],
                 ),

diff --git a/lib/presentation/widgets/cards/static_asset_card.dart b/lib/presentation/widgets/cards/static_asset_card.dart
@@ -67,7 +67,7 @@ class StaticAssetCard extends StatelessWidget {
                         style: assetTextStyle,
                       )),
                   Obx(() => Text(
-                        "${controller.displayCurrencyWithSign2Decimals(profit)}  (${formatWithSign2Decimal(rateChange)}%)",
+                        "${controller.displayCurrencyWithSign(profit, displayPositiveSign: true)} (${formatWithSign2Decimal(rateChange, displayPositiveSign: true)}%)",
                         style: changeTextStyle(profit),
                       )),
                 ],

diff --git a/lib/util/parsing.dart b/lib/util/parsing.dart
@@ -1,22 +1,23 @@
 import 'package:intl/intl.dart';
 
-final numFormatter = NumberFormat("#,###.##", "en_US");
-
-String formatWithSign2Decimal(double myDouble) {
-  if (myDouble == 0) {
-    return '0.00';
-  }
+final numFormatter = NumberFormat("#,##0.00", "en_US");
 
+String formatWithSign2Decimal(double myDouble,
+    {bool displayPositiveSign = false, String symbol = ''}) {
   String formatted = numFormatter.format(myDouble);
 
-  // Add the leading zero if not present
-  // negative case
-  if (formatted.startsWith('-.')) {
-    formatted = formatted.replaceFirst('-.', '-0.');
+  // Add the positive sign if required
+  if (displayPositiveSign && !formatted.startsWith('-')) {
+    formatted = "+$formatted";
   }
-  // positive case
-  if (formatted.startsWith('.')) {
-    formatted = formatted.replaceFirst('.', '0.');
+
+  // If symbol is given, add it before the first number
+  if (symbol != '') {
+    int insertIndex =
+        formatted.startsWith('-') ? 1 : (displayPositiveSign ? 1 : 0);
+    formatted = formatted.substring(0, insertIndex) +
+        symbol +
+        formatted.substring(insertIndex);
   }
 
   return formatted;