diff --git a/android/app/src/main/kotlin/com/mohem_flutter_app/MainActivity.kt b/android/app/src/main/kotlin/com/mohem_flutter_app/MainActivity.kt deleted file mode 100644 index 60cd948..0000000 --- a/android/app/src/main/kotlin/com/mohem_flutter_app/MainActivity.kt +++ /dev/null @@ -1,18 +0,0 @@ -//package com.mohem_flutter_app -package hmg.cloudSolutions.mohem - -//import io.flutter.embedding.android.FlutterActivity -// -//class MainActivity: FlutterActivity() { -//} - - -import io.flutter.embedding.android.FlutterFragmentActivity -import io.flutter.embedding.engine.FlutterEngine -import io.flutter.plugins.GeneratedPluginRegistrant - -class MainActivity: FlutterFragmentActivity() { - override fun configureFlutterEngine(flutterEngine: FlutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine) - } -} \ No newline at end of file diff --git a/lib/ui/work_list/work_list_screen.dart b/lib/ui/work_list/work_list_screen.dart index 6f93909..9ba602d 100644 --- a/lib/ui/work_list/work_list_screen.dart +++ b/lib/ui/work_list/work_list_screen.dart @@ -115,7 +115,7 @@ class _WorkListScreenState extends State { workListElement.value = providerData.cocFinalCount; } else { var tempList = providerData.getOpenNotificationsList?.where((notificationElement) => notificationElement.itemType == workListElement.key).toList(); - if (tempList!.isNotEmpty) { + if (tempList != null && tempList.isNotEmpty) { workListElement.value = tempList.first.openNtfNumber ?? 0; } } diff --git a/pubspec.yaml b/pubspec.yaml index 042fea0..1cf5e83 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,20 +43,20 @@ dependencies: sizer: ^3.0.5 local_auth: ^2.3.0 fluttertoast: ^8.0.8 - syncfusion_flutter_calendar: ^29.2.4 + syncfusion_flutter_calendar: ^30.2.6 # flutter_calendar_carousel: ^2.1.0 pie_chart: ^5.1.0 shared_preferences: ^2.0.12 - firebase_messaging: ^15.2.5 + firebase_messaging: ^16.0.0 shimmer: ^3.0.0 logger: ^2.5.0 flutter_countdown_timer: ^4.1.0 - nfc_manager: ^3.5.0 + nfc_manager: ^4.0.2 platform_device_id_v2: ^1.0.4 image_picker: ^1.1.2 file_picker: ^10.1.9 geolocator: ^14.0.0 - month_year_picker: ^0.4.0+1 + month_year_picker: ^0.5.0+1 month_picker_dialog: any # open_file: ^3.2.1 open_filex: ^4.4.0 @@ -81,7 +81,7 @@ dependencies: signalr_netcore: ^1.3.3 logging: ^1.0.1 swipe_to: ^1.0.2 - flutter_webrtc: ^0.14.0 + flutter_webrtc: ^1.1.0 camera: ^0.11.1 flutter_local_notifications: ^19.2.1 #firebase_analytics: any @@ -103,7 +103,7 @@ dependencies: # huawei_location: 6.0.0+302 huawei_location: ^6.11.0+301 # huawei_push: ^6.12.0+303 - firebase_crashlytics: ^4.3.5 + firebase_crashlytics: ^5.0.0 #Items for sale Image Carousel Slider carousel_slider: ^5.0.0 @@ -116,12 +116,13 @@ dependencies: #todo its for temporary purpose, later will remove this. dotted_border: ^3.0.1 - device_info_plus: ^11.4.0 + device_info_plus: ^11.5.0 # saf: ^1.0.3+4 dependency_overrides: intl: ^0.19.0 + nfc_manager: ^3.5.0 dev_dependencies: