pull/195/head
Haroon Amjad 3 weeks ago
parent 040ff6a80d
commit 8de8039096

@ -49,7 +49,7 @@
<uses-permission <uses-permission
android:name="android.permission.ACCESS_BACKGROUND_LOCATION" android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
tools:node="remove" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> tools:node="remove" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
@ -62,7 +62,6 @@
<uses-feature android:name="android.hardware.camera.any" /> <uses-feature android:name="android.hardware.camera.any" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-feature <uses-feature
@ -149,6 +148,9 @@
<meta-data <meta-data
android:name="push_kit_auto_init_enabled" android:name="push_kit_auto_init_enabled"
android:value="true" /> android:value="true" />
<meta-data
android:name="com.google.ar.core"
tools:node="remove" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
@ -156,7 +158,7 @@
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:launchMode="singleTop" android:launchMode="singleInstance"
android:showOnLockScreen="true" android:showOnLockScreen="true"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"

@ -229,7 +229,7 @@ class ApiConsts {
static String getAiOverViewLabOrder = "Services/Patients.svc/REST/HMGAI_Lab_Analyzer_API"; static String getAiOverViewLabOrder = "Services/Patients.svc/REST/HMGAI_Lab_Analyzer_API";
// ************ static values for Api **************** // ************ static values for Api ****************
static final double appVersionID = 20.1; static final double appVersionID = 20.2;
// static final double appVersionID = 50.7; // static final double appVersionID = 50.7;
static final int appChannelId = 3; static final int appChannelId = 3;
static final String appIpAddress = "10.20.10.20"; static final String appIpAddress = "10.20.10.20";

@ -398,7 +398,7 @@ class PushNotificationHandler {
int sdkInt = androidInfo.version.sdkInt ?? 0; int sdkInt = androidInfo.version.sdkInt ?? 0;
if (sdkInt >= 33) { if (sdkInt >= 33) {
// await FlutterCallkitIncoming.requestFullIntentPermission(); await FlutterCallkitIncoming.requestFullIntentPermission();
} }
} }
} }

@ -1033,7 +1033,8 @@ class AuthenticationViewModel extends ChangeNotifier {
label: LocaleKeys.notice.tr(), label: LocaleKeys.notice.tr(),
onOkPressed: () { onOkPressed: () {
_dialogService.showPhoneNumberPickerSheet( _dialogService.showPhoneNumberPickerSheet(
label: "Where would you like to receive OTP?", // label: "Where would you like to receive OTP?",
label: LocaleKeys.receiveOtpToast.tr(),
message: "Please select from the below options to receive OTP.", message: "Please select from the below options to receive OTP.",
onSMSPress: () { onSMSPress: () {
checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms); checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);

@ -122,7 +122,7 @@ class PatientSickLeavesResponseModel {
patientName = json['PatientName']; patientName = json['PatientName'];
projectName = json['ProjectName']; projectName = json['ProjectName'];
qR = json['QR']; qR = json['QR'];
speciality = json['Speciality'].cast<String>(); // speciality = json['Speciality'].cast<String>();
startDate = json['StartDate']; startDate = json['StartDate'];
status = json['Status']; status = json['Status'];
strRequestDate = json['StrRequestDate']; strRequestDate = json['StrRequestDate'];

@ -82,6 +82,7 @@ class LargeServiceCard extends StatelessWidget {
icon: serviceCardData.icon, icon: serviceCardData.icon,
iconColor: serviceCardData.iconColor, iconColor: serviceCardData.iconColor,
fit: BoxFit.contain, fit: BoxFit.contain,
applyThemeColor: false,
), ),
), ),
), ),

@ -306,7 +306,7 @@ Widget showPhoneNumberPickerWidget({required BuildContext context, String? messa
onPressed: onSMSPress, onPressed: onSMSPress,
backgroundColor: AppColors.primaryRedColor, backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedBorderColor, borderColor: AppColors.primaryRedBorderColor,
textColor: AppColors.whiteColor, textColor: Colors.white,
icon: AppAssets.message, icon: AppAssets.message,
), ),
), ),
@ -325,11 +325,12 @@ Widget showPhoneNumberPickerWidget({required BuildContext context, String? messa
child: CustomButton( child: CustomButton(
text: LocaleKeys.sendOTPWHATSAPP.tr(context: context), text: LocaleKeys.sendOTPWHATSAPP.tr(context: context),
onPressed: onWhatsappPress, onPressed: onWhatsappPress,
backgroundColor: Colors.white, backgroundColor: AppColors.whiteColor,
borderColor: AppColors.borderOnlyColor, borderColor: AppColors.borderOnlyColor,
textColor: AppColors.textColor, textColor: AppColors.textColor,
icon: AppAssets.whatsapp, icon: AppAssets.whatsapp,
iconColor: null, iconColor: null,
applyThemeColor: false,
), ),
), ),
], ],

@ -101,6 +101,7 @@ class _SplashScreenState extends State<SplashPage> {
print('Call Canceled : ------->'); print('Call Canceled : ------->');
try { try {
FlutterCallkitIncoming.unsilenceEvents();
FlutterCallkitIncoming.onEvent.listen((event) async { FlutterCallkitIncoming.onEvent.listen((event) async {
switch (event!.event) { switch (event!.event) {
case Event.actionCallIncoming: case Event.actionCallIncoming:

@ -25,6 +25,7 @@ class CustomButton extends StatelessWidget {
final double? iconSize; final double? iconSize;
final TextOverflow? textOverflow; final TextOverflow? textOverflow;
final BorderSide? borderSide; final BorderSide? borderSide;
final bool applyThemeColor;
const CustomButton({ const CustomButton({
super.key, super.key,
@ -47,6 +48,7 @@ class CustomButton extends StatelessWidget {
this.iconSize, this.iconSize,
this.textOverflow, this.textOverflow,
this.borderSide, this.borderSide,
this.applyThemeColor = true,
}); });
@override @override
@ -76,7 +78,7 @@ class CustomButton extends StatelessWidget {
if (icon != null) if (icon != null)
Padding( Padding(
padding: text.isNotEmpty ? EdgeInsets.only(right: 4.w, left: 4.w) : EdgeInsets.zero, padding: text.isNotEmpty ? EdgeInsets.only(right: 4.w, left: 4.w) : EdgeInsets.zero,
child: Utils.buildSvgWithAssets(icon: icon!, iconColor: iconColor, isDisabled: isDisabled, width: iconS, height: iconS), child: Utils.buildSvgWithAssets(icon: icon!, iconColor: iconColor, isDisabled: isDisabled, width: iconS, height: iconS, applyThemeColor: applyThemeColor),
), ),
if (text.isNotEmpty) if (text.isNotEmpty)
Text( Text(

@ -2,7 +2,7 @@ name: hmg_patient_app_new
description: "New HMG Patient App" description: "New HMG Patient App"
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 0.0.1+4 version: 0.0.11+8
environment: environment:
sdk: ">=3.6.0 <4.0.0" sdk: ">=3.6.0 <4.0.0"

Loading…
Cancel
Save