Merge pull request #490 from lyskouski/RF-217

[#217] [RF] Revise Architecture
lyskouski · Sep 13, 2024 · a5462f9 · a5462f9
2 parents 37c2739 + 7d0d765
commit a5462f9
Show file tree

Hide file tree

Showing 44 changed files with 131 additions and 100 deletions.
diff --git a/lib/_configs/date_format_helper.dart → ...lasses/controller/date_format_helper.dart b/lib/_configs/date_format_helper.dart → ...lasses/controller/date_format_helper.dart
diff --git a/lib/_classes/storage/transaction_log.dart b/lib/_classes/storage/transaction_log.dart
@@ -7,29 +7,11 @@ import 'dart:async';
 import 'dart:math';
 import 'package:app_finance/_classes/controller/encryption_handler.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
-import 'package:app_finance/_classes/structure/abstract_app_data.dart';
-import 'package:app_finance/_classes/structure/account_app_data.dart';
-import 'package:app_finance/_classes/structure/bill_app_data.dart';
-import 'package:app_finance/_classes/structure/budget_app_data.dart';
-import 'package:app_finance/_classes/structure/currency_app_data.dart';
-import 'package:app_finance/_classes/structure/goal_app_data.dart';
-import 'package:app_finance/_classes/structure/invoice_app_data.dart';
 import 'package:app_finance/_classes/storage/app_preferences.dart';
+import 'package:app_finance/_ext/data_ext.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
-extension DataExt on String {
-  AbstractAppData? toDataObject(Map<String, dynamic> data, AppData store) => switch (this) {
-        'GoalAppData' => GoalAppData.fromJson(data),
-        'AccountAppData' => AccountAppData.fromJson(data),
-        'BillAppData' => BillAppData.fromJson(data)..setState(store),
-        'BudgetAppData' => BudgetAppData.fromJson(data)..setState(store),
-        'CurrencyAppData' => CurrencyAppData.fromJson(data),
-        'InvoiceAppData' => InvoiceAppData.fromJson(data)..setState(store),
-        _ => null,
-      };
-}
-
 class TransactionLog {
   static int increment = 0;
 

diff --git a/lib/_classes/storage/transaction_log/web_dav_data.dart b/lib/_classes/storage/transaction_log/web_dav_data.dart
@@ -14,7 +14,5 @@ class WebDavData {
     this.path = 'tmp.log',
   });
 
-  bool isEmpty() {
-    return username.isEmpty || link.isEmpty || password.isEmpty || path.isEmpty;
-  }
+  bool isEmpty() => username.isEmpty || link.isEmpty || password.isEmpty || path.isEmpty;
 }
diff --git a/lib/_configs/custom_text_theme.dart b/lib/_configs/custom_text_theme.dart
@@ -55,7 +55,7 @@ extension CustomTextTheme on TextTheme {
       ),
       bodyMedium: GoogleFonts.abel(
         fontSize: 14,
-        fontWeight: FontWeight.w600,
+        fontWeight: FontWeight.w400,
         letterSpacing: letterSpacingOrNone(1.2),
       ),
       bodySmall: GoogleFonts.abel(

diff --git a/lib/_ext/data_ext.dart b/lib/_ext/data_ext.dart
@@ -0,0 +1,23 @@
+// Copyright 2024 The terCAD team. All rights reserved.
+// Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
+
+import 'package:app_finance/_classes/storage/app_data.dart';
+import 'package:app_finance/_classes/structure/abstract_app_data.dart';
+import 'package:app_finance/_classes/structure/account_app_data.dart';
+import 'package:app_finance/_classes/structure/bill_app_data.dart';
+import 'package:app_finance/_classes/structure/budget_app_data.dart';
+import 'package:app_finance/_classes/structure/currency_app_data.dart';
+import 'package:app_finance/_classes/structure/goal_app_data.dart';
+import 'package:app_finance/_classes/structure/invoice_app_data.dart';
+
+extension DataExt on String {
+  AbstractAppData? toDataObject(Map<String, dynamic> data, AppData store) => switch (this) {
+        'GoalAppData' => GoalAppData.fromJson(data),
+        'AccountAppData' => AccountAppData.fromJson(data),
+        'BillAppData' => BillAppData.fromJson(data)..setState(store),
+        'BudgetAppData' => BudgetAppData.fromJson(data)..setState(store),
+        'CurrencyAppData' => CurrencyAppData.fromJson(data),
+        'InvoiceAppData' => InvoiceAppData.fromJson(data)..setState(store),
+        _ => null,
+      };
+}
diff --git a/lib/components/component_chart.dart b/lib/components/component_chart.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
 
 import 'package:app_finance/_classes/herald/app_locale.dart';
-import 'package:app_finance/components/component_account_flow.dart';
-import 'package:app_finance/components/component_account_health.dart';
-import 'package:app_finance/components/component_bill_ytd.dart';
-import 'package:app_finance/components/component_budget_forecast.dart';
-import 'package:app_finance/components/component_budget_ytd.dart';
+import 'package:app_finance/components/widgets/account_flow_chart.dart';
+import 'package:app_finance/components/widgets/account_health_chart.dart';
+import 'package:app_finance/components/widgets/bill_ytd_chart.dart';
+import 'package:app_finance/components/widgets/budget_forecast_chart.dart';
+import 'package:app_finance/components/widgets/budget_ytd_chart.dart';
 import 'package:app_finance/design/form/list_selector_item.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
@@ -36,11 +36,11 @@ class ComponentChart extends StatelessWidget {
     return Container(
       padding: EdgeInsets.all(ThemeHelper.getIndent()),
       child: switch (widgetType) {
-        ComponentChartType.accountFlow => const ComponentAccountFlow(),
-        ComponentChartType.accountHealth => const ComponentAccountHealth(),
-        ComponentChartType.billYtd => const ComponentBillYtd(),
-        ComponentChartType.budgetForecast => const ComponentBudgetForecast(),
-        ComponentChartType.budgetYtd => const ComponentBudgetYtd(),
+        ComponentChartType.accountFlow => const AccountFlowChart(),
+        ComponentChartType.accountHealth => const AccountHealthChart(),
+        ComponentChartType.billYtd => const BillYtdChart(),
+        ComponentChartType.budgetForecast => const BudgetForecastChart(),
+        ComponentChartType.budgetYtd => const BudgetYtdChart(),
         _ => ThemeHelper.emptyBox,
       },
     );

diff --git a/lib/components/component_recent.dart b/lib/components/component_recent.dart
@@ -4,15 +4,15 @@
 import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
 import 'package:app_finance/_classes/structure/currency/exchange.dart';
-import 'package:app_finance/design/form/list_selector_item.dart';
 import 'package:app_finance/_classes/structure/navigation/app_route.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/_ext/string_ext.dart';
 import 'package:app_finance/components/_core/component_data.dart';
-import 'package:app_finance/pages/home/widgets/account_widget.dart';
-import 'package:app_finance/pages/home/widgets/bill_widget.dart';
-import 'package:app_finance/pages/home/widgets/budget_widget.dart';
+import 'package:app_finance/components/widgets/account_widget.dart';
+import 'package:app_finance/components/widgets/bill_widget.dart';
+import 'package:app_finance/components/widgets/budget_widget.dart';
+import 'package:app_finance/design/form/list_selector_item.dart';
 import 'package:app_finance/design/form/list_selector.dart';
 import 'package:app_finance/design/form/simple_input.dart';
 import 'package:app_finance/design/generic/base_widget.dart';

diff --git a/lib/components/component_account_flow.dart → ...omponents/widgets/account_flow_chart.dart b/lib/components/component_account_flow.dart → ...omponents/widgets/account_flow_chart.dart
@@ -19,8 +19,8 @@ import 'package:app_finance/design/wrapper/text_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class ComponentAccountFlow extends StatelessWidget {
-  const ComponentAccountFlow({super.key});
+class AccountFlowChart extends StatelessWidget {
+  const AccountFlowChart({super.key});
 
   List<OhlcData> getData(AppData store, List<AccountAppData> accounts, DateTime xMin) {
     final exchange = Exchange(store: store);

diff --git a/lib/components/component_account_health.dart → ...ponents/widgets/account_health_chart.dart b/lib/components/component_account_health.dart → ...ponents/widgets/account_health_chart.dart
@@ -9,13 +9,13 @@ import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/charts/gauge_linear_chart.dart';
 import 'package:app_finance/charts/interface/ohlc_data.dart';
-import 'package:app_finance/components/component_account_flow.dart';
+import 'package:app_finance/components/widgets/account_flow_chart.dart';
 import 'package:app_finance/design/wrapper/text_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class ComponentAccountHealth extends ComponentAccountFlow {
-  const ComponentAccountHealth({super.key});
+class AccountHealthChart extends AccountFlowChart {
+  const AccountHealthChart({super.key});
 
   double getHealthData(List<OhlcData> data) {
     double health = 0;

diff --git a/lib/pages/home/widgets/account_widget.dart → lib/components/widgets/account_widget.dart b/lib/pages/home/widgets/account_widget.dart → lib/components/widgets/account_widget.dart
diff --git a/lib/pages/home/widgets/bill_widget.dart → lib/components/widgets/bill_widget.dart b/lib/pages/home/widgets/bill_widget.dart → lib/components/widgets/bill_widget.dart
diff --git a/lib/components/component_bill_ytd.dart → lib/components/widgets/bill_ytd_chart.dart b/lib/components/component_bill_ytd.dart → lib/components/widgets/bill_ytd_chart.dart
@@ -19,8 +19,8 @@ import 'package:app_finance/design/wrapper/text_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class ComponentBillYtd extends StatelessWidget {
-  const ComponentBillYtd({super.key});
+class BillYtdChart extends StatelessWidget {
+  const BillYtdChart({super.key});
 
   List<ChartData> getData(AppData store) {
     final currentYear = DateTime(DateTime.now().year);

diff --git a/...components/component_budget_forecast.dart → ...onents/widgets/budget_forecast_chart.dart b/...components/component_budget_forecast.dart → ...onents/widgets/budget_forecast_chart.dart
@@ -14,14 +14,14 @@ import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/charts/data/data_handler.dart';
 import 'package:app_finance/charts/forecast_chart.dart';
 import 'package:app_finance/charts/interface/chart_data.dart';
-import 'package:app_finance/components/component_account_flow.dart';
+import 'package:app_finance/components/widgets/account_flow_chart.dart';
 import 'package:app_finance/design/wrapper/row_widget.dart';
 import 'package:app_finance/design/wrapper/text_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class ComponentBudgetForecast extends ComponentAccountFlow {
-  const ComponentBudgetForecast({super.key});
+class BudgetForecastChart extends AccountFlowChart {
+  const BudgetForecastChart({super.key});
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/pages/home/widgets/budget_widget.dart → lib/components/widgets/budget_widget.dart b/lib/pages/home/widgets/budget_widget.dart → lib/components/widgets/budget_widget.dart
@@ -6,7 +6,7 @@ import 'package:app_finance/_classes/structure/navigation/app_route.dart';
 import 'package:app_finance/_classes/structure/budget_app_data.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/design/generic/base_swipe_widget.dart';
-import 'package:app_finance/pages/home/widgets/account_widget.dart';
+import 'package:app_finance/components/widgets/account_widget.dart';
 import 'package:app_finance/design/generic/base_group_widget.dart';
 import 'package:app_finance/design/generic/base_line_widget.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/components/component_budget_ytd.dart → lib/components/widgets/budget_ytd_chart.dart b/lib/components/component_budget_ytd.dart → lib/components/widgets/budget_ytd_chart.dart
@@ -20,8 +20,8 @@ import 'package:app_finance/design/wrapper/text_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class ComponentBudgetYtd extends StatelessWidget {
-  const ComponentBudgetYtd({super.key});
+class BudgetYtdChart extends StatelessWidget {
+  const BudgetYtdChart({super.key});
 
   List<BudgetAppData> getBudgetHistory(AppData store) {
     final current = DateTime(DateTime.now().year, DateTime.now().month);

diff --git a/lib/design/form/list_selector_page.dart b/lib/design/form/list_selector_page.dart
@@ -3,13 +3,15 @@
 
 import 'package:app_finance/_classes/herald/app_design.dart';
 import 'package:app_finance/_classes/herald/app_locale.dart';
+import 'package:app_finance/_configs/design_type.dart';
 import 'package:app_finance/design/form/list_selector_item.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/_ext/color_ext.dart';
 import 'package:app_finance/design/form/simple_input.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_grid_layout/flutter_grid_layout.dart';
+import 'package:provider/provider.dart';
 
 typedef FntSelectorCallback = Widget Function(
   List<ListSelectorItem> options,
@@ -76,6 +78,10 @@ class ListSelectorPageState<T extends Object?> extends State<ListSelectorPage> {
 
   @override
   Widget build(BuildContext context) {
+    final design = Provider.of<AppDesign>(context, listen: false);
+    if (design.value == AppDesignType.germany) {
+      options.sort((a, b) => a.name.compareTo(b.name));
+    }
     final indent = ThemeHelper.getIndent();
     nav = Navigator.of(context);
     return Directionality(
@@ -140,7 +146,7 @@ class ListSelectorPageState<T extends Object?> extends State<ListSelectorPage> {
                       child: IconButton(
                         tooltip: AppLocale.labels.clear,
                         style: ButtonStyle(
-                          backgroundColor: MaterialStateProperty.all<Color>(
+                          backgroundColor: WidgetStateProperty.all<Color>(
                             context.colorScheme.surface.mesh(context.colorScheme.primary.withOpacity(1), 0.1),
                           ),
                         ),

diff --git a/lib/design/generic/base_group_widget.dart b/lib/design/generic/base_group_widget.dart
@@ -72,7 +72,7 @@ class BaseGroupWidget extends StatelessWidget {
     final textTheme = context.textTheme;
     final titleText = Text(
       title,
-      style: textTheme.bodyMedium,
+      style: textTheme.headlineMedium,
       overflow: TextOverflow.ellipsis,
     );
     final subTitle = Text(

diff --git a/lib/design/generic/base_line_widget.dart b/lib/design/generic/base_line_widget.dart
@@ -82,7 +82,7 @@ class BaseLineWidget extends StatelessWidget {
                         children: [
                           TextWrapper(
                             title,
-                            style: textTheme.bodyMedium,
+                            style: textTheme.headlineMedium,
                           ),
                           TextWrapper(
                             description,

diff --git a/lib/l10n/index.dart b/lib/l10n/index.dart
@@ -33,7 +33,7 @@ const languageList = <LanguageDef>[
 
 String languageDesign(String? value) => switch (value) {
       'ar' => AppDesignType.rtlGeneral.name,
-      'ge' => AppDesignType.germany.name,
+      'de' => AppDesignType.germany.name,
       'zh' => AppDesignType.asiaGeneral.name,
       'fa' => AppDesignType.rtlGeneral.name,
       _ => AppDesignType.global.name,

diff --git a/lib/pages/about/widgets/member_widget.dart b/lib/pages/about/widgets/member_widget.dart
@@ -50,7 +50,7 @@ class MemberWidget extends StatelessWidget {
         mainAxisAlignment: AppDesign.getAlignment<MainAxisAlignment>(),
         crossAxisAlignment: AppDesign.getAlignment(),
         children: [
-          TextWrapper(member.name, style: context.textTheme.bodyMedium),
+          TextWrapper(member.name, style: context.textTheme.headlineMedium),
           Expanded(
             child: ListView.builder(
               scrollDirection: Axis.horizontal,

diff --git a/lib/pages/account/account_page.dart b/lib/pages/account/account_page.dart
@@ -1,10 +1,12 @@
 // Copyright 2023 The terCAD team. All rights reserved.
 // Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
 
+import 'package:app_finance/_classes/herald/app_design.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
 import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_classes/structure/account_app_data.dart';
 import 'package:app_finance/_classes/structure/currency/exchange.dart';
+import 'package:app_finance/_configs/design_type.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_classes/structure/navigation/app_route.dart';
 import 'package:app_finance/design/wrapper/background_wrapper.dart';
@@ -15,6 +17,7 @@ import 'package:app_finance/design/generic/base_swipe_widget.dart';
 import 'package:app_finance/design/wrapper/tap_widget.dart';
 import 'package:app_finance/pages/account/widgets/header_widget.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class AccountPage extends StatefulWidget {
   final String? search;
@@ -67,6 +70,10 @@ class AccountPageState extends AbstractPageState<AccountPage> {
   @override
   Widget buildContent(BuildContext context, BoxConstraints constraints) {
     final items = _getItems();
+    final design = Provider.of<AppDesign>(context, listen: false);
+    if (design.value == AppDesignType.germany) {
+      items.list.sort((a, b) => a.title.compareTo(b.title));
+    }
     final width = ThemeHelper.getWidth(context, 4, constraints);
     final indent = ThemeHelper.getIndent();
     final widthCount = ThemeHelper.getWidthCount(constraints, context);

diff --git a/lib/pages/account/account_view_page.dart b/lib/pages/account/account_view_page.dart
@@ -146,7 +146,7 @@ class AccountViewPageState extends AbstractPageState<AccountViewPage> {
             children: [
               TextWrapper(
                 item.title,
-                style: textTheme.bodyMedium,
+                style: textTheme.headlineMedium,
               ),
               TextWrapper(
                 item.description,

diff --git a/lib/pages/account/widgets/account_line_widget.dart b/lib/pages/account/widgets/account_line_widget.dart
@@ -47,13 +47,13 @@ class AccountLineWidget extends StatelessWidget {
               Icon(item.icon, color: item.color, size: 20),
             ],
             [
-              TextWrapper(item.title, style: textTheme.bodyMedium),
+              TextWrapper(item.title, style: textTheme.headlineMedium),
             ],
             [
-              NumberWidget(item.description ?? '', colorScheme: context.colorScheme, style: textTheme.bodyMedium),
+              NumberWidget(item.description ?? '', colorScheme: context.colorScheme, style: textTheme.headlineMedium),
             ],
             [
-              TextWrapper(AccountType.getLabel(item.type), style: textTheme.bodyMedium),
+              TextWrapper(AccountType.getLabel(item.type), style: textTheme.headlineMedium),
             ],
             [
               Row(
@@ -87,7 +87,7 @@ class AccountLineWidget extends StatelessWidget {
               Icon(item.icon, color: item.color, size: 20),
             ],
             [
-              TextWrapper(item.title, style: textTheme.bodyMedium),
+              TextWrapper(item.title, style: textTheme.headlineMedium),
             ],
             [
               Align(

diff --git a/lib/pages/bill/widgets/bill_header_widget.dart b/lib/pages/bill/widgets/bill_header_widget.dart
@@ -42,7 +42,7 @@ class BillHeaderWidget extends StatelessWidget {
                   ThemeHelper.wIndent,
                   TextWrapper(
                     item.title,
-                    style: textTheme.bodyMedium,
+                    style: textTheme.headlineMedium,
                   ),
                 ],
               ),

diff --git a/lib/pages/bill/widgets/bill_line_widget.dart b/lib/pages/bill/widgets/bill_line_widget.dart
@@ -72,14 +72,14 @@ class BillLineWidget extends StatelessWidget {
                   [
                     Padding(
                       padding: EdgeInsets.only(top: indent),
-                      child: TextWrapper(title, style: textTheme.bodyMedium),
+                      child: TextWrapper(title, style: textTheme.headlineMedium),
                     ),
                   ],
                   [
                     TextWrapper(AppLocale.labels.account, style: textTheme.bodySmall),
                     TextWrapper(
                       description,
-                      style: textTheme.bodyMedium?.copyWith(
+                      style: textTheme.headlineMedium?.copyWith(
                         color: Color.alphaBlend(descriptionColor.withOpacity(0.4), context.colorScheme.secondary),
                       ),
                     ),
@@ -88,7 +88,7 @@ class BillLineWidget extends StatelessWidget {
                     TextWrapper(AppLocale.labels.budget, style: textTheme.bodySmall),
                     TextWrapper(
                       iconTooltip,
-                      style: textTheme.bodyMedium?.copyWith(
+                      style: textTheme.headlineMedium?.copyWith(
                         color: Color.alphaBlend(color.withOpacity(0.4), context.colorScheme.secondary),
                       ),
                     ),
@@ -126,7 +126,7 @@ class BillLineWidget extends StatelessWidget {
                     Column(
                       crossAxisAlignment: AppDesign.getAlignment(),
                       children: [
-                        TextWrapper(title, style: textTheme.bodyMedium),
+                        TextWrapper(title, style: textTheme.headlineMedium),
                         TextWrapper(
                           description,
                           style: textTheme.numberSmall.copyWith(

diff --git a/lib/pages/budget/budget_add_page.dart b/lib/pages/budget/budget_add_page.dart
@@ -204,7 +204,7 @@ class BudgetAddPageState<T extends BudgetAddPage> extends AbstractAddPageState<B
                     [
                       Text(
                         DateFormat.MMMM(AppLocale.code).format(DateTime(DateTime.now().year, e.key)),
-                        style: textTheme.bodyMedium,
+                        style: textTheme.headlineMedium,
                       ),
                     ],
                     [