fix post merge issues

RIP-Comm · Dec 19, 2023 · 0c15e54 · 0c15e54
1 parent ae5304d
commit 0c15e54
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/lib/pages/account_page/account_page.dart b/lib/pages/account_page/account_page.dart
@@ -19,7 +19,7 @@ class _AccountPage extends ConsumerState<AccountPage> with Functions {
   Widget build(BuildContext context) {
     final accountName = ref.read(accountNameProvider);
     final accountAmount = ref.read(accountStartingValueProvider);
-
+    final Locale currentLocale = Localizations.localeOf(context);
     return Scaffold(
       appBar: AppBar(
         title: Text(accountName ?? "", style: const TextStyle(color: white)),
@@ -35,7 +35,7 @@ class _AccountPage extends ConsumerState<AccountPage> with Functions {
               child: Column(
                 children: [
                   Text(
-                    numToCurrency(accountAmount),
+                    numToCurrency(accountAmount,currentLocale.languageCode),
                     style: const TextStyle(
                       color: white,
                       fontSize: 32.0,

diff --git a/lib/pages/planning_page/widget/recurring_payments_card.dart b/lib/pages/planning_page/widget/recurring_payments_card.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../../../model/recurring_transaction_amount.dart';
 
 class RecurringPaymentCard extends StatefulWidget {
   const RecurringPaymentCard({super.key});
@@ -25,9 +24,9 @@ class _RecurringPaymentCardState extends State<RecurringPaymentCard> {
             padding: const EdgeInsets.fromLTRB(16, 16, 16, 16),
             child: Column(
               children: [
-                const Text(AppLocalizations.of(context)!.recurrentSubTitle,
+                Text(AppLocalizations.of(context)!.recurrentSubTitle,
                     style:
-                        TextStyle(fontWeight: FontWeight.normal, fontSize: 13)),
+                        const TextStyle(fontWeight: FontWeight.normal, fontSize: 13)),
                 const SizedBox(height: 10),
                 ElevatedButton.icon(
                   icon: Icon(
@@ -36,7 +35,7 @@ class _RecurringPaymentCardState extends State<RecurringPaymentCard> {
                   ),
                   onPressed: addRecurringPayment,
                   label: Text(
-                    AppLocalizations.of(context).recurrentSubTitle,
+                    AppLocalizations.of(context)!.recurrentSubTitle,
                     style: Theme.of(context)
                         .textTheme
                         .titleSmall!

diff --git a/lib/pages/transactions_page/widgets/list_tab.dart b/lib/pages/transactions_page/widgets/list_tab.dart
@@ -156,6 +156,7 @@ class DateSeparator extends StatelessWidget with Functions {
 
   @override
   Widget build(BuildContext context) {
+    final Locale currentLocale = Localizations.localeOf(context);
     return Padding(
       padding: const EdgeInsets.only(top: 12.0, bottom: 6.0),
       child: Row(
@@ -167,7 +168,7 @@ class DateSeparator extends StatelessWidget with Functions {
                 Theme.of(context).textTheme.bodySmall?.copyWith(color: blue1),
           ),
           Text(
-            "${numToCurrency(total)} €",
+            "${numToCurrency(total, currentLocale.languageCode)} €",
             style: Theme.of(context)
                 .textTheme
                 .bodyLarge

diff --git a/lib/pages/transactions_page/widgets/transaction_list_tile.dart b/lib/pages/transactions_page/widgets/transaction_list_tile.dart
@@ -30,6 +30,7 @@ class TransactionListTile extends ConsumerWidget with Functions {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final Locale currentLocale = Localizations.localeOf(context);
     return InkWell(
       onTap: () {
         ref.read(selectedTransactionUpdateProvider.notifier).state =
@@ -67,7 +68,7 @@ class TransactionListTile extends ConsumerWidget with Functions {
                         style: Theme.of(context).textTheme.titleMedium,
                       ),
                       Text(
-                        "${type == Type.expense ? '-' : ''}${numToCurrency(amount)} €",
+                        "${type == Type.expense ? '-' : ''}${numToCurrency(amount, currentLocale.languageCode)} €",
                         style: Theme.of(context)
                             .textTheme
                             .bodyLarge