Merge branch 'develop'

lib/constants.dart

@@ -4,7 +4,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.70';
+const String kClientVersion = '5.0.71';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';

lib/data/file_storage.dart

@@ -8,6 +8,7 @@ import 'package:flutter/foundation.dart';
 
 // Package imports:
 import 'package:archive/archive.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 //import 'package:idb_shim/idb.dart';
@@ -28,10 +29,10 @@ class FileStorage {
   Future<File> _getLocalFile() async {
     final dir = await getDirectory();
 
-    if (kIsWeb || Platform.isAndroid || Platform.isIOS) {
-      return File('${dir.path}/invoiceninja__$tag.json');
-    } else {
+    if (isWindows() || isLinux()) {
       return File('${dir.path}/invoiceninja/$tag.json');
+    } else {
+      return File('${dir.path}/invoiceninja__$tag.json');
     }
   }
 

lib/main.dart

@@ -137,11 +137,6 @@ void main({bool isTesting = false}) async {
   doWhenWindowReady(() {
     final win = appWindow;
     win.title = 'Invoice Ninja';
-    //const initialSize = Size(600, 450);
-    //win.minSize = initialSize;
-    //win.size = initialSize;
-    //win.alignment = Alignment.center;
-    //win.maximize();
     win.show();
   });
 }

lib/ui/app/main_screen.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 // Package imports:
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/ui/app/app_title_bar.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:redux/redux.dart';
 
 // Project imports:
@@ -295,7 +296,7 @@ class MainScreen extends StatelessWidget {
               policy: ReadingOrderTraversalPolicy(),
               child: Column(
                 children: [
-                  AppTitleBar(),
+                  if (isDesktopOS()) AppTitleBar(),
                   Expanded(
                     child: ChangeLayoutBanner(
                       appLayout: prefState.appLayout,

lib/ui/app/menu_drawer.dart

@@ -162,7 +162,15 @@ class MenuDrawer extends StatelessWidget {
       onSelected: (String companyId) {
         if (companyId == 'logout') {
           viewModel.onLogoutTap(context);
-        } else if (!state.isLoaded || state.isLoading || state.isSaving) {
+        } else if (state.isLoading) {
+          showMessageDialog(
+              context: context, message: localization.waitForLoading);
+          return;
+        } else if (state.isSaving) {
+          showMessageDialog(
+              context: context, message: localization.waitForSaving);
+          return;
+        } else if (!state.isLoaded) {
           showMessageDialog(
               context: context, message: localization.waitForData);
           return;
@@ -221,9 +229,15 @@ class MenuDrawer extends StatelessWidget {
               onChanged: (dynamic value) {
                 if (value == 'logout' && !state.isLoading && !state.isSaving) {
                   viewModel.onLogoutTap(context);
-                } else if (!state.isLoaded ||
-                    state.isLoading ||
-                    state.isSaving) {
+                } else if (state.isLoading) {
+                  showMessageDialog(
+                      context: context, message: localization.waitForLoading);
+                  return;
+                } else if (state.isSaving) {
+                  showMessageDialog(
+                      context: context, message: localization.waitForSaving);
+                  return;
+                } else if (!state.isLoaded) {
                   showMessageDialog(
                       context: context, message: localization.waitForData);
                   return;

lib/utils/i18n.dart

@@ -16,6 +16,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
   static final Map<String, Map<String, String>> _localizedValues = {
     'en': {
       // STARTER: lang key - do not remove comment
+      'wait_for_loading': 'Data loading - please wait for it to complete',
+      'wait_for_saving': 'Data saving - please wait for it to complete',
       'html_preview_warning':
           'Note: changes made here are only previewed, they must be applied in the tabs above to be saved',
       'remaining': 'Remaining',
@@ -70925,6 +70927,14 @@ mixin LocalizationsProvider on LocaleCodeAware {
       _localizedValues[localeCode]['html_preview_warning'] ??
       _localizedValues['en']['html_preview_warning'];
 
+  String get waitForLoading =>
+      _localizedValues[localeCode]['wait_for_loading'] ??
+      _localizedValues['en']['wait_for_loading'];
+
+  String get waitForSaving =>
+      _localizedValues[localeCode]['wait_for_saving'] ??
+      _localizedValues['en']['wait_for_saving'];
+
   // STARTER: lang field - do not remove comment
 
   String lookup(String key) {

macos/Runner.xcodeproj/project.pbxproj

@@ -420,13 +420,13 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 5.0.68;
+				MARKETING_VERSION = 5.0.71;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};
@@ -548,13 +548,13 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 5.0.68;
+				MARKETING_VERSION = 5.0.71;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -570,13 +570,13 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 5.0.68;
+				MARKETING_VERSION = 5.0.71;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};

pubspec.foss.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.70+70
+version: 5.0.71+71
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none
@@ -90,7 +90,7 @@ msix_config:
   display_name: Invoice Ninja
   publisher_display_name: Invoice Ninja
   identity_name: InvoiceNinja.InvoiceNinja
-  msix_version: 5.0.70.0
+  msix_version: 5.0.71.0
   publisher: CN=2B7AA393-06A0-46F5-AF85-1917142440C3
   architecture: x64
   capabilities: 'internetClient'

pubspec.next.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.70+70
+version: 5.0.71+71
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none
@@ -90,7 +90,7 @@ msix_config:
   display_name: Invoice Ninja
   publisher_display_name: Invoice Ninja
   identity_name: InvoiceNinja.InvoiceNinja
-  msix_version: 5.0.70.0
+  msix_version: 5.0.71.0
   publisher: CN=2B7AA393-06A0-46F5-AF85-1917142440C3
   architecture: x64
   capabilities: 'internetClient'

pubspec.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.70+70
+version: 5.0.71+71
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none
@@ -90,7 +90,7 @@ msix_config:
   display_name: Invoice Ninja
   publisher_display_name: Invoice Ninja
   identity_name: InvoiceNinja.InvoiceNinja
-  msix_version: 5.0.70.0
+  msix_version: 5.0.71.0
   publisher: CN=2B7AA393-06A0-46F5-AF85-1917142440C3
   architecture: x64
   capabilities: 'internetClient'