Fixes & Translation

pull/287/head
aamir-csol 20 hours ago
parent f649767fc0
commit e842d85254

@ -42,8 +42,8 @@
tools:node="remove" /> tools:node="remove" />
<!-- Gallery/Photo permissions for Android 13+ (API 33+) --> <!-- Gallery/Photo permissions for Android 13+ (API 33+) -->
<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:node="remove" />--> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:node="remove" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove" /> <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove" />
<!-- Gallery/Photo permissions for Android 12 and below --> <!-- Gallery/Photo permissions for Android 12 and below -->

@ -1289,7 +1289,7 @@
"quickLinks": "روابط سريعة", "quickLinks": "روابط سريعة",
"viewMedicalFileLandingPage": "عرض الملف الطبي", "viewMedicalFileLandingPage": "عرض الملف الطبي",
"immediateLiveCareRequest": "طلب لايف كير فوري", "immediateLiveCareRequest": "طلب لايف كير فوري",
"yourTurnIsAfterPatients": "دورك بعد {count} مريض. يرجى الانتظار حتى يحين دورك، وسيناديك الطبيب قريباً.", "yourTurnIsAfterPatients": "أمامك {count} مريض. سيقوم الطبيب بالتواصل معكً.",
"dontHaveHHCOrders": "ليس لديك أي أوامر رعاية صحية منزلية حتى الآن.", "dontHaveHHCOrders": "ليس لديك أي أوامر رعاية صحية منزلية حتى الآن.",
"hhcOrders": "أوامر الرعاية الصحية المنزلية", "hhcOrders": "أوامر الرعاية الصحية المنزلية",
"requestedServices": "الخدمات المطلوبة", "requestedServices": "الخدمات المطلوبة",
@ -1825,5 +1825,6 @@
"rechargePageKey": "اختر المستفيد", "rechargePageKey": "اختر المستفيد",
"selectFamilyFile": "اختيار ", "selectFamilyFile": "اختيار ",
"ancillaryOrdersListNew": "طلبات غير مكتملة", "ancillaryOrdersListNew": "طلبات غير مكتملة",
"medicalReportNew": "التقارير الطبية" "medicalReportNew": "التقارير الطبية",
"livecarePendingReuqestNew": "انتظار الطبيب"
} }

@ -1279,7 +1279,7 @@
"quickLinks": "Quick Links", "quickLinks": "Quick Links",
"viewMedicalFileLandingPage": "View medical file", "viewMedicalFileLandingPage": "View medical file",
"immediateLiveCareRequest": "Immediate LiveCare Request", "immediateLiveCareRequest": "Immediate LiveCare Request",
"yourTurnIsAfterPatients": "Your turn is after {count} patients. Please wait for your turn, The doctor will call you shortly.", "yourTurnIsAfterPatients": "There are {count} patients ahead of you. The doctor will call you shortly.",
"dontHaveHHCOrders": "You don't have any Home Health Care orders yet.", "dontHaveHHCOrders": "You don't have any Home Health Care orders yet.",
"hhcOrders": "HHC Orders", "hhcOrders": "HHC Orders",
"requestedServices": "Requested Services", "requestedServices": "Requested Services",
@ -1815,7 +1815,8 @@
"rechargePageKey": "Recharge Wallet", "rechargePageKey": "Recharge Wallet",
"selectFamilyFile": "Select", "selectFamilyFile": "Select",
"ancillaryOrdersListNew": "Ancillary Orders List", "ancillaryOrdersListNew": "Ancillary Orders List",
"medicalReportNew": "Medical Report" "medicalReportNew": "Medical Report",
"livecarePendingReuqestNew": "Live Care Pending Request"
} }

@ -4,7 +4,7 @@ import 'package:hmg_patient_app_new/core/enums.dart';
class ApiConsts { class ApiConsts {
static const maxSmallScreen = 660; static const maxSmallScreen = 660;
static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
// static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT

@ -53,8 +53,8 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
late AppState _appState; late AppState _appState;
Duration countdownDuration = Duration(minutes: 1, seconds: 0); Duration countdownDuration = Duration(minutes: 1, seconds: 0);
late ValueNotifier<Duration> durationNotifier; ValueNotifier<Duration> durationNotifier = ValueNotifier<Duration>(Duration(minutes: 1, seconds: 0));
late Timer timer; Timer? timer;
bool isShowNotEligibleDialog = false; bool isShowNotEligibleDialog = false;
String notEligibleErrorMsg = ""; String notEligibleErrorMsg = "";
@ -264,16 +264,20 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
patientLiveCareHistoryList = apiResponse.data!; patientLiveCareHistoryList = apiResponse.data!;
if (patientLiveCareHistoryList.isNotEmpty) { if (patientLiveCareHistoryList.isNotEmpty) {
if (patientLiveCareHistoryList[0].callStatus! < 4) { if (patientLiveCareHistoryList[0].callStatus! < 4) {
countdownDuration = Duration(seconds: 0);
patientHasPendingLiveCareRequest = true; patientHasPendingLiveCareRequest = true;
countdownDuration = Duration(minutes: patientLiveCareHistoryList.first.watingtimeInteger!, seconds: 0); countdownDuration = Duration(minutes: patientLiveCareHistoryList.first.watingtimeInteger!, seconds: 0);
durationNotifier = ValueNotifier<Duration>(countdownDuration); durationNotifier.value = countdownDuration;
startTimer(); // Start timer if not already running
if (timer == null || !timer!.isActive) {
startTimer();
}
} else { } else {
patientHasPendingLiveCareRequest = false; patientHasPendingLiveCareRequest = false;
stopTimer(); // Stop timer if call status >= 4
} }
} else { } else {
patientHasPendingLiveCareRequest = false; patientHasPendingLiveCareRequest = false;
stopTimer(); // Stop timer if no history
} }
notifyListeners(); notifyListeners();
if (onSuccess != null) { if (onSuccess != null) {
@ -312,18 +316,35 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
} }
void startTimer() { void startTimer() {
timer = Timer.periodic(const Duration(seconds: 1), (_) => addTime()); // Only start timer if it's not already active
notifyListeners(); if (timer == null || !timer!.isActive) {
timer = Timer.periodic(const Duration(seconds: 1), (_) {
addTime();
});
}
} }
void addTime() { void addTime() {
final seconds = durationNotifier.value.inSeconds - 1; final currentSeconds = durationNotifier.value.inSeconds;
if (seconds < 0) {
if (currentSeconds <= 0) {
// Timer has reached zero, stop it
timer?.cancel(); timer?.cancel();
// Handle end of timer here durationNotifier.value = Duration.zero;
// showEndMessage();
} else { } else {
durationNotifier.value = Duration(seconds: seconds); // Decrease by 1 second and continue
durationNotifier.value = Duration(seconds: currentSeconds - 1);
} }
} }
void stopTimer() {
timer?.cancel();
}
@override
void dispose() {
timer?.cancel();
durationNotifier.dispose();
super.dispose();
}
} }

@ -1818,5 +1818,6 @@ abstract class LocaleKeys {
static const selectFamilyFile = 'selectFamilyFile'; static const selectFamilyFile = 'selectFamilyFile';
static const ancillaryOrdersListNew = 'ancillaryOrdersListNew'; static const ancillaryOrdersListNew = 'ancillaryOrdersListNew';
static const medicalReportNew = 'medicalReportNew'; static const medicalReportNew = 'medicalReportNew';
static const livecarePendingReuqestNew = 'livecarePendingReuqestNew';
} }

@ -239,8 +239,8 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
(immediateLiveCareVM.liveCareImmediateAppointmentFeesList.currency ?? "ريال").toLowerCase() == "ريال")), (immediateLiveCareVM.liveCareImmediateAppointmentFeesList.currency ?? "ريال").toLowerCase() == "ريال")),
], ],
).paddingSymmetrical(24.h, 0.h), ).paddingSymmetrical(24.h, 0.h),
(immediateLiveCareVM.liveCareImmediateAppointmentFeesList.total == "0" || immediateLiveCareVM.liveCareImmediateAppointmentFeesList.total == "0.0") // (immediateLiveCareVM.liveCareImmediateAppointmentFeesList.total == "0" || immediateLiveCareVM.liveCareImmediateAppointmentFeesList.total == "0.0")
// (true) (true)
? CustomButton( ? CustomButton(
text: LocaleKeys.confirmLiveCare.tr(context: context), text: LocaleKeys.confirmLiveCare.tr(context: context),
onPressed: () async { onPressed: () async {

@ -1,5 +1,4 @@
import 'dart:async'; import 'dart:ui' as ui;
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart';
@ -33,24 +32,19 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
late AppState appState; late AppState appState;
// static Duration countdownDuration = Duration(minutes: 1, seconds: 0);
// late ValueNotifier<Duration> durationNotifier = ValueNotifier<Duration>(immediateLiveCareViewModel.countdownDuration);
// Timer? timer;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
scheduleMicrotask(() {
// countdownDuration = Duration(minutes: immediateLiveCareViewModel.patientLiveCareHistoryList[0].watingtimeInteger!, seconds: 0);
// durationNotifier = ValueNotifier<Duration>(immediateLiveCareViewModel.countdownDuration);
// startTimer();
});
} }
@override @override
void dispose() { void dispose() {
// timer?.cancel(); // Cancel the timer when leaving the page
// durationNotifier.dispose(); try {
immediateLiveCareViewModel.stopTimer();
} catch (e) {
// Handle case where viewModel might not be initialized
}
super.dispose(); super.dispose();
} }
@ -65,7 +59,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
children: [ children: [
Expanded( Expanded(
child: CollapsingListView( child: CollapsingListView(
title: LocaleKeys.liveCarePendingRequest.tr(), title: LocaleKeys.livecareAppo.tr(),
child: Padding( child: Padding(
padding: EdgeInsets.all(24.0), padding: EdgeInsets.all(24.0),
child: Column( child: Column(
@ -147,7 +141,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
buildTime(duration), Directionality(textDirection: ui.TextDirection.ltr, child: buildTime(duration)),
], ],
); );
}, },
@ -176,7 +170,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h, height: 50.h,
icon: AppAssets.livechatMessage, icon: AppAssets.livechatMessage,
iconColor: AppColors.whiteColor, iconColor: !Utils.havePrivilege(118) ? AppColors.textColor : AppColors.whiteColor,
iconSize: 21.h, iconSize: 21.h,
), ),
SizedBox( SizedBox(
@ -186,8 +180,8 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
LocaleKeys.oR.tr().toText19( LocaleKeys.oR.tr().toText19(
color: AppColors.textColor, color: AppColors.textColor,
), ),
], ],
), ),
SizedBox( SizedBox(
@ -208,7 +202,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h, height: 50.h,
icon: AppAssets.call_fill, icon: AppAssets.call_fill,
iconColor: AppColors.whiteColor, iconColor: AppColors.primaryRedColor,
iconSize: 21.h, iconSize: 21.h,
) )
], ],
@ -216,140 +210,139 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
), ),
), ),
), ),
], ],
); );
}), }),
); );
} }
// void startTimer() { // void startTimer() {
// // timer = Timer.periodic(const Duration(seconds: 1), (_) => addTime()); // // timer = Timer.periodic(const Duration(seconds: 1), (_) => addTime());
// // setState(() {}); // // setState(() {});
// } // }
// //
// void addTime() { // void addTime() {
// final seconds = durationNotifier.value.inSeconds - 1; // final seconds = durationNotifier.value.inSeconds - 1;
// if (seconds < 0) { // if (seconds < 0) {
// timer?.cancel(); // timer?.cancel();
// // Handle end of timer here // // Handle end of timer here
// // showEndMessage(); // // showEndMessage();
// } else { // } else {
// durationNotifier.value = Duration(seconds: seconds); // durationNotifier.value = Duration(seconds: seconds);
// } // }
// } // }
// //
// Future<bool> _onWillPop() async { // Future<bool> _onWillPop() async {
// timer?.cancel(); // timer?.cancel();
// Navigator.of(context).pop(); // Navigator.of(context).pop();
// return true; // return true;
// } // }
// //
// Widget buildTime(Duration duration) { // Widget buildTime(Duration duration) {
// String twoDigits(int n) => n.toString().padLeft(2, '0'); // String twoDigits(int n) => n.toString().padLeft(2, '0');
// final hours = twoDigits(duration.inHours); // final hours = twoDigits(duration.inHours);
// final minutes = twoDigits(duration.inMinutes.remainder(60)); // final minutes = twoDigits(duration.inMinutes.remainder(60));
// final seconds = twoDigits(duration.inSeconds.remainder(60)); // final seconds = twoDigits(duration.inSeconds.remainder(60));
// //
// return Row( // return Row(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
// children: [ // children: [
// buildTimeColumn(hours, "Hours".needTranslation), // buildTimeColumn(hours, "Hours".needTranslation),
// buildTimeColumn(minutes, "Mins".needTranslation), // buildTimeColumn(minutes, "Mins".needTranslation),
// buildTimeColumn(seconds, "Secs".needTranslation, isLast: true), // buildTimeColumn(seconds, "Secs".needTranslation, isLast: true),
// ], // ],
// ); // );
// } // }
// //
// Widget buildTimeColumn(String time, String label, {bool isLast = false}) { // Widget buildTimeColumn(String time, String label, {bool isLast = false}) {
// return Column( // return Column(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
// children: [ // children: [
// Row( // Row(
// children: [ // children: [
// buildDigit(time[0]), // buildDigit(time[0]),
// buildDigit(time[1]), // buildDigit(time[1]),
// if (!isLast) buildTimeSeparator(), // if (!isLast) buildTimeSeparator(),
// ], // ],
// ), // ),
// buildLabel(label), // buildLabel(label),
// ], // ],
// ); // );
// } // }
// //
// Widget buildDigit(String digit) { // Widget buildDigit(String digit) {
// return Container( // return Container(
// padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), // padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
// // margin: const EdgeInsets.symmetric(horizontal: 2), // // margin: const EdgeInsets.symmetric(horizontal: 2),
// decoration: BoxDecoration( // decoration: BoxDecoration(
// color: Colors.white, // color: Colors.white,
// borderRadius: BorderRadius.circular(8), // borderRadius: BorderRadius.circular(8),
// ), // ),
// child: ClipRect( // child: ClipRect(
// child: AnimatedSwitcher( // child: AnimatedSwitcher(
// duration: const Duration(milliseconds: 600), // duration: const Duration(milliseconds: 600),
// switchInCurve: Curves.easeOutExpo, // switchInCurve: Curves.easeOutExpo,
// switchOutCurve: Curves.easeInExpo, // switchOutCurve: Curves.easeInExpo,
// transitionBuilder: (Widget child, Animation<double> animation) { // transitionBuilder: (Widget child, Animation<double> animation) {
// return Stack( // return Stack(
// children: <Widget>[ // children: <Widget>[
// SlideTransition( // SlideTransition(
// position: Tween<Offset>( // position: Tween<Offset>(
// begin: const Offset(0, -1), // begin: const Offset(0, -1),
// end: const Offset(0, 1), // end: const Offset(0, 1),
// ).animate(CurvedAnimation( // ).animate(CurvedAnimation(
// parent: animation, // parent: animation,
// curve: Curves.easeOutCubic, // curve: Curves.easeOutCubic,
// )), // )),
// child: FadeTransition( // child: FadeTransition(
// opacity: animation, // opacity: animation,
// child: child, // child: child,
// ), // ),
// ), // ),
// SlideTransition( // SlideTransition(
// position: Tween<Offset>( // position: Tween<Offset>(
// begin: const Offset(0, -1), // begin: const Offset(0, -1),
// end: const Offset(0, 0), // end: const Offset(0, 0),
// ).animate(CurvedAnimation( // ).animate(CurvedAnimation(
// parent: animation, // parent: animation,
// curve: Curves.bounceIn, // curve: Curves.bounceIn,
// )), // )),
// child: FadeTransition( // child: FadeTransition(
// opacity: animation, // opacity: animation,
// child: child, // child: child,
// ), // ),
// ), // ),
// ], // ],
// ); // );
// }, // },
// child: Text( // child: Text(
// digit, // digit,
// key: ValueKey<String>(digit), // key: ValueKey<String>(digit),
// style: TextStyle( // style: TextStyle(
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
// color: Colors.black, // color: Colors.black,
// fontSize: 20.f, // fontSize: 20.f,
// ), // ),
// ), // ),
// ), // ),
// ), // ),
// ); // );
// } // }
// //
// Widget buildLabel(String label) { // Widget buildLabel(String label) {
// return label.toText14(isBold: true); // return label.toText14(isBold: true);
// } // }
// //
// Widget buildTimeSeparator() { // Widget buildTimeSeparator() {
// return const Padding( // return const Padding(
// padding: EdgeInsets.symmetric(horizontal: 2.0), // padding: EdgeInsets.symmetric(horizontal: 2.0),
// child: Text( // child: Text(
// ":", // ":",
// style: TextStyle( // style: TextStyle(
// color: Colors.black, // color: Colors.black,
// fontSize: 20, // fontSize: 20,
// ), // ),
// ), // ),
// ); // );
// } // }
} }

@ -135,13 +135,13 @@ class _ProfilePictureWidgetState extends State<ProfilePictureWidget> {
print('✅ Profile image loaded successfully for user: $currentPatientId'); print('✅ Profile image loaded successfully for user: $currentPatientId');
if (mounted) { if (mounted) {
_tryCacheExistingImage(); _tryCacheExistingImage();
setState(() {}); // Force rebuild to show new data setState(() {}); // Force rebuild to show new data
} }
}, },
onError: (error) { onError: (error) {
print('❌ Error loading profile image: $error'); print('❌ Error loading profile image: $error');
if (mounted) { if (mounted) {
setState(() {}); // Force rebuild to show default avatar setState(() {}); // Force rebuild to show default avatar
} }
}, },
); );
@ -365,16 +365,16 @@ class _ProfilePictureWidgetState extends State<ProfilePictureWidget> {
try { try {
print('=== Checking gallery permission ==='); print('=== Checking gallery permission ===');
// Determine which permission to check based on platform and Android version // For Android 13+ (API 33+), the Android Photo Picker handles permissions internally
Permission galleryPermission; // No need to request READ_MEDIA_IMAGES or READ_EXTERNAL_STORAGE permissions
if (Platform.isAndroid) {
if (Platform.isIOS) { print('✅ Android Photo Picker will handle permissions internally');
galleryPermission = Permission.photos; return true;
} else {
// Android: use photos permission which handles API level differences automatically
galleryPermission = Permission.photos;
} }
// iOS: Check photos permission
Permission galleryPermission = Permission.photos;
// First check current status // First check current status
PermissionStatus currentStatus = await galleryPermission.status; PermissionStatus currentStatus = await galleryPermission.status;
print('Current gallery permission status: $currentStatus'); print('Current gallery permission status: $currentStatus');
@ -520,9 +520,7 @@ class _ProfilePictureWidgetState extends State<ProfilePictureWidget> {
// Use cached decoded bytes update cache if source data changed // Use cached decoded bytes update cache if source data changed
final String? imageData = GetIt.instance<AppState>().getProfileImageData; final String? imageData = GetIt.instance<AppState>().getProfileImageData;
final String? currentHash = (imageData != null && imageData.isNotEmpty) final String? currentHash = (imageData != null && imageData.isNotEmpty) ? '${imageData.length}_${imageData.hashCode}' : null;
? '${imageData.length}_${imageData.hashCode}'
: null;
// Re-decode only if the underlying data actually changed // Re-decode only if the underlying data actually changed
if (currentHash != null && currentHash != _cachedImageDataHash) { if (currentHash != null && currentHash != _cachedImageDataHash) {
@ -574,9 +572,7 @@ class _ProfilePictureWidgetState extends State<ProfilePictureWidget> {
builder: (context, profileVm, _) { builder: (context, profileVm, _) {
// If we already have cached bytes, show the image even while "loading" // If we already have cached bytes, show the image even while "loading"
// to prevent the shimmerimage blink on page open // to prevent the shimmerimage blink on page open
final bool showShimmer = profileVm.isProfileImageLoading && final bool showShimmer = profileVm.isProfileImageLoading && _cachedImageBytes == null && _selectedImage == null;
_cachedImageBytes == null &&
_selectedImage == null;
return Center( return Center(
child: Stack( child: Stack(
@ -644,4 +640,3 @@ class _ProfilePictureWidgetState extends State<ProfilePictureWidget> {
); );
} }
} }

@ -23,93 +23,42 @@ Widget buildTime(Duration duration, {bool isHomePage = false}) {
Widget buildTimeColumn(String time, String label, {bool isLast = false}) { Widget buildTimeColumn(String time, String label, {bool isLast = false}) {
return Column( return Column(
children: [ children: [
Row( Row(
children: [ children: [
Column( Column(
children: [ children: [
Row( Row(
children: [ children: [
buildDigit(time[0]), buildDigit(time[0]),
SizedBox(width: 2.w),
buildDigit(time[1]), buildDigit(time[1]),
], ],
), ),
SizedBox(height: 4.h),
buildLabel(label), buildLabel(label),
], ],
), ),
if (!isLast) ...[ if (!isLast) ...[
SizedBox(width: 8.w,), SizedBox(width: 8.w),
buildTimeSeparator(), buildTimeSeparator(),
SizedBox(width: 8.w,), SizedBox(width: 8.w),
], ],
], ],
), ),
], ],
); );
} }
Widget buildDigit(String digit) { Widget buildDigit(String digit) {
return return Text(
// Container( digit,
// padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), style: TextStyle(
// // margin: const EdgeInsets.symmetric(horizontal: 2), fontWeight: FontWeight.bold,
// decoration: BoxDecoration( color: Colors.black,
// color: AppColors.whiteColor, fontSize: 27.f,
// borderRadius: BorderRadius.circular(8), ),
// ), );
// child:
ClipRect(
child: AnimatedSwitcher(
duration: const Duration(milliseconds: 600),
switchInCurve: Curves.easeOutExpo,
switchOutCurve: Curves.easeInExpo,
transitionBuilder: (Widget child, Animation<double> animation) {
return Stack(
children: <Widget>[
SlideTransition(
position: Tween<Offset>(
begin: const Offset(0, -1),
end: const Offset(0, 1),
).animate(CurvedAnimation(
parent: animation,
curve: Curves.easeOutCubic,
)),
child: FadeTransition(
opacity: animation,
child: child,
),
),
SlideTransition(
position: Tween<Offset>(
begin: const Offset(0, -1),
end: const Offset(0, 0),
).animate(CurvedAnimation(
parent: animation,
curve: Curves.bounceIn,
)),
child: FadeTransition(
opacity: animation,
child: child,
),
),
],
);
},
child: Text(
digit,
key: ValueKey<String>(digit),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: 27.f,
),
),
),
);
// );
} }
Widget buildLabel(String label) { Widget buildLabel(String label) {
@ -118,12 +67,13 @@ Widget buildLabel(String label) {
Widget buildTimeSeparator() { Widget buildTimeSeparator() {
return Padding( return Padding(
padding: EdgeInsets.symmetric(horizontal: 2.0), padding: EdgeInsets.only(bottom: 16.h),
child: Text( child: Text(
":", ":",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 28.f, fontSize: 28.f,
fontWeight: FontWeight.bold,
), ),
), ),
); );

@ -10,8 +10,11 @@ import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart'; import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:image_picker_android/image_picker_android.dart';
import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
final ImagePicker picker = ImagePicker(); final ImagePicker picker = ImagePicker();
final ImagePickerPlatform _pickerPlatform = ImagePickerPlatform.instance;
class ImageOptions { class ImageOptions {
static void showImageOptionsNew( static void showImageOptionsNew(
@ -214,25 +217,47 @@ class ImageOptions {
} }
void galleryImageAndroid(Function(String, File) image) async { void galleryImageAndroid(Function(String, File) image) async {
XFile? pickedFile = await picker.pickImage(source: ImageSource.gallery, imageQuality: 20); // Enable Android Photo Picker if available
if (pickedFile == null) return; if (_pickerPlatform is ImagePickerAndroid) {
(_pickerPlatform as ImagePickerAndroid).useAndroidPhotoPicker = true;
}
try {
final XFile? pickedFile = await _pickerPlatform.getImageFromSource(source: ImageSource.gallery, options: const ImagePickerOptions(imageQuality: 20));
if (pickedFile == null) return;
File _image = File(pickedFile.path); File _image = File(pickedFile.path);
String fileName = _image.path; String fileName = _image.path;
var bytes = File(fileName).readAsBytesSync(); var bytes = File(fileName).readAsBytesSync();
String base64Encode = base64.encode(bytes); String base64Encode = base64.encode(bytes);
image(base64Encode, _image); image(base64Encode, _image);
} catch (e) {
print('Error picking image: $e');
}
} }
void cameraImageAndroid(Function(String, File) image) async { void cameraImageAndroid(Function(String, File) image) async {
XFile? pickedFile = await picker.pickImage(source: ImageSource.camera, imageQuality: 20); if (_pickerPlatform is ImagePickerAndroid) {
if (pickedFile == null) return; (_pickerPlatform as ImagePickerAndroid).useAndroidPhotoPicker = true;
}
File _image = File(pickedFile.path); try {
String fileName = _image.path; final XFile? pickedFile = await _pickerPlatform.getImageFromSource(
var bytes = File(fileName).readAsBytesSync(); source: ImageSource.camera,
String base64Encode = base64.encode(bytes); options: const ImagePickerOptions(imageQuality: 20),
image(base64Encode, _image); );
if (pickedFile == null) return;
File _image = File(pickedFile.path);
String fileName = _image.path;
var bytes = File(fileName).readAsBytesSync();
String base64Encode = base64.encode(bytes);
image(base64Encode, _image);
} catch (e) {
print('Error taking picture: $e');
}
} }
class _BottomSheet extends StatelessWidget { class _BottomSheet extends StatelessWidget {

@ -90,6 +90,8 @@ dependencies:
flutter_callkit_incoming: ^3.0.0 flutter_callkit_incoming: ^3.0.0
in_app_update: ^4.2.5 in_app_update: ^4.2.5
# device_preview: ^1.3.1 # device_preview: ^1.3.1
image_picker_android: ^0.8.13+16
image_picker_platform_interface: ^2.10.0
location: ^8.0.1 location: ^8.0.1
gms_check: ^1.0.4 gms_check: ^1.0.4

Loading…
Cancel
Save