LiveCare changes

haroon_dev
haroon amjad 2 days ago
parent cb44e902a3
commit 5015747580

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -24,6 +24,8 @@
765A5A8F2F35CD8B0003FF7D /* PenguinINRenderer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A812F35CD730003FF7D /* PenguinINRenderer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
765A5A902F35CD8B0003FF7D /* PenNavUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A822F35CD730003FF7D /* PenNavUI.xcframework */; };
765A5A912F35CD8B0003FF7D /* PenNavUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A822F35CD730003FF7D /* PenNavUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
76AA18AE2F3B2A4D00DC8DFC /* ring_30Sec.caf in Resources */ = {isa = PBXBuildFile; fileRef = 76AA18AC2F3B2A4D00DC8DFC /* ring_30Sec.caf */; };
76AA18AF2F3B2A4D00DC8DFC /* ring_30Sec.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 76AA18AD2F3B2A4D00DC8DFC /* ring_30Sec.mp3 */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@ -77,6 +79,8 @@
765A5A812F35CD730003FF7D /* PenguinINRenderer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = PenguinINRenderer.xcframework; sourceTree = "<group>"; };
765A5A822F35CD730003FF7D /* PenNavUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = PenNavUI.xcframework; sourceTree = "<group>"; };
769C9BF82E6F106D009F68A9 /* RunnerDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerDebug.entitlements; sourceTree = "<group>"; };
76AA18AC2F3B2A4D00DC8DFC /* ring_30Sec.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = ring_30Sec.caf; sourceTree = "<group>"; };
76AA18AD2F3B2A4D00DC8DFC /* ring_30Sec.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = ring_30Sec.mp3; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
8E12CEEB8E334EE22D5259D7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
@ -189,6 +193,8 @@
97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup;
children = (
76AA18AC2F3B2A4D00DC8DFC /* ring_30Sec.caf */,
76AA18AD2F3B2A4D00DC8DFC /* ring_30Sec.mp3 */,
61243B412EC5FA3700D46FA0 /* Helper */,
61243B472EC5FA3700D46FA0 /* Penguin */,
769C9BF82E6F106D009F68A9 /* RunnerDebug.entitlements */,
@ -300,6 +306,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
76AA18AE2F3B2A4D00DC8DFC /* ring_30Sec.caf in Resources */,
76AA18AF2F3B2A4D00DC8DFC /* ring_30Sec.mp3 in Resources */,
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
478CFA942E638C8E0064F3D7 /* GoogleService-Info.plist in Resources */,

Binary file not shown.

Binary file not shown.

@ -683,7 +683,7 @@ const DASHBOARD = 'Services/Patients.svc/REST/PatientDashboard';
class ApiConsts {
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

@ -95,7 +95,7 @@ _incomingCall(Map<String, dynamic> data) async {
missedCallNotificationChannelName: "Missed Call",
isShowCallID: false),
ios: IOSParams(
iconName: 'Meena Health',
iconName: 'CallKitLogo',
handleType: 'generic',
supportsVideo: true,
maximumCallGroups: 2,

@ -17,6 +17,7 @@ import 'package:hmg_patient_app_new/features/emergency_services/emergency_servic
import 'package:hmg_patient_app_new/features/payfort/models/apple_pay_request_insert_model.dart';
import 'package:hmg_patient_app_new/features/payfort/payfort_view_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart';
import 'package:hmg_patient_app_new/presentation/insurance/insurance_home_page.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
@ -445,7 +446,14 @@ class _ErOnlineCheckinPaymentPageState extends State<ErOnlineCheckinPaymentPage>
showCommonBottomSheetWithoutHeight(
context,
child: Utils.getSuccessWidget(loadingText: LocaleKeys.erAppointmentBookedSuccess.tr(context: context)),
callBackFunc: () {},
callBackFunc: () {
Navigator.pushAndRemoveUntil(
context,
CustomPageRoute(
page: LandingNavigation(),
),
(r) => false);
},
isFullScreen: false,
isCloseButtonVisible: true,
);
@ -458,7 +466,14 @@ class _ErOnlineCheckinPaymentPageState extends State<ErOnlineCheckinPaymentPage>
showCommonBottomSheetWithoutHeight(
context,
child: Utils.getErrorWidget(loadingText: LocaleKeys.paymentFailedPleaseTryAgain.tr(context: context)),
callBackFunc: () {},
callBackFunc: () {
Navigator.pushAndRemoveUntil(
context,
CustomPageRoute(
page: LandingNavigation(),
),
(r) => false);
},
isFullScreen: false,
isCloseButtonVisible: true,
);

@ -352,43 +352,44 @@ class _CallScreenState extends State<CallScreen> {
ZoomVideoSdkUser? mySelf = await zoom.session.getMySelf();
if (data['status'] == RecordingStatus.Start) {
if (mySelf != null && !mySelf.isHost!) {
showDialog<String>(
context: context,
builder: (BuildContext context) => AlertDialog(
content: const Text('The session is being recorded.'),
actions: <Widget>[
TextButton(
onPressed: () async {
await zoom.acceptRecordingConsent();
if (context.mounted) {
Navigator.pop(context);
}
;
},
child: const Text('accept'),
),
TextButton(
onPressed: () async {
String currentConsentType = await zoom.getRecordingConsentType();
if (currentConsentType == ConsentType.ConsentType_Individual) {
await zoom.declineRecordingConsent();
Navigator.pop(context);
} else {
await zoom.declineRecordingConsent();
zoom.leaveSession(false);
if (!context.mounted) return;
Navigator.popAndPushNamed(
context,
"Join",
arguments: JoinArguments(args.isJoin, sessionName.value, sessionPassword.value, args.displayName, args.sessionIdleTimeoutMins, args.role),
);
}
},
child: const Text('decline'),
),
],
),
);
await zoom.acceptRecordingConsent();
// showDialog<String>(
// context: context,
// builder: (BuildContext context) => AlertDialog(
// content: const Text('The session is being recorded.'),
// actions: <Widget>[
// TextButton(
// onPressed: () async {
// await zoom.acceptRecordingConsent();
// if (context.mounted) {
// Navigator.pop(context);
// }
// ;
// },
// child: const Text('accept'),
// ),
// TextButton(
// onPressed: () async {
// String currentConsentType = await zoom.getRecordingConsentType();
// if (currentConsentType == ConsentType.ConsentType_Individual) {
// await zoom.declineRecordingConsent();
// Navigator.pop(context);
// } else {
// await zoom.declineRecordingConsent();
// zoom.leaveSession(false);
// if (!context.mounted) return;
// Navigator.popAndPushNamed(
// context,
// "Join",
// arguments: JoinArguments(args.isJoin, sessionName.value, sessionPassword.value, args.displayName, args.sessionIdleTimeoutMins, args.role),
// );
// }
// },
// child: const Text('decline'),
// ),
// ],
// ),
// );
}
isRecordingStarted.value = true;
} else {
@ -1745,11 +1746,11 @@ class _CallScreenState extends State<CallScreen> {
iconSize: circleButtonSize,
tooltip: isMuted.value == true ? "Unmute" : "Mute",
),
IconButton(
onPressed: onPressShare,
icon: isSharing.value ? Image.asset("assets/images/png/zoom/share-off@2x.png") : Image.asset("assets/images/png/zoom/share-on@2x.png"),
iconSize: circleButtonSize,
),
// IconButton(
// onPressed: onPressShare,
// icon: isSharing.value ? Image.asset("assets/images/png/zoom/share-off@2x.png") : Image.asset("assets/images/png/zoom/share-on@2x.png"),
// iconSize: circleButtonSize,
// ),
IconButton(
onPressed: onPressVideo,
iconSize: circleButtonSize,
@ -1771,35 +1772,35 @@ class _CallScreenState extends State<CallScreen> {
],
),
)),
Container(
margin: const EdgeInsets.only(left: 16, right: 16, bottom: 40, top: 10),
alignment: Alignment.bottomCenter,
child: SizedBox(
height: MediaQuery.of(context).viewInsets.bottom == 0 ? 65 : MediaQuery.of(context).viewInsets.bottom + 18,
child: TextField(
maxLines: 1,
textAlign: TextAlign.left,
style: TextStyle(color: chatTextColor),
cursorColor: chatTextColor,
textAlignVertical: TextAlignVertical.center,
controller: chatMessageController,
decoration: InputDecoration(
contentPadding: const EdgeInsets.only(left: 16, top: 10, bottom: 10, right: 16),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(width: 1, color: chatTextColor), //<-- SEE HERE
),
hintText: 'Type your message here...',
hintStyle: TextStyle(
fontSize: 14.0,
color: chatTextColor,
),
),
onSubmitted: (String str) {
sendChatMessage(str);
},
),
),
),
// Container(
// margin: const EdgeInsets.only(left: 16, right: 16, bottom: 40, top: 10),
// alignment: Alignment.bottomCenter,
// child: SizedBox(
// height: MediaQuery.of(context).viewInsets.bottom == 0 ? 65 : MediaQuery.of(context).viewInsets.bottom + 18,
// child: TextField(
// maxLines: 1,
// textAlign: TextAlign.left,
// style: TextStyle(color: chatTextColor),
// cursorColor: chatTextColor,
// textAlignVertical: TextAlignVertical.center,
// controller: chatMessageController,
// decoration: InputDecoration(
// contentPadding: const EdgeInsets.only(left: 16, top: 10, bottom: 10, right: 16),
// enabledBorder: OutlineInputBorder(
// borderSide: BorderSide(width: 1, color: chatTextColor), //<-- SEE HERE
// ),
// hintText: 'Type your message here...',
// hintStyle: TextStyle(
// fontSize: 14.0,
// color: chatTextColor,
// ),
// ),
// onSubmitted: (String str) {
// sendChatMessage(str);
// },
// ),
// ),
// ),
Container(
alignment: Alignment.bottomLeft,
margin: const EdgeInsets.only(bottom: 120),

Loading…
Cancel
Save