Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan

lib/provider/eit_provider_model.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/dashboard_api_client.dart';
@@ -29,7 +28,9 @@ class EITProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       isEitLoaded = false;
       logger.wtf(ex);
       notifyListeners();
-      Utils.handleException(ex, null);
+      Utils.handleException(ex, null, (ts) {
+        print(ts);
+      });
     }
   }
 }

lib/ui/screens/eit/add_eit.dart

@@ -3,9 +3,9 @@ import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/models/dashboard/menu_entries.dart';
 import 'package:mohem_flutter_app/models/dashboard/menus.dart';
 import 'package:mohem_flutter_app/provider/eit_provider_model.dart';
-import 'package:mohem_flutter_app/ui/app_bar.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/ui/landing/widget/missing_swipe.dart';
+import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:provider/provider.dart';
 
 class AddEITScreen extends StatelessWidget {
@@ -22,10 +22,11 @@ class AddEITScreen extends StatelessWidget {
         length: 2,
         child: Scaffold(
           backgroundColor: Colors.white,
-          appBar: appBar(
+          appBar: AppBarWidget(context, title: getMenu.prompt.toString()),
-            context,
+          //AppBar(
-            title: getMenu.prompt.toString(),
+
-          ),
+          // title: getMenu.prompt.toString(),
+          //  ),
           body: Container(
               width: double.infinity,
               height: double.infinity,

lib/ui/screens/submenu_screen.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/models/dashboard/menu_entries.dart';
 import 'package:mohem_flutter_app/models/dashboard/menus.dart';
-import 'package:mohem_flutter_app/ui/app_bar.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
+import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 
 class SubMenuScreen extends StatelessWidget {
   late Menus menu;
@@ -12,10 +12,12 @@ class SubMenuScreen extends StatelessWidget {
     menu = ModalRoute.of(context)!.settings.arguments as Menus;
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: appBar(
+      appBar: AppBarWidget(context, title: menu.menuEntry.prompt.toString()),
-        context,
+      // AppBar(
-        title: menu.menuEntry.prompt.toString(),
+      // context,
-      ),
+      // title: menu.menuEntry.prompt.toString(),
+      // ),
+
       body: Container(
           width: double.infinity,
           height: double.infinity,