Merge pull request 'fatima' (#157) from fatima into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/157
haroon_dev
Haroon6138 2 days ago
commit bb7c05493a

@ -19,7 +19,7 @@ abstract class ApiClient {
Future<void> post(
String endPoint, {
required dynamic body,
required Map<String, dynamic> body,
required Function(dynamic response, int statusCode, {int? messageStatus, String? errorMessage}) onSuccess,
required Function(String error, int statusCode, {int? messageStatus, Failure? failureType}) onFailure,
bool isAllowAny,

@ -75,6 +75,7 @@ import 'package:local_auth/local_auth.dart';
import 'package:logger/web.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../features/monthly_reports/monthly_reports_repo.dart';
import '../features/qr_parking/qr_parking_view_model.dart';
import '../presentation/health_calculators_and_converts/health_calculator_view_model.dart';
@ -305,5 +306,13 @@ class AppDependencies {
activePrescriptionsRepo: getIt()
),
);
getIt.registerFactory<QrParkingViewModel>(
() => QrParkingViewModel(
qrParkingRepo: getIt<QrParkingRepo>(),
errorHandlerService: getIt<ErrorHandlerService>(),
cacheService: getIt<CacheService>(),
),
);
}
}

@ -10,6 +10,7 @@ import 'package:provider/provider.dart';
import '../../features/qr_parking/qr_parking_view_model.dart';
import '../../theme/colors.dart';
import '../../widgets/appbar/app_bar_widget.dart';
import '../../widgets/buttons/custom_button.dart';
import '../../widgets/routes/custom_page_route.dart';
@ -110,32 +111,42 @@ class _ParkingPageState extends State<ParkingPage> {
child: SizedBox(
width: double.infinity,
height: 56,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
child: CustomButton(
text: "Read Barcodes".needTranslation,
onPressed: () => _readQR(context), // ALWAYS non-null
isDisabled: vm.isLoading, // control disabled state here
backgroundColor: AppColors.primaryRedColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
onPressed: vm.isLoading ? null : () => _readQR(context),
child: vm.isLoading
? const SizedBox(
width: 22,
height: 22,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: const Text(
"Read Barcodes",
style: TextStyle(
borderColor: AppColors.primaryRedColor,
fontSize: 18,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
),
)
// ElevatedButton(
// style: ElevatedButton.styleFrom(
// backgroundColor: AppColors.primaryRedColor,
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(10),
// ),
// ),
// onPressed: vm.isLoading ? null : () => _readQR(context),
// child: vm.isLoading
// ? const SizedBox(
// width: 22,
// height: 22,
// child: CircularProgressIndicator(
// strokeWidth: 2,
// color: Colors.white,
// ),
// )
// : const Text(
// "Read Barcodes",
// style: TextStyle(
// fontSize: 18,
// fontWeight: FontWeight.bold,
// color: Colors.white,
// ),
// ),
// ),
),
),
),

@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/features/qr_parking/models/qr_parking_respon
import '../../features/qr_parking/qr_parking_view_model.dart';
import '../../theme/colors.dart';
import '../../widgets/appbar/app_bar_widget.dart';
import '../../widgets/buttons/custom_button.dart';
import '../../widgets/chip/app_custom_chip_widget.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:provider/provider.dart';
@ -184,23 +185,34 @@ class _ParkingSlotState extends State<ParkingSlot> {
SizedBox(
width: double.infinity,
height: 48.h,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppColors.primaryRedColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
child:CustomButton(
text: "Get Direction".needTranslation,
onPressed: _openDirection,
child: Text(
"Get Direction".needTranslation,
style: TextStyle(
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 18,
fontWeight: FontWeight.bold,
color: AppColors.whiteColor,
),
),
),
borderRadius: 10,
)
// ElevatedButton(
// style: ElevatedButton.styleFrom(
// backgroundColor: AppColors.primaryRedColor,
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(10),
// ),
// ),
// onPressed: _openDirection,
// child: Text(
// "Get Direction".needTranslation,
// style: TextStyle(
// fontSize: 18,
// fontWeight: FontWeight.bold,
// color: AppColors.whiteColor,
// ),
// ),
// ),
),
// const Spacer(),

@ -126,17 +126,18 @@ class AppRoutes {
return HealthTrackerDetailPage(
trackerType: args ?? HealthTrackerTypeEnum.bloodSugar,
);
// monthlyReports: (context) => ChangeNotifierProvider(
// create: (_) => MonthlyReportsViewModel(
// monthlyReportsRepo: getIt<MonthlyReportsRepo>(),
// errorHandlerService: getIt<ErrorHandlerService>(),
// ),
// child: const MonthlyReportsPage(),
// ),
// qrParking: (context) => ChangeNotifierProvider<QrParkingViewModel>(
// create: (_) => getIt<QrParkingViewModel>(),
// child: const ParkingPage(),
},
monthlyReports: (context) => ChangeNotifierProvider(
create: (_) => MonthlyReportsViewModel(
monthlyReportsRepo: getIt<MonthlyReportsRepo>(),
errorHandlerService: getIt<ErrorHandlerService>(),
),
child: const MonthlyReportsPage(),
),
qrParking: (context) => ChangeNotifierProvider<QrParkingViewModel>(
create: (_) => getIt<QrParkingViewModel>(),
child: const ParkingPage(),
),}
};
}

@ -77,7 +77,7 @@ dependencies:
amazon_payfort: ^1.1.4
network_info_plus: ^6.1.4
flutter_nfc_kit: ^3.6.0
barcode_scan2: ^4.5.1
barcode_scan2: ^4.6.0
keyboard_actions: ^4.2.0
path_provider: ^2.0.8
open_filex: ^4.7.0

Loading…
Cancel
Save