lyskouski · lyskouski · Oct 21, 2024 · Oct 21, 2024
diff --git a/lib/_classes/math/total_recalculation.dart b/lib/_classes/math/total_recalculation.dart
@@ -24,7 +24,7 @@ class TotalRecalculation extends AbstractRecalculation {
 
   double updateTotalMap(AppDataType type, String uuid, HashMap<String, dynamic> hashTable) {
     final item = hashTable[uuid];
-    if (item == null || item.hidden) {
+    if (item == null || item.hidden || item.skip) {
       return 0.0;
     }
     double total = exchange.reform(item.details, item.currency, Exchange.defaultCurrency);

diff --git a/lib/_classes/structure/abstract_app_data.dart b/lib/_classes/structure/abstract_app_data.dart
@@ -19,6 +19,8 @@ abstract class AbstractAppData implements InterfaceAppData {
   double progress;
   @override
   bool hidden;
+  @override
+  bool skip;
   String? description;
   @override
   MaterialColor? color;
@@ -40,6 +42,7 @@ abstract class AbstractAppData implements InterfaceAppData {
     details = 0.0,
     this.progress = 1.0,
     this.hidden = false,
+    this.skip = false,
   })  : _createdAt = createdAt ?? (createdAtFormatted != null ? DateTime.parse(createdAtFormatted) : DateTime.now()),
         _updatedAt = updatedAt ?? DateTime.now(),
         _amount = 0.0 + (details ?? 0.0);
@@ -65,6 +68,7 @@ abstract class AbstractAppData implements InterfaceAppData {
         'details': details,
         'progress': progress,
         'hidden': hidden,
+        'skip': skip,
       };
 
   Map<String, Map<String, dynamic>> toFile() {

diff --git a/lib/_classes/structure/account_app_data.dart b/lib/_classes/structure/account_app_data.dart
@@ -30,6 +30,7 @@ class AccountAppData extends AbstractAppData {
     DateTime? closedAt,
     String? closedAtFormatted,
     super.hidden,
+    super.skip,
   }) : _closedAt = closedAt ?? (closedAtFormatted != null ? DateTime.parse(closedAtFormatted) : DateTime.now());
 
   @override
@@ -53,6 +54,7 @@ class AccountAppData extends AbstractAppData {
       createdAt: super.createdAt,
       closedAt: closedAt,
       hidden: super.hidden,
+      skip: super.skip,
     );
   }
 
@@ -71,6 +73,7 @@ class AccountAppData extends AbstractAppData {
       updatedAt: DateTime.parse(json['updatedAt']),
       closedAt: DateTime.parse(json['closedAt']),
       hidden: json['hidden'],
+      skip: json['skip'] ?? false,
     );
   }
 

diff --git a/lib/_classes/structure/budget_app_data.dart b/lib/_classes/structure/budget_app_data.dart
@@ -37,6 +37,7 @@ class BudgetAppData extends AbstractAppData with StorageMixin {
     this.amount = 0.0,
     this.type = '',
     super.hidden,
+    super.skip,
   }) : super(
           details: amountLimit,
         );
@@ -62,6 +63,7 @@ class BudgetAppData extends AbstractAppData with StorageMixin {
       amountSet: amountSet,
       amount: amount,
       hidden: super.hidden,
+      skip: super.skip,
     );
   }
 
@@ -79,6 +81,7 @@ class BudgetAppData extends AbstractAppData with StorageMixin {
       amountLimit: 0.0 + json['amountLimit'],
       amountSet: json['amountSet'] != null ? json['amountSet'].toString().toMap<int, double>() : {},
       hidden: json['hidden'],
+      skip: json['skip'] ?? false,
     );
   }
 

diff --git a/lib/_classes/structure/interface_app_data.dart b/lib/_classes/structure/interface_app_data.dart
@@ -11,6 +11,7 @@ abstract interface class InterfaceAppData {
   IconData? icon;
   MaterialColor? color;
   bool hidden = false;
+  bool skip = false;
 
   String get title;
 

diff --git a/lib/components/widgets/account_widget.dart b/lib/components/widgets/account_widget.dart
@@ -120,6 +120,7 @@ class AccountWidget extends BaseWidget {
         color: item.color ?? Colors.transparent,
         icon: item.icon ?? Icons.radio_button_unchecked_sharp,
         hidden: item.hidden,
+        skip: item.skip,
         width: width,
         route: routeList,
         error: item.error,

diff --git a/lib/components/widgets/budget_widget.dart b/lib/components/widgets/budget_widget.dart
@@ -72,6 +72,7 @@ class BudgetWidget extends AccountWidget {
         color: item.color ?? Colors.transparent,
         icon: item.icon ?? Icons.radio_button_unchecked_sharp,
         hidden: item.hidden,
+        skip: item.skip,
         width: width,
         route: routeList,
       ),

diff --git a/lib/design/form/list_account_selector.dart b/lib/design/form/list_account_selector.dart
@@ -21,6 +21,7 @@ class ListAccountSelectorItem extends ListSelectorItem {
           color: item.color ?? Colors.transparent,
           icon: item.icon ?? Icons.radio_button_unchecked_sharp,
           hidden: item.hidden ?? false,
+          skip: item.skip ?? false,
           width: constraints.maxWidth,
           showDivider: false,
         );
@@ -37,6 +38,7 @@ class ListAccountSelectorItem extends ListSelectorItem {
           color: item.color ?? Colors.transparent,
           icon: item.icon ?? Icons.radio_button_unchecked_sharp,
           hidden: item.hidden ?? false,
+          skip: item.skip ?? false,
           width: constraints.maxWidth,
           showDivider: false,
         );

diff --git a/lib/design/generic/base_line_widget.dart b/lib/design/generic/base_line_widget.dart
@@ -24,6 +24,7 @@ class BaseLineWidget extends StatelessWidget {
   final double width;
   final String route;
   final bool hidden;
+  final bool skip;
   final bool showDivider;
   final Widget? error;
 
@@ -38,6 +39,7 @@ class BaseLineWidget extends StatelessWidget {
     this.icon = Icons.question_mark,
     this.error,
     this.hidden = false,
+    this.skip = false,
     this.progress = 1,
     this.route = '',
     this.showDivider = true,
@@ -82,7 +84,9 @@ class BaseLineWidget extends StatelessWidget {
                         children: [
                           TextWrapper(
                             title,
-                            style: textTheme.headlineMedium,
+                            style: textTheme.headlineMedium?.copyWith(
+                              fontStyle: skip ? FontStyle.italic : FontStyle.normal,
+                            ),
                           ),
                           TextWrapper(
                             description,

diff --git a/lib/design/generic/base_widget.dart b/lib/design/generic/base_widget.dart
@@ -57,6 +57,7 @@ class BaseWidget extends StatelessWidget {
         color: item.color ?? Colors.transparent,
         icon: item.icon ?? Icons.radio_button_unchecked_sharp,
         hidden: item.hidden,
+        skip: item.skip,
         width: width,
         route: routeList,
       ),

diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "الأساسيات",
     "settingsHeadline": "الإعدادات",
+    "skipFromTotals": "الاستبعاد من المجاميع",
     "skipTooltip": "تخطي الخطوة (الخطوات)",
     "spent": "المستهلكة",
     "splitCancelTooltip": "إلغاء التقسيم في الشهر",

diff --git a/lib/l10n/app_az.arb b/lib/l10n/app_az.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Əsaslar",
     "settingsHeadline": "Parametrlər",
+    "skipFromTotals": "Cəmilərdən xaric edin",
     "skipTooltip": "Addım(lar)ı atlayın",
     "spent": "sərf etdi",
     "splitCancelTooltip": "Ayda bölünməni ləğv edin",

diff --git a/lib/l10n/app_be.arb b/lib/l10n/app_be.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Асновы",
     "settingsHeadline": "Налады",
+    "skipFromTotals": "Выключыць з агульных вынікаў",
     "skipTooltip": "Прапусьціць крок(і)",
     "spent": "патр.",
     "splitCancelTooltip": "Адмяніць падьзел па месяцы",

diff --git a/lib/l10n/app_be_EU.arb b/lib/l10n/app_be_EU.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Asnovy",
     "settingsHeadline": "Nalady",
+    "skipFromTotals": "Vykliučyć z ahuĺnych vynikaŭ",
     "skipTooltip": "Prapuścić Krok(i)",
     "spent": "patr.",
     "splitCancelTooltip": "Admianić Pad́ziel pa Miesiacy",

diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Grundlagen",
     "settingsHeadline": "Einstellungen",
+    "skipFromTotals": "Aus den Gesamtwerten ausschließen",
     "skipTooltip": "Schritt(e) überspringen",
     "spent": "ausgegeben",
     "splitCancelTooltip": "Aufteilung pro Monat aufheben",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Basics",
     "settingsHeadline": "Settings",
+    "skipFromTotals": "Exclude from Totals",
     "skipTooltip": "Skip Step(s)",
     "spent": "spent",
     "splitCancelTooltip": "Cancel Split per Month",

diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Básico",
     "settingsHeadline": "Configuración",
+    "skipFromTotals": "Excluir de los totales",
     "skipTooltip": "Saltar Paso(s)",
     "spent": "gastado",
     "splitCancelTooltip": "Anular división por mes",

diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "مبانی",
     "settingsHeadline": "تنظیمات",
+    "skipFromTotals": "حذف از مجموع",
     "skipTooltip": "رد شدن از مرحله(های)",
     "spent": "صرف کرد",
     "splitCancelTooltip": "لغو تقسیم در ماه",

diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Principes de base",
     "settingsHeadline": "Paramètres",
+    "skipFromTotals": "Exclure des totaux",
     "skipTooltip": "Sauter étape(s)",
     "spent": "dépensé",
     "splitCancelTooltip": "Annuler le fractionnement par mois",

diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "मूल बातें",
     "settingsHeadline": "समायोजन",
+    "skipFromTotals": "कुल से बाहर रखें",
     "skipTooltip": "चरण छोड़ें",
     "spent": "खर्च किया",
     "splitCancelTooltip": "प्रति माह विभाजन रद्द करें",

diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Nozioni di base",
     "settingsHeadline": "Impostazioni",
+    "skipFromTotals": "Escludere dai totali",
     "skipTooltip": "Salta i passi",
     "spent": "speso",
     "splitCancelTooltip": "Annullare la suddivisione per mese",

diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "基本設定",
     "settingsHeadline": "設定",
+    "skipFromTotals": "合計から除外する",
     "skipTooltip": "ステップをスキップする",
     "spent": "使用済み",
     "splitCancelTooltip": "月ごとの分割を取り消す",

diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "기본 사항",
     "settingsHeadline": "설정",
+    "skipFromTotals": "합계에서 제외",
     "skipTooltip": "단계 건너뛰기",
     "spent": "지출",
     "splitCancelTooltip": "월별 분할 취소",

diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Basis",
     "settingsHeadline": "Instellingen",
+    "skipFromTotals": "Niet opnemen in totalen",
     "skipTooltip": "Stap(pen) overslaan",
     "spent": "uitgegeven",
     "splitCancelTooltip": "Splitsen per maand annuleren",

diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Podstawy",
     "settingsHeadline": "Ustawienia",
+    "skipFromTotals": "Wyklucz z sumy",
     "skipTooltip": "Pomiń kroki",
     "spent": "zużyty",
     "splitCancelTooltip": "Anuluj podział na miesiąc",

diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Noções básicas",
     "settingsHeadline": "Definições",
+    "skipFromTotals": "Excluir dos totais",
     "skipTooltip": "Saltar passo(s)",
     "spent": "gasto",
     "splitCancelTooltip": "Cancelar divisão por mês",

diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Noções básicas",
     "settingsHeadline": "Configurações",
+    "skipFromTotals": "Excluir dos totais",
     "skipTooltip": "Pular etapa(s)",
     "spent": "gasto",
     "splitCancelTooltip": "Cancelar divisão por mês",

diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Temel Bilgiler",
     "settingsHeadline": "Ayarlar",
+    "skipFromTotals": "Toplamlardan hariç tut",
     "skipTooltip": "Adım(lar)ı Atla",
     "spent": "harcandı",
     "splitCancelTooltip": "Ay Başına Bölünmeyi İptal Et",

diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Основи",
     "settingsHeadline": "Налаштування",
+    "skipFromTotals": "Виключити із загальної кількості",
     "skipTooltip": "Пропустити крок(і)",
     "spent": "патр.",
     "splitCancelTooltip": "Скасувати розподіл на місяць",

diff --git a/lib/l10n/app_uz.arb b/lib/l10n/app_uz.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "Asoslar",
     "settingsHeadline": "Sozlamalar",
+    "skipFromTotals": "Jami hisobdan chiqarib tashlang",
     "skipTooltip": "Qadam(lar)ni o‘tkazib yuborish",
     "spent": "sarflangan",
     "splitCancelTooltip": "Oyiga Splitni bekor qilish",

diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "基础知识",
     "settingsHeadline": "设置",
+    "skipFromTotals": "不计入总数",
     "skipTooltip": "跳过步骤",
     "spent": "已花费",
     "splitCancelTooltip": "取消每月拆分",

diff --git a/lib/l10n/app_zh_TW.arb b/lib/l10n/app_zh_TW.arb
@@ -352,6 +352,7 @@
     },
     "settingsBaseHeadline": "基本知識",
     "settingsHeadline": "設定",
+    "skipFromTotals": "總計不包括",
     "skipTooltip": "跳過步驟",
     "spent": "花費",
     "splitCancelTooltip": "取消每月分割",

diff --git a/lib/pages/account/account_add_page.dart b/lib/pages/account/account_add_page.dart
@@ -57,6 +57,7 @@ class AccountAddPageState<T extends AccountAddPage> extends AbstractAddPageState
   late TextEditingController balance;
   IconData? icon;
   MaterialColor? color;
+  bool skip = false;
 
   @override
   void initState() {
@@ -108,6 +109,7 @@ class AccountAddPageState<T extends AccountAddPage> extends AbstractAddPageState
       icon: icon,
       closedAt: validTillDate,
       createdAt: balanceUpdateDate,
+      skip: skip,
     ));
   }
 
@@ -207,17 +209,33 @@ class AccountAddPageState<T extends AccountAddPage> extends AbstractAddPageState
                 SimpleInputFormatter.filterDouble,
               ],
             ),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            RowWidget(
+              indent: indent,
+              maxWidth: width + indent,
+              chunk: const [20, null],
               children: [
-                TextWrapper(
-                  AppLocale.labels.balanceDate,
-                  style: textTheme.bodyLarge,
-                ),
-                Tooltip(
-                  message: AppLocale.labels.balanceDateTooltip,
-                  child: const Icon(Icons.info_outline),
-                ),
+                [Checkbox(value: skip, onChanged: (value) => setState(() => skip = value!))],
+                [TextWrapper(AppLocale.labels.skipFromTotals)],
+              ],
+            ),
+            ThemeHelper.hIndent2x,
+            RowWidget(
+              indent: indent,
+              maxWidth: width + indent,
+              chunk: const [null, 20],
+              children: [
+                [
+                  TextWrapper(
+                    AppLocale.labels.balanceDate,
+                    style: textTheme.bodyLarge,
+                  ),
+                ],
+                [
+                  Tooltip(
+                    message: AppLocale.labels.balanceDateTooltip,
+                    child: const Icon(Icons.info_outline),
+                  ),
+                ]
               ],
             ),
             DateTimeInput(