Clean up code

2023-04-18 15:43:52 +03:00 · 2023-04-18 15:43:52 +03:00 · 3d1aea4b3b
parent 158d2b5d35
commit 3d1aea4b3b
8 changed files with 43 additions and 58 deletions
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/client/client_selectors.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:invoiceninja_flutter/utils/money.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/utils/strings.dart';

 part 'invoice_model.g.dart';
@ -1030,10 +1029,8 @@ abstract class InvoiceEntity extends Object
            actions.add(EntityAction.stop);
          }

-          if (supportsLatestFeatures()) {
-            actions.add(EntityAction.updatePrices);
-            actions.add(EntityAction.increasePrices);
-          }
+          actions.add(EntityAction.updatePrices);
+          actions.add(EntityAction.increasePrices);
        } else {
          if (!isCancelledOrReversed) {
            if (multiselect) {
@ -1041,9 +1038,7 @@ abstract class InvoiceEntity extends Object
            } else {
              actions.add(EntityAction.sendEmail);
              if (isUnpaid) {
-                if (supportsLatestFeatures()) {
-                  actions.add(EntityAction.schedule);
-                }
+                actions.add(EntityAction.schedule);
              }
            }
          }
--- a/lib/data/repositories/credit_repository.dart
+++ b/lib/data/repositories/credit_repository.dart
@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/data/models/serializers.dart';
 import 'package:invoiceninja_flutter/data/web_client.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/utils/serialization.dart';

 class CreditRepository {
@ -121,7 +120,7 @@ class CreditRepository {
      'template': 'email_template_$template',
      'body': body,
      'subject': subject,
-      if (supportsLatestFeatures()) 'cc_email': ccEmail,
+      'cc_email': ccEmail,
    };

    final dynamic response = await webClient.post(
--- a/lib/data/repositories/invoice_repository.dart
+++ b/lib/data/repositories/invoice_repository.dart
@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/data/models/serializers.dart';
 import 'package:invoiceninja_flutter/data/web_client.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/utils/serialization.dart';

 class InvoiceRepository {
@ -135,7 +134,7 @@ class InvoiceRepository {
      'template': 'email_template_$template',
      'body': body,
      'subject': subject,
-      if (supportsLatestFeatures()) 'cc_email': ccEmail,
+      'cc_email': ccEmail,
    };

    final dynamic response = await webClient.post(
--- a/lib/data/repositories/purchase_order_repository.dart
+++ b/lib/data/repositories/purchase_order_repository.dart
@ -7,7 +7,6 @@ import 'package:invoiceninja_flutter/data/models/serializers.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/data/web_client.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';

 class PurchaseOrderRepository {
  const PurchaseOrderRepository({
@ -129,7 +128,7 @@ class PurchaseOrderRepository {
      'template': 'email_template_$template',
      'body': body,
      'subject': subject,
-      if (supportsLatestFeatures()) 'cc_email': ccEmail,
+      'cc_email': ccEmail,
    };

    final dynamic response = await webClient.post(
--- a/lib/data/repositories/quote_repository.dart
+++ b/lib/data/repositories/quote_repository.dart
@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/data/models/serializers.dart';
 import 'package:invoiceninja_flutter/data/web_client.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/utils/serialization.dart';

 class QuoteRepository {
@ -132,7 +131,7 @@ class QuoteRepository {
      'template': 'email_template_$template',
      'body': body,
      'subject': subject,
-      if (supportsLatestFeatures()) 'cc_email': ccEmail,
+      'cc_email': ccEmail,
    };

    final dynamic response = await webClient.post(
--- a/lib/ui/settings/invoice_design.dart
+++ b/lib/ui/settings/invoice_design.dart
@ -1071,19 +1071,18 @@ class _InvoiceDesignState extends State<InvoiceDesign>
                        ),
                      ),
                    ),
-                    if (supportsLatestFeatures())
-                      FormCard(
-                        isLast: true,
-                        child: SwitchListTile(
-                          title: Text(localization.shareInvoiceQuoteColumns),
-                          value: settings.shareInvoiceQuoteColumns ?? true,
-                          activeColor: Theme.of(context).colorScheme.secondary,
-                          onChanged: (value) {
-                            viewModel.onSettingsChanged(settings.rebuild(
-                                (b) => b..shareInvoiceQuoteColumns = value));
-                          },
-                        ),
-                      )
+                    FormCard(
+                      isLast: true,
+                      child: SwitchListTile(
+                        title: Text(localization.shareInvoiceQuoteColumns),
+                        value: settings.shareInvoiceQuoteColumns ?? true,
+                        activeColor: Theme.of(context).colorScheme.secondary,
+                        onChanged: (value) {
+                          viewModel.onSettingsChanged(settings.rebuild(
+                              (b) => b..shareInvoiceQuoteColumns = value));
+                        },
+                      ),
+                    )
                  ],
                ),
                if (settings.shareInvoiceQuoteColumns == false)
--- a/lib/ui/settings/payment_settings.dart
+++ b/lib/ui/settings/payment_settings.dart
@ -18,7 +18,6 @@ import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
 import 'package:invoiceninja_flutter/ui/settings/payment_settings_vm.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';

 class PaymentSettings extends StatefulWidget {
  const PaymentSettings({
@ -247,14 +246,13 @@ class _PaymentSettingsState extends State<PaymentSettings> {
                      decimal: true, signed: true),
                ),
              ),
-            if (supportsLatestFeatures())
-              BoolDropdownButton(
-                label: localization.clientInitiatedPayments,
-                value: settings.clientInitiatedPayments,
-                helpLabel: localization.clientInitiatedPaymentsHelp,
-                onChanged: (value) => viewModel.onSettingsChanged(settings
-                    .rebuild((b) => b..clientInitiatedPayments = value)),
-              ),
+            BoolDropdownButton(
+              label: localization.clientInitiatedPayments,
+              value: settings.clientInitiatedPayments,
+              helpLabel: localization.clientInitiatedPaymentsHelp,
+              onChanged: (value) => viewModel.onSettingsChanged(
+                  settings.rebuild((b) => b..clientInitiatedPayments = value)),
+            ),
            if (settings.clientInitiatedPayments == true)
              Padding(
                padding: const EdgeInsets.only(top: 16),
--- a/lib/ui/settings/task_settings.dart
+++ b/lib/ui/settings/task_settings.dart
@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/ui/settings/task_settings_vm.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:invoiceninja_flutter/utils/icons.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';

 class TaskSettings extends StatefulWidget {
  const TaskSettings({
@ -124,25 +123,23 @@ class _TaskSettingsState extends State<TaskSettings> {
                onChanged: (value) => viewModel.onCompanyChanged(
                    company.rebuild((b) => b..showTaskEndDate = value)),
              ),
-              if (supportsLatestFeatures()) ...[
-                SwitchListTile(
-                  activeColor: Theme.of(context).colorScheme.secondary,
-                  title: Text(localization.showTaskItemDescription),
-                  value: settings.showTaskItemDescription,
-                  subtitle: Text(localization.showTaskItemDescriptionHelp),
-                  onChanged: (value) => viewModel.onSettingsChanged(settings
-                      .rebuild((b) => b..showTaskItemDescription = value)),
-                ),
-                SwitchListTile(
-                  activeColor: Theme.of(context).colorScheme.secondary,
-                  title: Text(localization.allowBillableTaskItems),
-                  value: settings.allowBillableTaskItems,
-                  subtitle: Text(localization.allowBillableTaskItemsHelp),
-                  onChanged: (value) => viewModel.onSettingsChanged(settings
-                      .rebuild((b) => b..allowBillableTaskItems = value)),
-                ),
-              ],
-            ]
+              SwitchListTile(
+                activeColor: Theme.of(context).colorScheme.secondary,
+                title: Text(localization.showTaskItemDescription),
+                value: settings.showTaskItemDescription,
+                subtitle: Text(localization.showTaskItemDescriptionHelp),
+                onChanged: (value) => viewModel.onSettingsChanged(settings
+                    .rebuild((b) => b..showTaskItemDescription = value)),
+              ),
+              SwitchListTile(
+                activeColor: Theme.of(context).colorScheme.secondary,
+                title: Text(localization.allowBillableTaskItems),
+                value: settings.allowBillableTaskItems,
+                subtitle: Text(localization.allowBillableTaskItemsHelp),
+                onChanged: (value) => viewModel.onSettingsChanged(
+                    settings.rebuild((b) => b..allowBillableTaskItems = value)),
+              ),
+            ],
          ]),
          if (!viewModel.state.settingsUIState.isFiltered)
            Padding(