From 8ac5642c06a78151f80d631b9528080bcfe06a15 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 19 Aug 2019 14:29:28 +0300
Subject: [PATCH] Tablet layout

---
 lib/redux/expense/expense_middleware.dart | 21 ++++++++++++++++++---
 lib/redux/task/task_middleware.dart       | 21 ++++++++++++++++++---
 lib/redux/vendor/vendor_middleware.dart   | 21 ++++++++++++++++++---
 3 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/lib/redux/expense/expense_middleware.dart b/lib/redux/expense/expense_middleware.dart
index 897700091..55f6d60e5 100644
--- a/lib/redux/expense/expense_middleware.dart
+++ b/lib/redux/expense/expense_middleware.dart
@@ -70,10 +70,18 @@ Middleware<AppState> _viewExpense() {
       NextDispatcher next) async {
     final action = dynamicAction as ViewExpense;
 
+    if (hasChanges(
+        store: store, context: action.context, force: action.force)) {
+      return;
+    }
+
     next(action);
 
     store.dispatch(UpdateCurrentRoute(ExpenseViewScreen.route));
-    Navigator.of(action.context).pushNamed(ExpenseViewScreen.route);
+
+    if (isMobile(action.context)) {
+      Navigator.of(action.context).pushNamed(ExpenseViewScreen.route);
+    }
   };
 }
 
@@ -81,12 +89,19 @@ Middleware<AppState> _viewExpenseList() {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as ViewExpenseList;
 
+    if (hasChanges(
+        store: store, context: action.context, force: action.force)) {
+      return;
+    }
+
     next(action);
 
     store.dispatch(UpdateCurrentRoute(ExpenseScreen.route));
 
-    Navigator.of(action.context).pushNamedAndRemoveUntil(
-        ExpenseScreen.route, (Route<dynamic> route) => false);
+    if (isMobile(action.context)) {
+      Navigator.of(action.context).pushNamedAndRemoveUntil(
+          ExpenseScreen.route, (Route<dynamic> route) => false);
+    }
   };
 }
 
diff --git a/lib/redux/task/task_middleware.dart b/lib/redux/task/task_middleware.dart
index cad92c3bf..35d953ae4 100644
--- a/lib/redux/task/task_middleware.dart
+++ b/lib/redux/task/task_middleware.dart
@@ -69,10 +69,18 @@ Middleware<AppState> _viewTask() {
       NextDispatcher next) async {
     final action = dynamicAction as ViewTask;
 
+    if (hasChanges(
+        store: store, context: action.context, force: action.force)) {
+      return;
+    }
+
     next(action);
 
     store.dispatch(UpdateCurrentRoute(TaskViewScreen.route));
-    Navigator.of(action.context).pushNamed(TaskViewScreen.route);
+
+    if (isMobile(action.context)) {
+      Navigator.of(action.context).pushNamed(TaskViewScreen.route);
+    }
   };
 }
 
@@ -80,12 +88,19 @@ Middleware<AppState> _viewTaskList() {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as ViewTaskList;
 
+    if (hasChanges(
+        store: store, context: action.context, force: action.force)) {
+      return;
+    }
+
     next(action);
 
     store.dispatch(UpdateCurrentRoute(TaskScreen.route));
 
-    Navigator.of(action.context).pushNamedAndRemoveUntil(
-        TaskScreen.route, (Route<dynamic> route) => false);
+    if (isMobile(action.context)) {
+      Navigator.of(action.context).pushNamedAndRemoveUntil(
+          TaskScreen.route, (Route<dynamic> route) => false);
+    }
   };
 }
 
diff --git a/lib/redux/vendor/vendor_middleware.dart b/lib/redux/vendor/vendor_middleware.dart
index 798e18e57..80b329d3a 100644
--- a/lib/redux/vendor/vendor_middleware.dart
+++ b/lib/redux/vendor/vendor_middleware.dart
@@ -70,10 +70,18 @@ Middleware<AppState> _viewVendor() {
       NextDispatcher next) async {
     final action = dynamicAction as ViewVendor;
 
+    if (hasChanges(
+        store: store, context: action.context, force: action.force)) {
+      return;
+    }
+
     next(action);
 
     store.dispatch(UpdateCurrentRoute(VendorViewScreen.route));
-    Navigator.of(action.context).pushNamed(VendorViewScreen.route);
+
+    if (isMobile(action.context)) {
+      Navigator.of(action.context).pushNamed(VendorViewScreen.route);
+    }
   };
 }
 
@@ -81,12 +89,19 @@ Middleware<AppState> _viewVendorList() {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as ViewVendorList;
 
+    if (hasChanges(
+        store: store, context: action.context, force: action.force)) {
+      return;
+    }
+
     next(action);
 
     store.dispatch(UpdateCurrentRoute(VendorScreen.route));
 
-    Navigator.of(action.context).pushNamedAndRemoveUntil(
-        VendorScreen.route, (Route<dynamic> route) => false);
+    if (isMobile(action.context)) {
+      Navigator.of(action.context).pushNamedAndRemoveUntil(
+          VendorScreen.route, (Route<dynamic> route) => false);
+    }
   };
 }