From 142f22a4f8043b636b4bbb9593ebe3ef82c3bb04 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 21 Jan 2020 09:56:06 +0200
Subject: [PATCH] Web

---
 lib/ui/app/entity_dropdown.dart                  |  2 +-
 lib/ui/app/main_screen.dart                      | 13 ++++++++++++-
 .../invoice/edit/invoice_edit_items_desktop.dart | 12 ++++++++++++
 lib/utils/platforms.dart                         |  4 ++--
 pubspec.lock                                     | 16 +++++++++++++++-
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart
index 88130482d..1c7862113 100644
--- a/lib/ui/app/entity_dropdown.dart
+++ b/lib/ui/app/entity_dropdown.dart
@@ -111,7 +111,7 @@ class _EntityDropdownState extends State<EntityDropdown> {
 
   @override
   Widget build(BuildContext context) {
-    if (isNotMobile(context)) {
+    if (false && isNotMobile(context)) {
       return TypeAheadFormField<String>(
         noItemsFoundBuilder: (context) => SizedBox(),
         suggestionsBoxDecoration: SuggestionsBoxDecoration(
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 8a985742f..b67fe0326 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -4,6 +4,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
+import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/help_text.dart';
@@ -20,7 +21,7 @@ class MainScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return StoreBuilder(
-        //onInit: (Store<AppState> store) => store.dispatch(LoadClients()),
+        onInit: (Store<AppState> store) => store.dispatch(LoadClients()),
         builder: (BuildContext context, Store<AppState> store) {
       final uiState = store.state.uiState;
       final prefState = store.state.prefState;
@@ -137,6 +138,15 @@ class MainScreen extends StatelessWidget {
         }
       }
 
+      return Row(children: <Widget>[
+        if (prefState.showMenu) ...[
+          MenuDrawerBuilder(),
+          _CustomDivider(),
+        ],
+        Expanded(child: screen),
+      ]);
+
+      /*
       return WillPopScope(
         onWillPop: () async {
           final state = store.state;
@@ -172,6 +182,7 @@ class MainScreen extends StatelessWidget {
           Expanded(child: screen),
         ]),
       );
+       */
     });
   }
 }
diff --git a/lib/ui/invoice/edit/invoice_edit_items_desktop.dart b/lib/ui/invoice/edit/invoice_edit_items_desktop.dart
index 7eb5a377b..62b84bcdd 100644
--- a/lib/ui/invoice/edit/invoice_edit_items_desktop.dart
+++ b/lib/ui/invoice/edit/invoice_edit_items_desktop.dart
@@ -132,6 +132,17 @@ class _InvoiceEditItemsDesktopState extends State<InvoiceEditItemsDesktop> {
                 key: ValueKey(
                     '__line_item_${index}_${lineItems[index].createdAt}__'),
                 children: [
+                  Padding(
+                    padding: const EdgeInsets.only(right: kTableColumnGap),
+                    child: TextFormField(
+                      initialValue: lineItems[index].productKey,
+                      onChanged: (value) => viewModel.onChangedInvoiceItem(
+                          lineItems[index]
+                              .rebuild((b) => b..productKey = value),
+                          index),
+                    ),
+                  ),
+                  /*
                   Padding(
                     padding: const EdgeInsets.only(right: kTableColumnGap),
                     child: TypeAheadFormField<String>(
@@ -175,6 +186,7 @@ class _InvoiceEditItemsDesktopState extends State<InvoiceEditItemsDesktop> {
                       debounceDuration: Duration(seconds: 0),
                     ),
                   ),
+                   */
                   Padding(
                     padding: const EdgeInsets.only(right: kTableColumnGap),
                     child: TextFormField(
diff --git a/lib/utils/platforms.dart b/lib/utils/platforms.dart
index 5f96b4d28..98625320c 100644
--- a/lib/utils/platforms.dart
+++ b/lib/utils/platforms.dart
@@ -34,11 +34,11 @@ String getAppURL(BuildContext context) =>
     isAndroid(context) ? kGoogleStoreUrl : kAppleStoreUrl;
 
 AppLayout calculateLayout(BuildContext context) {
-  final size = MediaQuery.of(context).size.width;
+  final size = MediaQuery.of(context).size.shortestSide;
 
   if (size < kMobileLayoutWidth) {
     return AppLayout.mobile;
-  } else if (size > kTabletLayoutWidth || kIsWeb) {
+  } else if (size > kTabletLayoutWidth) {
     return AppLayout.desktop;
   } else {
     return AppLayout.tablet;
diff --git a/pubspec.lock b/pubspec.lock
index ee20df845..cacef2e46 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -464,7 +464,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
   io:
     dependency: transitive
     description:
@@ -848,6 +848,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.5"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   synchronized:
     dependency: transitive
     description:
@@ -981,6 +988,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
   webview_flutter:
     dependency: "direct main"
     description: