diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart index 4e5c7b8..40add26 100644 --- a/lib/core/app_assets.dart +++ b/lib/core/app_assets.dart @@ -1,7 +1,6 @@ class AppAssets { static const String svgBasePath = 'assets/images/svg'; static const String pngBasePath = 'assets/images/png'; - static const String jpgBasePath = 'assets/images/jpg'; static const String hmg = '$svgBasePath/hmg.svg'; static const String arrow_back = '$svgBasePath/arrow-back.svg'; @@ -235,6 +234,17 @@ class AppAssets { static const String heart = '$svgBasePath/heart.svg'; static const String alertSquare = '$svgBasePath/alert-square.svg'; static const String arrowRight = '$svgBasePath/arrow-right.svg'; + static const String tickIcon = '$svgBasePath/tick.svg'; + + // Symptoms Checker + static const String calendarGrey = '$svgBasePath/calendar-grey.svg'; + static const String weightScale = '$svgBasePath/weight-scale.svg'; + static const String rulerIcon = '$svgBasePath/ruler.svg'; + static const String genderIcon = '$svgBasePath/gender.svg'; + static const String bodyIcon = '$svgBasePath/body_icon.svg'; + static const String rotateIcon = '$svgBasePath/rotate_icon.svg'; + static const String refreshIcon = '$svgBasePath/refresh.svg'; + static const String homeBorderedIcon = '$svgBasePath/home_bordered.svg'; // PNGS // static const String hmgLogo = '$pngBasePath/hmg_logo.png'; @@ -257,8 +267,6 @@ class AppAssets { static const String fullBodyFront = '$pngBasePath/full_body_front.png'; static const String fullBodyBack = '$pngBasePath/full_body_back.png'; - // JPGS // - static const String report = '$jpgBasePath/hmg_logo.jpg'; } class AppAnimations { @@ -280,3 +288,4 @@ class AppAnimations { static const String ambulanceAlert = '$lottieBasePath/ambulance_alert.json'; static const String rrtAmbulance = '$lottieBasePath/rrt_ambulance.json'; } + diff --git a/lib/core/dependencies.dart b/lib/core/dependencies.dart index 674cd02..a6699c6 100644 --- a/lib/core/dependencies.dart +++ b/lib/core/dependencies.dart @@ -134,7 +134,7 @@ class AppDependencies { getIt.registerLazySingleton(() => ActivePrescriptionsRepoImp(loggerService: getIt(), apiClient: getIt())); getIt.registerLazySingleton(() => TermsConditionsRepoImp(loggerService: getIt(), apiClient: getIt())); getIt.registerFactory(() => TermsConditionsViewModel(termsConditionsRepo: getIt(), errorHandlerService: getIt(), - ), + ),); // ViewModels // Global/shared VMs → LazySingleton diff --git a/lib/core/utils/calender_utils_new.dart b/lib/core/utils/calender_utils_new.dart index 5a43d78..5e9e91b 100644 --- a/lib/core/utils/calender_utils_new.dart +++ b/lib/core/utils/calender_utils_new.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:device_calendar_plus/device_calendar_plus.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:jiffy/jiffy.dart' show Jiffy; +import 'package:manage_calendar_events/manage_calendar_events.dart' hide Calendar; class CalenderUtilsNew { final DeviceCalendar calender = DeviceCalendar.instance; diff --git a/lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart b/lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart index 5e531c7..ebc9511 100644 --- a/lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart +++ b/lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart @@ -9,7 +9,8 @@ class HmgServicesComponentModel { bool isLogin; bool isLocked; Color textColor; - String route; + Color bgColor; + String? route; bool isExternalLink; Function? onTap; diff --git a/lib/presentation/hmg_services/services_view.dart b/lib/presentation/hmg_services/services_view.dart index 237b4cd..59efb73 100644 --- a/lib/presentation/hmg_services/services_view.dart +++ b/lib/presentation/hmg_services/services_view.dart @@ -19,16 +19,16 @@ class ServiceGridViewItem extends StatelessWidget { const ServiceGridViewItem( this.hmgServiceComponentModel, this.index, this.isHomePage, - {super.key, this.isLocked = false}); + {super.key, this.isLocked = false, required this.isHealthToolIcon, this.onTap}); @override Widget build(BuildContext context) { return InkWell( onTap: () => hmgServiceComponentModel.isExternalLink - ? _openLink(hmgServiceComponentModel.route) + ? _openLink(hmgServiceComponentModel.route!) : getIt .get() - .pushPageRoute(hmgServiceComponentModel.route), + .pushPageRoute(hmgServiceComponentModel.route!), child: Column( mainAxisSize: MainAxisSize.max, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/routes/app_routes.dart b/lib/routes/app_routes.dart index f32a003..81c5ee4 100644 --- a/lib/routes/app_routes.dart +++ b/lib/routes/app_routes.dart @@ -82,8 +82,8 @@ class AppRoutes { huaweiHealthExample: (context) => HuaweiHealthExample(), // - healthCalculatorsPage: (context) => HealthCalculatorsPage() - monthlyReports: (context) => MonthlyReportsPage() + healthCalculatorsPage: (context) => HealthCalculatorsPage(), + monthlyReports: (context) => MonthlyReportsPage() }; } diff --git a/lib/splashPage.dart b/lib/splashPage.dart index 9aa16ee..2327ab5 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -35,6 +35,7 @@ import 'core/utils/local_notifications.dart'; import 'core/utils/push_notification_handler.dart'; import 'widgets/routes/custom_page_route.dart'; + class SplashPage extends StatefulWidget { @override _SplashScreenState createState() => _SplashScreenState(); diff --git a/pubspec.yaml b/pubspec.yaml index 9f0be5f..5590c9e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -62,7 +62,6 @@ dependencies: google_maps_flutter: ^2.13.1 flutter_zoom_videosdk: 2.1.10 dart_jsonwebtoken: ^3.2.0 - webview_flutter: ^4.9.0 dartz: ^0.10.1 equatable: ^2.0.7 google_api_availability: ^5.0.1