Merge branch 'develop'

invoiceninja · Aug 12, 2021 · c6c08ba · c6c08ba
2 parents 12acb90 + 17aa020
commit c6c08ba
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 11 deletions.
diff --git a/lib/redux/credit/credit_selectors.dart b/lib/redux/credit/credit_selectors.dart
@@ -113,7 +113,9 @@ List<String> filteredCreditsSelector(
       return false;
     }
     if (!credit.matchesFilter(creditListState.filter) &&
-        !client.matchesFilter(creditListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(creditListState.filter.toLowerCase())) {
       return false;
     }
 

diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart
@@ -146,7 +146,9 @@ List<String> filteredInvoicesSelector(
       return false;
     }
     if (!invoice.matchesFilter(invoiceListState.filter) &&
-        !client.matchesFilter(invoiceListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(invoiceListState.filter.toLowerCase())) {
       return false;
     }
     if (invoiceListState.custom1Filters.isNotEmpty &&

diff --git a/lib/redux/payment/payment_selectors.dart b/lib/redux/payment/payment_selectors.dart
@@ -123,7 +123,9 @@ List<String> filteredPaymentsSelector(
     }
 
     if (!payment.matchesFilter(paymentListState.filter) &&
-        !client.matchesFilter(paymentListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(paymentListState.filter.toLowerCase())) {
       return false;
     }
 

diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart
@@ -128,7 +128,9 @@ List<String> filteredProjectsSelector(
     }
 
     if (!project.matchesFilter(projectListState.filter) &&
-        !client.matchesFilter(projectListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(projectListState.filter.toLowerCase())) {
       return false;
     }
 

diff --git a/lib/redux/quote/quote_selectors.dart b/lib/redux/quote/quote_selectors.dart
@@ -61,7 +61,9 @@ List<String> filteredQuotesSelector(
     } else if (!quote.matchesStatuses(quoteListState.statusFilters)) {
       return false;
     } else if (!quote.matchesFilter(quoteListState.filter) &&
-        !client.matchesFilter(quoteListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(quoteListState.filter.toLowerCase())) {
       return false;
     }
 

diff --git a/lib/redux/recurring_invoice/recurring_invoice_selectors.dart b/lib/redux/recurring_invoice/recurring_invoice_selectors.dart
@@ -70,7 +70,9 @@ List<String> filteredRecurringInvoicesSelector(
       return false;
     }
     if (!invoice.matchesFilter(invoiceListState.filter) &&
-        !client.matchesFilter(invoiceListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(invoiceListState.filter.toLowerCase())) {
       return false;
     }
     if (invoiceListState.custom1Filters.isNotEmpty &&

diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart
@@ -257,8 +257,12 @@ List<String> filteredTasksSelector(
     }
 
     if (!task.matchesFilter(taskListState.filter) &&
-        !client.matchesFilter(taskListState.filter) &&
-        !project.matchesFilter(taskListState.filter)) {
+        !client.displayName
+            .toLowerCase()
+            .contains(taskListState.filter.toLowerCase()) &&
+        !project.name
+            .toLowerCase()
+            .contains(taskListState.filter.toLowerCase())) {
       return false;
     }
 

diff --git a/lib/redux/ui/pref_state.dart b/lib/redux/ui/pref_state.dart
@@ -158,10 +158,12 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
   static void _initializeBuilder(PrefStateBuilder builder) => builder
     ..useSidebarEditor.replace(BuiltMap<EntityType, bool>())
     ..sortFields.replace(BuiltMap<EntityType, PrefStateSortField>())
-    ..customColors.replace(BuiltMap<String, String>(PrefState.CONTRAST_COLORS))
+    ..customColors.replace(builder.enableDarkMode
+        ? BuiltMap<String, String>()
+        : BuiltMap<String, String>(PrefState.CONTRAST_COLORS))
     ..showKanban = false
     ..isPreviewEnabled = true
-    ..colorTheme = kColorThemeLight;
+    ..colorTheme = builder.enableDarkMode ? kColorThemeLight : kColorThemeLight;
 
   static Serializer<PrefState> get serializer => _$prefStateSerializer;
 }

diff --git a/lib/ui/expense/edit/expense_edit_settings.dart b/lib/ui/expense/edit/expense_edit_settings.dart
@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/data/models/static/currency_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
+import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
@@ -293,7 +296,21 @@ class ExpenseEditSettingsState extends State<ExpenseEditSettings> {
                 )
               : null,
           children: company.numberOfItemTaxRates == 0
-              ? [Text(localization.expenseTaxHelp)]
+              ? [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(child: Text(localization.expenseTaxHelp)),
+                      OutlinedButton(
+                          onPressed: () {
+                            final store = StoreProvider.of<AppState>(context);
+                            store.dispatch(
+                                ViewSettings(section: kSettingsTaxSettings));
+                          },
+                          child: Text(localization.settings))
+                    ],
+                  )
+                ]
               : [
                   BoolDropdownButton(
                     label: localization.enterTaxes,