fix error

pull/152/head
Fatimah.Alshammari 2 months ago
parent 190492a191
commit c9de23347a

@ -1,7 +1,6 @@
class AppAssets { class AppAssets {
static const String svgBasePath = 'assets/images/svg'; static const String svgBasePath = 'assets/images/svg';
static const String pngBasePath = 'assets/images/png'; static const String pngBasePath = 'assets/images/png';
static const String jpgBasePath = 'assets/images/jpg';
static const String hmg = '$svgBasePath/hmg.svg'; static const String hmg = '$svgBasePath/hmg.svg';
static const String arrow_back = '$svgBasePath/arrow-back.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 heart = '$svgBasePath/heart.svg';
static const String alertSquare = '$svgBasePath/alert-square.svg'; static const String alertSquare = '$svgBasePath/alert-square.svg';
static const String arrowRight = '$svgBasePath/arrow-right.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 // // PNGS //
static const String hmgLogo = '$pngBasePath/hmg_logo.png'; 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 fullBodyFront = '$pngBasePath/full_body_front.png';
static const String fullBodyBack = '$pngBasePath/full_body_back.png'; static const String fullBodyBack = '$pngBasePath/full_body_back.png';
// JPGS //
static const String report = '$jpgBasePath/hmg_logo.jpg';
} }
class AppAnimations { class AppAnimations {
@ -280,3 +288,4 @@ class AppAnimations {
static const String ambulanceAlert = '$lottieBasePath/ambulance_alert.json'; static const String ambulanceAlert = '$lottieBasePath/ambulance_alert.json';
static const String rrtAmbulance = '$lottieBasePath/rrt_ambulance.json'; static const String rrtAmbulance = '$lottieBasePath/rrt_ambulance.json';
} }

@ -134,7 +134,7 @@ class AppDependencies {
getIt.registerLazySingleton<ActivePrescriptionsRepo>(() => ActivePrescriptionsRepoImp(loggerService: getIt<LoggerService>(), apiClient: getIt())); getIt.registerLazySingleton<ActivePrescriptionsRepo>(() => ActivePrescriptionsRepoImp(loggerService: getIt<LoggerService>(), apiClient: getIt()));
getIt.registerLazySingleton<TermsConditionsRepo>(() => TermsConditionsRepoImp(loggerService: getIt<LoggerService>(), apiClient: getIt())); getIt.registerLazySingleton<TermsConditionsRepo>(() => TermsConditionsRepoImp(loggerService: getIt<LoggerService>(), apiClient: getIt()));
getIt.registerFactory<TermsConditionsViewModel>(() => TermsConditionsViewModel(termsConditionsRepo: getIt<TermsConditionsRepo>(), errorHandlerService: getIt<ErrorHandlerService>(), getIt.registerFactory<TermsConditionsViewModel>(() => TermsConditionsViewModel(termsConditionsRepo: getIt<TermsConditionsRepo>(), errorHandlerService: getIt<ErrorHandlerService>(),
), ),);
// ViewModels // ViewModels
// Global/shared VMs LazySingleton // Global/shared VMs LazySingleton

@ -3,6 +3,7 @@ import 'dart:async';
import 'package:device_calendar_plus/device_calendar_plus.dart'; import 'package:device_calendar_plus/device_calendar_plus.dart';
import 'package:hmg_patient_app_new/core/utils/date_util.dart'; import 'package:hmg_patient_app_new/core/utils/date_util.dart';
import 'package:jiffy/jiffy.dart' show Jiffy; import 'package:jiffy/jiffy.dart' show Jiffy;
import 'package:manage_calendar_events/manage_calendar_events.dart' hide Calendar;
class CalenderUtilsNew { class CalenderUtilsNew {
final DeviceCalendar calender = DeviceCalendar.instance; final DeviceCalendar calender = DeviceCalendar.instance;

@ -9,7 +9,8 @@ class HmgServicesComponentModel {
bool isLogin; bool isLogin;
bool isLocked; bool isLocked;
Color textColor; Color textColor;
String route; Color bgColor;
String? route;
bool isExternalLink; bool isExternalLink;
Function? onTap; Function? onTap;

@ -19,16 +19,16 @@ class ServiceGridViewItem extends StatelessWidget {
const ServiceGridViewItem( const ServiceGridViewItem(
this.hmgServiceComponentModel, this.index, this.isHomePage, this.hmgServiceComponentModel, this.index, this.isHomePage,
{super.key, this.isLocked = false}); {super.key, this.isLocked = false, required this.isHealthToolIcon, this.onTap});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return InkWell( return InkWell(
onTap: () => hmgServiceComponentModel.isExternalLink onTap: () => hmgServiceComponentModel.isExternalLink
? _openLink(hmgServiceComponentModel.route) ? _openLink(hmgServiceComponentModel.route!)
: getIt : getIt
.get<NavigationService>() .get<NavigationService>()
.pushPageRoute(hmgServiceComponentModel.route), .pushPageRoute(hmgServiceComponentModel.route!),
child: Column( child: Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -82,8 +82,8 @@ class AppRoutes {
huaweiHealthExample: (context) => HuaweiHealthExample(), huaweiHealthExample: (context) => HuaweiHealthExample(),
// //
healthCalculatorsPage: (context) => HealthCalculatorsPage() healthCalculatorsPage: (context) => HealthCalculatorsPage(),
monthlyReports: (context) => MonthlyReportsPage() monthlyReports: (context) => MonthlyReportsPage()
}; };
} }

@ -35,6 +35,7 @@ import 'core/utils/local_notifications.dart';
import 'core/utils/push_notification_handler.dart'; import 'core/utils/push_notification_handler.dart';
import 'widgets/routes/custom_page_route.dart'; import 'widgets/routes/custom_page_route.dart';
class SplashPage extends StatefulWidget { class SplashPage extends StatefulWidget {
@override @override
_SplashScreenState createState() => _SplashScreenState(); _SplashScreenState createState() => _SplashScreenState();

@ -62,7 +62,6 @@ dependencies:
google_maps_flutter: ^2.13.1 google_maps_flutter: ^2.13.1
flutter_zoom_videosdk: 2.1.10 flutter_zoom_videosdk: 2.1.10
dart_jsonwebtoken: ^3.2.0 dart_jsonwebtoken: ^3.2.0
webview_flutter: ^4.9.0
dartz: ^0.10.1 dartz: ^0.10.1
equatable: ^2.0.7 equatable: ^2.0.7
google_api_availability: ^5.0.1 google_api_availability: ^5.0.1

Loading…
Cancel
Save