Merge branch 'develop'

lib/main_app.dart

@@ -11,6 +11,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:flutter_styled_toast/flutter_styled_toast.dart';
 import 'package:intl/intl.dart';
+import 'package:invoiceninja_flutter/ui/app/important_message_banner.dart';
 import 'package:invoiceninja_flutter/ui/app/window_manager.dart';
 import 'package:invoiceninja_flutter/ui/bank_account/edit/bank_account_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/purchase_order/purchase_order_email_vm.dart';
@@ -28,7 +29,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/company/company_selectors.dart';
 import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/ui/app/app_builder.dart';
-import 'package:invoiceninja_flutter/ui/app/change_layout_banner.dart';
 import 'package:invoiceninja_flutter/ui/app/main_screen.dart';
 import 'package:invoiceninja_flutter/ui/app/screen_imports.dart';
 import 'package:invoiceninja_flutter/ui/app/web_session_timeout.dart';
@@ -500,7 +500,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                           LoginScreen.route: (context) => LoginScreen(),
                           MainScreen.route: (context) => MainScreen(),
                           DashboardScreenBuilder.route: (context) =>
-                              ChangeLayoutBanner(
+                              ImportantMessageBanner(
                                 suggestedLayout: AppLayout.mobile,
                                 appLayout: state.prefState.appLayout,
                                 child: DashboardScreenBuilder(),

lib/redux/app/app_actions.dart

@@ -104,9 +104,9 @@ class UpdateLastHistory implements PersistUI {
   final int page;
 }
 
-class DismissNativeWarning implements PersistUI {}
+class DismissFlutterWebWarning implements PersistUI {}
 
-class DismissNativeWarningPermanently implements PersistUI, PersistPrefs {}
+class DismissFlutterWebWarningPermanently implements PersistUI, PersistPrefs {}
 
 class DismissGatewayWarningPermanently implements PersistUI, PersistPrefs {}
 

lib/redux/app/app_reducer.dart

@@ -67,8 +67,8 @@ AppState appReducer(AppState state, dynamic action) {
   return state.rebuild((b) => b
     ..isLoading = loadingReducer(state.isLoading, action)
     ..isSaving = savingReducer(state.isSaving, action)
-    ..dismissedNativeWarning =
-        dismissedNativeWarningReducer(state.dismissedNativeWarning, action)
+    ..dismissedFlutterWebWarning = dismissedFlutterWebWarningReducer(
+        state.dismissedFlutterWebWarning, action)
     ..lastError = lastErrorReducer(state.lastError, action)
     ..authState.replace(authReducer(state.authState, action))
     ..staticState.replace(staticReducer(state.staticState, action))
@@ -166,11 +166,11 @@ final lastErrorReducer = combineReducers<String>([
   }),
 ]);
 
-final dismissedNativeWarningReducer = combineReducers<bool>([
-  TypedReducer<bool, DismissNativeWarning>((state, action) {
+final dismissedFlutterWebWarningReducer = combineReducers<bool>([
+  TypedReducer<bool, DismissFlutterWebWarning>((state, action) {
     return true;
   }),
-  TypedReducer<bool, DismissNativeWarningPermanently>((state, action) {
+  TypedReducer<bool, DismissFlutterWebWarningPermanently>((state, action) {
     return true;
   }),
 ]);

lib/redux/app/app_state.dart

@@ -93,7 +93,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
       isSaving: false,
       isTesting: false,
       isWhiteLabeled: isWhiteLabeled,
-      dismissedNativeWarning: false,
+      dismissedFlutterWebWarning: false,
       lastError: '',
       authState: AuthState(
         url: url,
@@ -126,7 +126,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
 
   bool get isWhiteLabeled;
 
-  bool get dismissedNativeWarning;
+  bool get dismissedFlutterWebWarning;
 
   String get lastError;
 

lib/redux/ui/pref_reducer.dart

@@ -66,8 +66,8 @@ PrefState prefReducer(
     ..menuSidebarMode = manuSidebarReducer(state.menuSidebarMode, action)
     ..historySidebarMode =
         historySidebarReducer(state.historySidebarMode, action)
-    ..hideDesktopWarning =
-        hideDesktopWarningReducer(state.hideDesktopWarning, action)
+    ..hideFlutterWebWarning =
+        hideFlutterWebWarningReducer(state.hideFlutterWebWarning, action)
     ..hideTaskExtensionBanner =
         hideTaskExtensionBannerReducer(state.hideTaskExtensionBanner, action)
     ..hideGatewayWarning =
@@ -256,8 +256,8 @@ Reducer<String> filterReducer = combineReducers([
 ]);
 */
 
-Reducer<bool> hideDesktopWarningReducer = combineReducers([
-  TypedReducer<bool, DismissNativeWarningPermanently>((filter, action) {
+Reducer<bool> hideFlutterWebWarningReducer = combineReducers([
+  TypedReducer<bool, DismissFlutterWebWarningPermanently>((filter, action) {
     return true;
   }),
 ]);

lib/redux/ui/pref_state.dart

@@ -38,7 +38,7 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
       textScaleFactor: 1,
       longPressSelectionIsDefault: true,
       tapSelectedToEdit: false,
-      hideDesktopWarning: false,
+      hideFlutterWebWarning: false,
       hideGatewayWarning: false,
       hideReviewApp: false,
       hideOneYearReviewApp: false,
@@ -158,7 +158,7 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
 
   String get darkColorTheme;
 
-  bool get hideDesktopWarning;
+  bool get hideFlutterWebWarning;
 
   bool get hideGatewayWarning;
 
@@ -269,7 +269,7 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
     ..showKanban = false
     ..isPreviewVisible = false
     ..isFilterVisible = false
-    ..hideDesktopWarning = false
+    ..hideFlutterWebWarning = false
     ..hideGatewayWarning = false
     ..hideReviewApp = false
     ..hideOneYearReviewApp = false