From a643fa677c3bcb7e13fff827182e52e2d31e86e6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 20 Aug 2019 19:11:59 +0300
Subject: [PATCH] Tablet layout

---
 lib/redux/document/document_actions.dart | 7 +++++--
 lib/redux/expense/expense_reducer.dart   | 3 ++-
 lib/redux/expense/expense_selectors.dart | 3 +--
 lib/redux/invoice/invoice_reducer.dart   | 3 ++-
 lib/redux/payment/payment_reducer.dart   | 3 ++-
 lib/redux/payment/payment_selectors.dart | 2 +-
 lib/redux/project/project_actions.dart   | 2 +-
 lib/redux/project/project_reducer.dart   | 3 ++-
 lib/redux/project/project_selectors.dart | 3 +--
 lib/redux/quote/quote_middleware.dart    | 2 +-
 lib/redux/quote/quote_reducer.dart       | 3 ++-
 lib/redux/task/task_reducer.dart         | 3 ++-
 lib/redux/task/task_selectors.dart       | 4 +---
 lib/redux/vendor/vendor_actions.dart     | 2 +-
 lib/redux/vendor/vendor_reducer.dart     | 3 ++-
 lib/redux/vendor/vendor_selectors.dart   | 3 +--
 lib/ui/app/list_filter_button.dart       | 3 ++-
 lib/ui/app/main_screen.dart              | 1 -
 lib/ui/client/view/client_view.dart      | 8 +++++---
 lib/ui/task/task_list_item.dart          | 4 +---
 lib/utils/i18n.dart                      | 3 ++-
 stubs/redux/stub/stub_reducer            | 2 +-
 22 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/lib/redux/document/document_actions.dart b/lib/redux/document/document_actions.dart
index 5e8e4a4b1..0a6abd363 100644
--- a/lib/redux/document/document_actions.dart
+++ b/lib/redux/document/document_actions.dart
@@ -22,8 +22,11 @@ class ViewDocument implements PersistUI {
 }
 
 class EditDocument implements PersistUI {
-  EditDocument(
-      {this.document, this.context, this.completer,});
+  EditDocument({
+    this.document,
+    this.context,
+    this.completer,
+  });
 
   final DocumentEntity document;
   final BuildContext context;
diff --git a/lib/redux/expense/expense_reducer.dart b/lib/redux/expense/expense_reducer.dart
index 594c0a280..97a6739be 100644
--- a/lib/redux/expense/expense_reducer.dart
+++ b/lib/redux/expense/expense_reducer.dart
@@ -17,7 +17,8 @@ Reducer<int> selectedIdReducer = combineReducers([
   TypedReducer<int, ViewExpense>((selectedId, action) => action.expenseId),
   TypedReducer<int, AddExpenseSuccess>(
       (selectedId, action) => action.expense.id),
-  TypedReducer<int, FilterExpensesByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterExpensesByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<ExpenseEntity>([
diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart
index a22131481..b58aaa72d 100644
--- a/lib/redux/expense/expense_selectors.dart
+++ b/lib/redux/expense/expense_selectors.dart
@@ -204,7 +204,6 @@ List<int> clientExpenseList(
   return list;
 }
 
-
 bool hasExpenseChanges(
-    ExpenseEntity expense, BuiltMap<int, ExpenseEntity> expenseMap) =>
+        ExpenseEntity expense, BuiltMap<int, ExpenseEntity> expenseMap) =>
     expense.isNew || expense != expenseMap[expense.id];
diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart
index 380809e01..d11c13790 100644
--- a/lib/redux/invoice/invoice_reducer.dart
+++ b/lib/redux/invoice/invoice_reducer.dart
@@ -40,7 +40,8 @@ Reducer<int> selectedIdReducer = combineReducers([
       (selectedId, action) => action.invoice.id),
   TypedReducer<int, ShowEmailInvoice>(
       (selectedId, action) => action.invoice.id),
-  TypedReducer<int, FilterInvoicesByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterInvoicesByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<InvoiceEntity>([
diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart
index afdfef0fd..b87e7e7c8 100644
--- a/lib/redux/payment/payment_reducer.dart
+++ b/lib/redux/payment/payment_reducer.dart
@@ -17,7 +17,8 @@ Reducer<int> selectedIdReducer = combineReducers([
   TypedReducer<int, ViewPayment>((selectedId, action) => action.paymentId),
   TypedReducer<int, AddPaymentSuccess>(
       (selectedId, action) => action.payment.id),
-  TypedReducer<int, FilterPaymentsByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterPaymentsByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<PaymentEntity>([
diff --git a/lib/redux/payment/payment_selectors.dart b/lib/redux/payment/payment_selectors.dart
index 06a1663e2..52b57e52f 100644
--- a/lib/redux/payment/payment_selectors.dart
+++ b/lib/redux/payment/payment_selectors.dart
@@ -140,5 +140,5 @@ String invoiceStatsForClient(
 }
 
 bool hasPaymentChanges(
-    PaymentEntity payment, BuiltMap<int, PaymentEntity> paymentMap) =>
+        PaymentEntity payment, BuiltMap<int, PaymentEntity> paymentMap) =>
     payment.isNew || payment != paymentMap[payment.id];
diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart
index 8d5a91d33..367e62ff8 100644
--- a/lib/redux/project/project_actions.dart
+++ b/lib/redux/project/project_actions.dart
@@ -36,7 +36,7 @@ class EditProject implements PersistUI {
       {@required this.project,
       @required this.context,
       this.completer,
-        this.cancelCompleter,
+      this.cancelCompleter,
       this.force = false});
 
   final ProjectEntity project;
diff --git a/lib/redux/project/project_reducer.dart b/lib/redux/project/project_reducer.dart
index 5d5ccf6f6..9b0377582 100644
--- a/lib/redux/project/project_reducer.dart
+++ b/lib/redux/project/project_reducer.dart
@@ -33,7 +33,8 @@ Reducer<int> selectedIdReducer = combineReducers([
   TypedReducer<int, ViewProject>((selectedId, action) => action.projectId),
   TypedReducer<int, AddProjectSuccess>(
       (selectedId, action) => action.project.id),
-  TypedReducer<int, FilterProjectsByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterProjectsByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<ProjectEntity>([
diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart
index e9e173fff..19dceed49 100644
--- a/lib/redux/project/project_selectors.dart
+++ b/lib/redux/project/project_selectors.dart
@@ -166,7 +166,6 @@ String projectStatsForClient(
   return str;
 }
 
-
 bool hasProjectChanges(
-    ProjectEntity project, BuiltMap<int, ProjectEntity> projectMap) =>
+        ProjectEntity project, BuiltMap<int, ProjectEntity> projectMap) =>
     project.isNew || project != projectMap[project.id];
diff --git a/lib/redux/quote/quote_middleware.dart b/lib/redux/quote/quote_middleware.dart
index e8fb76cb4..8be701725 100644
--- a/lib/redux/quote/quote_middleware.dart
+++ b/lib/redux/quote/quote_middleware.dart
@@ -93,7 +93,7 @@ Middleware<AppState> _editQuote() {
 
     if (isMobile(action.context)) {
       final quote =
-      await Navigator.of(action.context).pushNamed(QuoteEditScreen.route);
+          await Navigator.of(action.context).pushNamed(QuoteEditScreen.route);
 
       if (action.completer != null && quote != null) {
         action.completer.complete(quote);
diff --git a/lib/redux/quote/quote_reducer.dart b/lib/redux/quote/quote_reducer.dart
index c0bcae0fa..56f12f5ed 100644
--- a/lib/redux/quote/quote_reducer.dart
+++ b/lib/redux/quote/quote_reducer.dart
@@ -37,7 +37,8 @@ Reducer<int> selectedIdReducer = combineReducers([
   TypedReducer<int, ViewQuote>((selectedId, action) => action.quoteId),
   TypedReducer<int, AddQuoteSuccess>((selectedId, action) => action.quote.id),
   TypedReducer<int, ShowEmailQuote>((selectedId, action) => action.quote.id),
-  TypedReducer<int, FilterQuotesByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterQuotesByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<InvoiceEntity>([
diff --git a/lib/redux/task/task_reducer.dart b/lib/redux/task/task_reducer.dart
index c1da1c756..0f45b7166 100644
--- a/lib/redux/task/task_reducer.dart
+++ b/lib/redux/task/task_reducer.dart
@@ -26,7 +26,8 @@ TaskTime editTaskTime(TaskTime taskTime, dynamic action) {
 Reducer<int> selectedIdReducer = combineReducers([
   TypedReducer<int, ViewTask>((selectedId, action) => action.taskId),
   TypedReducer<int, AddTaskSuccess>((selectedId, action) => action.task.id),
-  TypedReducer<int, FilterTasksByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterTasksByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<TaskEntity>([
diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart
index a3df10c78..719bbea06 100644
--- a/lib/redux/task/task_selectors.dart
+++ b/lib/redux/task/task_selectors.dart
@@ -221,7 +221,5 @@ String taskStatsForProject(int projectId, BuiltMap<int, TaskEntity> taskMap,
   return str;
 }
 
-
-bool hasTaskChanges(
-    TaskEntity task, BuiltMap<int, TaskEntity> taskMap) =>
+bool hasTaskChanges(TaskEntity task, BuiltMap<int, TaskEntity> taskMap) =>
     task.isNew || task != taskMap[task.id];
diff --git a/lib/redux/vendor/vendor_actions.dart b/lib/redux/vendor/vendor_actions.dart
index 4cf2fc10a..f04045dcb 100644
--- a/lib/redux/vendor/vendor_actions.dart
+++ b/lib/redux/vendor/vendor_actions.dart
@@ -34,7 +34,7 @@ class EditVendor implements PersistUI {
       @required this.context,
       this.contact,
       this.completer,
-        this.cancelCompleter,
+      this.cancelCompleter,
       this.force = false});
 
   final VendorEntity vendor;
diff --git a/lib/redux/vendor/vendor_reducer.dart b/lib/redux/vendor/vendor_reducer.dart
index 4fee331dd..2771eef5b 100644
--- a/lib/redux/vendor/vendor_reducer.dart
+++ b/lib/redux/vendor/vendor_reducer.dart
@@ -44,7 +44,8 @@ VendorContactEntity editVendorContact(
 Reducer<int> selectedIdReducer = combineReducers([
   TypedReducer<int, ViewVendor>((selectedId, action) => action.vendorId),
   TypedReducer<int, AddVendorSuccess>((selectedId, action) => action.vendor.id),
-  TypedReducer<int, FilterVendorsByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterVendorsByEntity>(
+      (selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<VendorEntity>([
diff --git a/lib/redux/vendor/vendor_selectors.dart b/lib/redux/vendor/vendor_selectors.dart
index 0a76a60aa..833145c4c 100644
--- a/lib/redux/vendor/vendor_selectors.dart
+++ b/lib/redux/vendor/vendor_selectors.dart
@@ -79,7 +79,6 @@ double calculateVendorBalance(int vendorId, int currencyId,
   return total;
 }
 
-
 bool hasVendorChanges(
-    VendorEntity vendor, BuiltMap<int, VendorEntity> vendorMap) =>
+        VendorEntity vendor, BuiltMap<int, VendorEntity> vendorMap) =>
     vendor.isNew || vendor != vendorMap[vendor.id];
diff --git a/lib/ui/app/list_filter_button.dart b/lib/ui/app/list_filter_button.dart
index 74820d8e4..1d5ea18ac 100644
--- a/lib/ui/app/list_filter_button.dart
+++ b/lib/ui/app/list_filter_button.dart
@@ -24,7 +24,8 @@ class ListFilterButton extends StatelessWidget {
           : store.state.uiState.filter,
       builder: (BuildContext context, filter) {
         return FlatButton(
-          child: Text(filter == null ? localization.search : localization.close),
+          child:
+              Text(filter == null ? localization.search : localization.close),
           onPressed: () => onFilterPressed(filter == null ? '' : null),
         );
       },
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index d41d3761c..2ada6f332 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -138,7 +138,6 @@ class EntityScreens extends StatelessWidget {
     final subRoute = uiState.subRoute;
     final entityUIState = state.getUIState(entityType);
 
-
     return Row(
       children: <Widget>[
         Expanded(
diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart
index de3ea1031..3b8048f48 100644
--- a/lib/ui/client/view/client_view.dart
+++ b/lib/ui/client/view/client_view.dart
@@ -260,9 +260,11 @@ class _CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
           ),
         ],
       ),
-      leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: () {
-        viewModel.onBackPressed();
-      }),
+      leading: IconButton(
+          icon: Icon(Icons.arrow_back),
+          onPressed: () {
+            viewModel.onBackPressed();
+          }),
       actions: client.isNew
           ? []
           : [
diff --git a/lib/ui/task/task_list_item.dart b/lib/ui/task/task_list_item.dart
index dd6ade1d0..92d047823 100644
--- a/lib/ui/task/task_list_item.dart
+++ b/lib/ui/task/task_list_item.dart
@@ -63,9 +63,7 @@ class TaskListItem extends StatelessWidget {
 
     return DismissibleEntity(
       isSelected: task.id ==
-          (uiState.isEditing
-              ? taskUIState.editing.id
-              : taskUIState.selectedId),
+          (uiState.isEditing ? taskUIState.editing.id : taskUIState.selectedId),
       user: user,
       entity: task,
       onEntityAction: onEntityAction,
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 8205913df..bfcfb870d 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -13731,7 +13731,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get download => _localizedValues[localeCode]['download'];
 
-  String get noRecordSelected => _localizedValues[localeCode]['no_record_selected'];
+  String get noRecordSelected =>
+      _localizedValues[localeCode]['no_record_selected'];
 
   String get requiresAnEnterprisePlan =>
       _localizedValues[localeCode]['requires_an_enterprise_plan'];
diff --git a/stubs/redux/stub/stub_reducer b/stubs/redux/stub/stub_reducer
index c241880b2..10b9d16b1 100644
--- a/stubs/redux/stub/stub_reducer
+++ b/stubs/redux/stub/stub_reducer
@@ -18,7 +18,7 @@ Reducer<int> selectedIdReducer = combineReducers([
       (int selectedId, dynamic dynamicAction) => action.stubId),
   TypedReducer<int, AddStubSuccess>(
       (int selectedId, dynamic dynamicAction) => action.stub.id),
-  TypedReducer<int, FilterStubsByEntity>((selectedId, action) => 0)
+  TypedReducer<int, FilterStubsByEntity>((selectedId, action) => action.entityId == null ? selectedId : 0)
 ]);
 
 final editingReducer = combineReducers<StubEntity>([