diff --git a/help/ios/Runner/Info.plist b/help/ios/Runner/Info.plist
index fe4c8174..71ce57cb 100644
--- a/help/ios/Runner/Info.plist
+++ b/help/ios/Runner/Info.plist
@@ -41,5 +41,8 @@
UIViewControllerBasedStatusBarAppearance
+
+ < key >NSCameraUsageDescription< /key >
+ < string >Camera permission is required for barcode scanning.< /string >
diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id
index b8024672..df846dd6 100644
--- a/ios/Flutter/.last_build_id
+++ b/ios/Flutter/.last_build_id
@@ -1 +1 @@
-59a6c452ee075b50114918f17f1ad8f5
\ No newline at end of file
+269226e53e3ba1b1460fd3df51f89f77
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a09481c1..82d4be18 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -162,7 +162,7 @@ PODS:
- "twilio_programmable_video (0.5.0+4)":
- Flutter
- TwilioVideo (~> 3.4)
- - TwilioVideo (3.7.2)
+ - TwilioVideo (3.8.0)
- url_launcher (0.0.1):
- Flutter
- url_launcher_linux (0.0.1):
@@ -436,7 +436,7 @@ SPEC CHECKSUMS:
TOCropViewController: da59f531f8ac8a94ef6d6c0fc34009350f9e8bfe
Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
twilio_programmable_video: 6a41593640f3d86af60b22541fd457b22deaae7f
- TwilioVideo: 5257640fab00d1b9f44db060815b03516a9eb0e8
+ TwilioVideo: c13a51ceca375e91620eb7578d2573c90cf53b46
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
@@ -452,4 +452,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.0.rc.1
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 009006ed..0f0f942c 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -214,7 +214,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */,
- 940F4A376A48B060117A1E5D /* [CP] Copy Pods Resources */,
+ CBB18A5CEEEB971DCFC36E00 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -330,36 +330,36 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
- 940F4A376A48B060117A1E5D /* [CP] Copy Pods Resources */ = {
+ 9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
- inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+ inputPaths = (
);
- name = "[CP] Copy Pods Resources";
- outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+ name = "Run Script";
+ outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
- showEnvVarsInLog = 0;
+ shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
};
- 9740EEB61CF901F6004384FC /* Run Script */ = {
+ CBB18A5CEEEB971DCFC36E00 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
- inputPaths = (
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
- name = "Run Script";
- outputPaths = (
+ name = "[CP] Copy Pods Resources";
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+ showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index a019ae00..df1ddb97 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1457,4 +1457,8 @@ const Map localizedValues = {
"en": "Drive-Thru",
"ar": "من السيارة"
},
+ "infoCMC": {
+ "en": "Through this service, you can request a set of tests that help you and your doctor to understand the current health condition and then identify potential risks.",
+ "ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
+ },
};
diff --git a/lib/core/model/ImagesInfo.dart b/lib/core/model/ImagesInfo.dart
index 5ab48fb3..54e8042b 100644
--- a/lib/core/model/ImagesInfo.dart
+++ b/lib/core/model/ImagesInfo.dart
@@ -1,6 +1,7 @@
class ImagesInfo {
final String imageAr;
final String imageEn;
+ final bool isAsset;
- ImagesInfo({this.imageAr, this.imageEn});
+ ImagesInfo({this.imageAr, this.imageEn, this.isAsset = false});
}
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index 8995a4e3..cbe2410d 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -46,7 +46,7 @@ class BaseAppClient {
//Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (!isExternal) {
String token = await sharedPref.getString(TOKEN);
- var languageID = await sharedPref.getString(APP_LANGUAGE);
+ var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE,'ar');
var user = await sharedPref.getObject(USER_PROFILE);
if (body.containsKey('SetupID')) {
body['SetupID'] = body.containsKey('SetupID')
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_index_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_index_page.dart
deleted file mode 100644
index e8e9eccc..00000000
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_index_page.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
-import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
-import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
-import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
-import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:hexcolor/hexcolor.dart';
-import 'cmc_page.dart';
-
-class CMCIndexPage extends StatelessWidget {
- @override
- Widget build(BuildContext context) {
- return AppScaffold(
- isShowAppBar: true,
- appBarTitle: TranslationBase.of(context).serviceInformation,
- body: SingleChildScrollView(
- padding: EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Texts(
- "CMC",
- fontWeight: FontWeight.normal,
- fontSize: 25,
- color: Color(0xff60686b),
- ),
- SizedBox(
- height: 12,
- ),
- Texts(
- "This service is designed to help you to set drinking water goals and track the volume of water you are drinking on a daily basis. This service allows for schedule reminders and offers a basic statistical analysis of the amount of what you have consumed over the course of a day, week or month.",
- fontWeight: FontWeight.normal,
- fontSize: 17,
- ),
- SizedBox(
- height: 22,
- ),
- Center(
- child: Image.asset(
- 'assets/images/AlHabibMedicalService/Wifi-AR.png')),
- SizedBox(
- height: 77,
- ),
- ],
- )),
- bottomSheet: Container(
- height: MediaQuery.of(context).size.height * 0.10,
- width: double.infinity,
- child: Column(
- children: [
- Container(
- width: MediaQuery.of(context).size.width * 0.9,
- child: SecondaryButton(
- onTap: () => Navigator.push(
- context,
- FadePage(
- page: CMCPage(),
- ),
- ),
- label: "CMC",
- textColor: Theme.of(context).backgroundColor),
- ),
- ],
- ),
- ));
- }
-}
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
index 95d02d1f..6becba6a 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
@@ -1,5 +1,6 @@
import 'dart:ui';
+import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@@ -40,6 +41,9 @@ class _CMCPageState extends State
},
builder: (_, model, widget) => AppScaffold(
isShowAppBar: true,
+ description:TranslationBase.of(context).infoCMC,
+ image: 'assets/images/AlHabibMedicalService/Wifi-AR.png',
+ imagesInfo: [ImagesInfo(imageAr: 'assets/images/AlHabibMedicalService/Wifi-AR.png',imageEn: 'assets/images/AlHabibMedicalService/Wifi-EN.png', isAsset: true)],
appBarTitle: TranslationBase.of(context).homeHealthCare,
body: Scaffold(
extendBodyBehindAppBar: true,
diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart
index fff74fd5..87afb17f 100644
--- a/lib/pages/landing/home_page.dart
+++ b/lib/pages/landing/home_page.dart
@@ -1,7 +1,7 @@
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
-import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_index_page.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_index_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/contact_us_page.dart';
@@ -490,7 +490,7 @@ class _HomePageState extends State {
Navigator.push(
context,
FadePage(
- page: CMCIndexPage(),
+ page: CMCPage(),
),
);
},
diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart
index 736e7e14..50e9dd48 100644
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@@ -1245,6 +1245,7 @@ class TranslationBase {
localizedValues['shoppingCart'][locale.languageCode];
String get covidTest => localizedValues['covidTest'][locale.languageCode];
String get driveThru => localizedValues['driveThru'][locale.languageCode];
+ String get infoCMC => localizedValues['infoCMC'][locale.languageCode];
}
diff --git a/lib/widgets/others/not_auh_page.dart b/lib/widgets/others/not_auh_page.dart
index 0dbbee43..4bda58a4 100644
--- a/lib/widgets/others/not_auh_page.dart
+++ b/lib/widgets/others/not_auh_page.dart
@@ -108,7 +108,7 @@ class _NotAutPageState extends State {
builder: (BuildContext context){
return SizedBox(
width: MediaQuery.of(context).size.width * 0.50,
- child: Image.network(projectViewModel.isArabic ? image.imageAr : image.imageEn));
+ child: image.isAsset? Image.asset(projectViewModel.isArabic ? image.imageAr : image.imageEn) : Image.network(projectViewModel.isArabic ? image.imageAr : image.imageEn));
},
);
}).toList(),