Merge branch 'sultan-patientapp' into 'development'

Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!321
merge-update-with-lab-changes
Sultan khan 5 years ago
commit f048f5229b

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<g id="Group_1261" data-name="Group 1261" transform="translate(-148.52 -172.52)">
<path id="Path_1724" data-name="Path 1724" d="M9,0a9,9,0,0,1,9,9,9.18,9.18,0,0,1-1.863,5.483A8.844,8.844,0,0,1,9,18,9,9,0,0,1,9,0Z" transform="translate(148.52 172.52)" fill="#5ab145"/>
<g id="check_4_" data-name="check (4)" transform="translate(151.64 177.596)">
<path id="Path_1722" data-name="Path 1722" d="M10.35,68.552l-5.79,5.79L1.411,71.193,0,72.6l4.56,4.56,7.2-7.2Z" transform="translate(0 -68.552)" fill="#fff"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 627 B

@ -0,0 +1,25 @@
package io.flutter.plugins;
import io.flutter.plugin.common.PluginRegistry;
import com.huawei.hms.flutter.location.LocationPlugin;
/**
* Generated file. Do not edit.
*/
public final class GeneratedPluginRegistrant {
public static void registerWith(PluginRegistry registry) {
if (alreadyRegisteredWith(registry)) {
return;
}
LocationPlugin.registerWith(registry.registrarFor("com.huawei.hms.flutter.location.LocationPlugin"));
}
private static boolean alreadyRegisteredWith(PluginRegistry registry) {
final String key = GeneratedPluginRegistrant.class.getCanonicalName();
if (registry.hasPlugin(key)) {
return true;
}
registry.registrarFor(key);
return false;
}
}

@ -0,0 +1,2 @@
sdk.dir=C:\\Users\\sultan.khan\\AppData\\Local\\Android\\Sdk
flutter.sdk=C:\\Program Files\\flutter

@ -0,0 +1,14 @@
// This is a generated file; do not edit or check into version control.
FLUTTER_ROOT=C:\Program Files\flutter
FLUTTER_APPLICATION_PATH=C:\Projects\DQ\hms-plugins\flutter-hms-location
FLUTTER_TARGET=lib\main.dart
FLUTTER_BUILD_DIR=build
SYMROOT=${SOURCE_ROOT}/../build\ios
OTHER_LDFLAGS=$(inherited) -framework Flutter
FLUTTER_FRAMEWORK_DIR=C:\Program Files\flutter\bin\cache\artifacts\engine\ios
FLUTTER_BUILD_NAME=5.0.0
FLUTTER_BUILD_NUMBER=301
DART_OBFUSCATION=false
TRACK_WIDGET_CREATION=false
TREE_SHAKE_ICONS=false
PACKAGE_CONFIG=.packages

@ -0,0 +1,15 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=C:\Program Files\flutter"
export "FLUTTER_APPLICATION_PATH=C:\Projects\DQ\hms-plugins\flutter-hms-location"
export "FLUTTER_TARGET=lib\main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
export "FLUTTER_FRAMEWORK_DIR=C:\Program Files\flutter\bin\cache\artifacts\engine\ios"
export "FLUTTER_BUILD_NAME=5.0.0"
export "FLUTTER_BUILD_NUMBER=301"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=false"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.packages"

@ -0,0 +1,17 @@
//
// Generated file. Do not edit.
//
#ifndef GeneratedPluginRegistrant_h
#define GeneratedPluginRegistrant_h
#import <Flutter/Flutter.h>
NS_ASSUME_NONNULL_BEGIN
@interface GeneratedPluginRegistrant : NSObject
+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
@end
NS_ASSUME_NONNULL_END
#endif /* GeneratedPluginRegistrant_h */

@ -0,0 +1,12 @@
//
// Generated file. Do not edit.
//
#import "GeneratedPluginRegistrant.h"
@implementation GeneratedPluginRegistrant
+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
}
@end

@ -1143,6 +1143,12 @@ const Map localizedValues = {
"YouCanFind": {"en": "You Can Find ", "ar": "باستطاعتك العثور على "}, "YouCanFind": {"en": "You Can Find ", "ar": "باستطاعتك العثور على "},
"ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "}, "ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "},
"blood-donation": {"en": "Blood Donation", "ar": "التبرع بالدم"}, "blood-donation": {"en": "Blood Donation", "ar": "التبرع بالدم"},
"blood-donation-info": {
"en":
"Through this service, you can register your name as a blood donor where the blood bank in the Habib Medical Group will communicate you in case of need for blood type.",
"ar":
"عن طريق هذه الخدمة تستطيع تسجيل اسمك كمتبرع بالدم حيث سيتم التواصل معك عن طريق بنك الدم في مجموعة الحبيب الطبية في حال الحاجة الى فصيلة الدم ."
},
"blood-instruction": { "blood-instruction": {
"en": "en":
"Enter the required information, In order to register for Blood Donation Service", "Enter the required information, In order to register for Blood Donation Service",
@ -1995,6 +2001,8 @@ const Map localizedValues = {
"en": "Please enter the mobile number and the medical file number", "en": "Please enter the mobile number and the medical file number",
"ar": "الرجاء إدخال رقم الجوال ورقم الملف الطبي" "ar": "الرجاء إدخال رقم الجوال ورقم الملف الطبي"
}, },
"allow": {"en": "Allow", "ar": "السماح"},
"reject": {"en": "Reject", "ar": "رفض"},
"referralRequesterInformation": { "referralRequesterInformation": {
"en": "Referral requester information", "en": "Referral requester information",
"ar": "معلومات طالب الإحالة" "ar": "معلومات طالب الإحالة"
@ -2003,20 +2011,11 @@ const Map localizedValues = {
"en": "Enter Referral Requester Name*", "en": "Enter Referral Requester Name*",
"ar": "أدخل اسم مقدم طلب الإحالة *" "ar": "أدخل اسم مقدم طلب الإحالة *"
}, },
"selectRelationship": { "selectRelationship": {"en": "Select Relationship", "ar": "حدد العلاقة"},
"en": "Select Relationship",
"ar": "حدد العلاقة"
},
"requesterRelationship": { "requesterRelationship": {
"en": "Requester Relationship", "en": "Requester Relationship",
"ar": "علاقة الطالب" "ar": "علاقة الطالب"
}, },
"newReferral": { "newReferral": {"en": "New Referral", "ar": "إحالة جديدة"},
"en": "New Referral", "searchForReferrals": {"en": "Search For Referrals", "ar": "ابحث عن الإحالات"}
"ar": "إحالة جديدة"
},
"searchForReferrals": {
"en": "Search For Referrals",
"ar": "ابحث عن الإحالات"
}
}; };

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart'; import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart'; import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart';
@ -60,7 +61,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
AppSharedPreferences sharedPref = AppSharedPreferences(); AppSharedPreferences sharedPref = AppSharedPreferences();
AuthenticatedUser authUser; AuthenticatedUser authUser;
var checkedValue = false; var checkedValue = false;
List<ImagesInfo> imagesInfo = List();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -69,6 +70,13 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
imagesInfo.add(
ImagesInfo(
imageEn:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/blood/en/0.png',
imageAr:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/blood/ar/0.png'),
);
ProjectViewModel projectProvider = Provider.of(context); ProjectViewModel projectProvider = Provider.of(context);
return BaseView<MyBalanceViewModel>( return BaseView<MyBalanceViewModel>(
@ -76,6 +84,8 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
baseViewModel: model, baseViewModel: model,
imagesInfo: imagesInfo,
description: TranslationBase.of(context).bloodDonationInfo,
appBarTitle: TranslationBase.of(context).bloodD, appBarTitle: TranslationBase.of(context).bloodD,
body: SingleChildScrollView( body: SingleChildScrollView(
physics: ScrollPhysics(), physics: ScrollPhysics(),

@ -75,7 +75,7 @@ class AddFamilyMemberType extends StatelessWidget {
), ),
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.nationalID, .idNo,
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
2, 2,

@ -395,12 +395,20 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
left: 10, right: 10), left: 10, right: 10),
child: Row(children: [ child: Row(children: [
Expanded( Expanded(
flex: 3, child: AppText('Name')), flex: 3,
child: AppText(
TranslationBase.of(context)
.name)),
Expanded( Expanded(
flex: 1, child: AppText('Allow')), flex: 1,
child: AppText(
TranslationBase.of(context)
.allow)),
Expanded( Expanded(
flex: 1, flex: 1,
child: AppText('Reject')), child: AppText(
TranslationBase.of(context)
.reject)),
])), ])),
Column( Column(
children: familyFileProvider children: familyFileProvider
@ -577,9 +585,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
EdgeInsets.only(left: 10, right: 10), EdgeInsets.only(left: 10, right: 10),
child: Row(children: [ child: Row(children: [
Expanded( Expanded(
flex: 3, child: AppText('Name')), flex: 3,
child: AppText(
TranslationBase.of(context)
.name)),
Expanded( Expanded(
flex: 1, child: AppText('Delete')), flex: 1,
child: AppText(
TranslationBase.of(context)
.delete)),
])), ])),
Column( Column(
children: familyFileProvider children: familyFileProvider

@ -278,44 +278,46 @@ class _RegisterInfo extends State<RegisterInfo> {
registerNow() { registerNow() {
dynamic request = getTempUserRequest(); dynamic request = getTempUserRequest();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
this.authService.registerUser(request).then((result) => { this
GifLoaderDialogUtils.hideDialog(context), .authService
// userData = result.list; .registerUser(request)
//AuthenticatedUser.fromJson(result['List'][0]), .then((result) => {
if(result is String){ GifLoaderDialogUtils.hideDialog(context),
new ConfirmDialog( // userData = result.list;
context: context, //AuthenticatedUser.fromJson(result['List'][0]),
confirmMessage: result, if (result is String)
okText: TranslationBase.of(context).ok, {
cancelText: TranslationBase.of(context).cancel_nocaps, new ConfirmDialog(
okFunction: () => { context: context,
ConfirmDialog.closeAlertDialog(context) confirmMessage: result,
}, okText: TranslationBase.of(context).ok,
cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}) cancelText: TranslationBase.of(context).cancel_nocaps,
.showAlertDialog(context) okFunction: () =>
{ConfirmDialog.closeAlertDialog(context)},
}else cancelFunction: () => {
{ ConfirmDialog.closeAlertDialog(context)
result.list.isFamily = false, }).showAlertDialog(context)
sharedPref.setObject(USER_PROFILE, result.list), }
this.sharedPref.setObject(MAIN_USER, result.list), else
sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), {
sharedPref.setString(TOKEN, result.authenticationTokenID), result.list.isFamily = false,
Navigator.of(context).pushNamed(HOME) sharedPref.setObject(USER_PROFILE, result.list),
} this.sharedPref.setObject(MAIN_USER, result.list),
}).catchError((err) { sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
GifLoaderDialogUtils.hideDialog(context); sharedPref.setString(TOKEN, result.authenticationTokenID),
Navigator.of(context).pushNamed(HOME)
}
})
.catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
confirmMessage: err, confirmMessage: err,
okText: TranslationBase.of(context).confirm, okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps, cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => { okFunction: () => {ConfirmDialog.closeAlertDialog(context)},
ConfirmDialog.closeAlertDialog(context)
},
cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
}); });
} }
@ -347,12 +349,12 @@ class _RegisterInfo extends State<RegisterInfo> {
"PatientIdentificationNo": registerInfo.idNumber, "PatientIdentificationNo": registerInfo.idNumber,
"MobileNumber": registerd_data.patientMobileNumber, "MobileNumber": registerd_data.patientMobileNumber,
"PatientOutSA": registerd_data.zipCode == '966' ? 0 : 1, "PatientOutSA": registerd_data.zipCode == '966' ? 0 : 1,
"FirstNameN":registerInfo.firstNameAr =='-' ?"": registerInfo.firstNameAr, "FirstNameN": registerInfo.firstNameAr,
"FirstName": registerInfo.firstNameEn =='-' ?"":registerInfo.firstNameEn, "FirstName": registerInfo.firstNameEn,
"MiddleNameN":registerInfo.secondNameAr =='-' ? "" : registerInfo.secondNameAr, "MiddleNameN": registerInfo.secondNameAr,
"MiddleName":registerInfo.secondNameEn == '-' ? "": registerInfo.secondNameEn, "MiddleName": registerInfo.secondNameEn,
"LastNameN": registerInfo.lastNameAr =='-'? "" : registerInfo.lastNameAr, "LastNameN": registerInfo.lastNameAr,
"LastName": registerInfo.lastNameEn =='-' ? "": registerInfo.lastNameEn, "LastName": registerInfo.lastNameEn,
"StrDateofBirth": registerInfo.dateOfBirth, "StrDateofBirth": registerInfo.dateOfBirth,
"DateofBirth": DateUtil.convertISODateToJsonDate( "DateofBirth": DateUtil.convertISODateToJsonDate(
registerInfo.dateOfBirth.replaceAll('/', '-')), registerInfo.dateOfBirth.replaceAll('/', '-')),

@ -21,6 +21,7 @@ import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
class Register extends StatefulWidget { class Register extends StatefulWidget {
@override @override
@ -294,12 +295,12 @@ class _Register extends State<Register> {
// DOB: this.dateOption === '1' ? this.dateOfBirth : moment(this.dateOfBirth).format('DD/MM/YYYY'), // DOB: this.dateOption === '1' ? this.dateOfBirth : moment(this.dateOfBirth).format('DD/MM/YYYY'),
// IsHijri: Number(this.dateOption) // IsHijri: Number(this.dateOption)
// } // }
final DateFormat dateFormat = DateFormat('dd/MM/yyyy');
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
var request = CheckUserStatusRequest(); var request = CheckUserStatusRequest();
request.patientIdentificationID = nationalIDorFile.text; request.patientIdentificationID = nationalIDorFile.text;
request.dOB = isHijri == 1 request.dOB = isHijri == 1 ? dob : dateFormat.format(selectedDate);
? dob
: "${selectedDate.toLocal()}".split(' ')[0].replaceAll('-', '/');
request.isHijri = isHijri; request.isHijri = isHijri;
request.patientOutSA = countryCode == '966' ? 0 : 1; request.patientOutSA = countryCode == '966' ? 0 : 1;
this.authService.checkUserStatus(request).then((result) => { this.authService.checkUserStatus(request).then((result) => {
@ -311,7 +312,12 @@ class _Register extends State<Register> {
Navigator.of(context).push(FadePage(page: ConfirmLogin())), Navigator.of(context).push(FadePage(page: ConfirmLogin())),
} }
else else
{AppToast.showErrorToast(message: result)} {
AppToast.showErrorToast(
message: result
? result
: TranslationBase.of(context).somethingWentWrong)
}
}); });
} }

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:screen/screen.dart'; import 'package:screen/screen.dart';
@ -27,10 +28,11 @@ class _GeneralSettings extends State<GeneralSettings>
bool location = false; bool location = false;
var sharedPref = new AppSharedPreferences(); var sharedPref = new AppSharedPreferences();
var permission = new PermissionService(); var permission = new PermissionService();
LocationPermission locationPermission;
var mediaQueryData; var mediaQueryData;
@override @override
void initState() { void initState() {
getValues(); this.getValues();
super.initState(); super.initState();
} }
@ -80,7 +82,6 @@ class _GeneralSettings extends State<GeneralSettings>
setState(() { setState(() {
accsibility = value; accsibility = value;
}); });
//setAccisibility(value);
}, },
activeTrackColor: Colors.lightGreenAccent, activeTrackColor: Colors.lightGreenAccent,
activeColor: Colors.green, activeColor: Colors.green,
@ -199,6 +200,7 @@ class _GeneralSettings extends State<GeneralSettings>
setState(() { setState(() {
camera = value; camera = value;
}); });
this.permission.openSettings();
}, },
activeTrackColor: Colors.lightGreenAccent, activeTrackColor: Colors.lightGreenAccent,
activeColor: Colors.green, activeColor: Colors.green,
@ -215,9 +217,12 @@ class _GeneralSettings extends State<GeneralSettings>
Switch( Switch(
value: location, value: location,
onChanged: (value) { onChanged: (value) {
setState(() { if (value == true) {
location = value; Navigator.pop(context);
}); this.setLocationPermission();
} else {
Geolocator.openLocationSettings();
}
}, },
activeTrackColor: Colors.lightGreenAccent, activeTrackColor: Colors.lightGreenAccent,
activeColor: Colors.green, activeColor: Colors.green,
@ -227,6 +232,23 @@ class _GeneralSettings extends State<GeneralSettings>
])); ]));
} }
setLocationPermission() async {
locationPermission = await Geolocator.checkPermission();
if (locationPermission == LocationPermission.denied) {
locationPermission = await Geolocator.requestPermission();
if (locationPermission != LocationPermission.denied) {
setState(() {
location = true;
});
} else {
this.location = false;
}
} else {
Geolocator.openLocationSettings();
this.location = true;
}
}
setTheme(value) async { setTheme(value) async {
switch (value) { switch (value) {
case 0: case 0:
@ -277,20 +299,30 @@ class _GeneralSettings extends State<GeneralSettings>
vibration = permission.isVibrationEnabled() == null vibration = permission.isVibrationEnabled() == null
? false ? false
: permission.isVibrationEnabled(); : permission.isVibrationEnabled();
accsibility = mediaQueryData.accessibleNavigation; // accsibility = mediaQueryData.accessibleNavigation;
setTheme(blindValue); //setTheme(blindValue);
} }
var camera = await this.permission.isCameraEnabled();
var location = await this.permission.isLocationEnabled();
setState(() {
this.camera = camera;
this.location = location;
});
} }
getTheme(value) async { getTheme(value) async {
if (value == 1) { if (value == 1) {
return invertThemes( return invertThemes(
fontName: Provider.of<ProjectViewModel>(context, listen: false).isArabic ? 'Cairo' : 'WorkSans' fontName:
); Provider.of<ProjectViewModel>(context, listen: false).isArabic
? 'Cairo'
: 'WorkSans');
} else if (value == 3) { } else if (value == 3) {
return bwThemes( return bwThemes(
fontName: Provider.of<ProjectViewModel>(context, listen: false).isArabic ? 'Cairo' : 'WorkSans' fontName:
); Provider.of<ProjectViewModel>(context, listen: false).isArabic
? 'Cairo'
: 'WorkSans');
} else { } else {
return defaultTheme( return defaultTheme(
fontName: fontName:

@ -44,7 +44,7 @@ class _ProfileSettings extends State<ProfileSettings>
child: model.user != null child: model.user != null
? ListView(scrollDirection: Axis.vertical, children: <Widget>[ ? ListView(scrollDirection: Axis.vertical, children: <Widget>[
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -74,7 +74,7 @@ class _ProfileSettings extends State<ProfileSettings>
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
), ),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Row( child: Row(
@ -93,7 +93,7 @@ class _ProfileSettings extends State<ProfileSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Row( child: Row(
@ -116,7 +116,7 @@ class _ProfileSettings extends State<ProfileSettings>
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
), ),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Row( child: Row(
@ -136,7 +136,7 @@ class _ProfileSettings extends State<ProfileSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Row( child: Row(
@ -160,7 +160,7 @@ class _ProfileSettings extends State<ProfileSettings>
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
), ),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Column( child: Column(
@ -175,7 +175,7 @@ class _ProfileSettings extends State<ProfileSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Column( child: Column(
@ -190,7 +190,7 @@ class _ProfileSettings extends State<ProfileSettings>
], ],
)), )),
Container( Container(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 0, left: 10, right: 10, bottom: 0), top: 0, left: 10, right: 10, bottom: 0),
child: Column( child: Column(

@ -259,7 +259,7 @@ class FamilyFilesProvider with ChangeNotifier {
var currentUser = var currentUser =
AuthenticatedUser.fromJson(await sharedPref.getObject(MAIN_USER)); AuthenticatedUser.fromJson(await sharedPref.getObject(MAIN_USER));
//const request = new SwitchUserRequest(); //const request = new SwitchUserRequest();
request['LogInTokenID'] = ''; // request['LogInTokenID'] = '';
request['PatientOutSA'] = currentUser.outSA; //? 1 : 0; request['PatientOutSA'] = currentUser.outSA; //? 1 : 0;
request['PatientMobileNumber'] = request['PatientMobileNumber'] =
currentUser.mobileNumber; //['MobileNumber']; currentUser.mobileNumber; //['MobileNumber'];
@ -276,7 +276,7 @@ class FamilyFilesProvider with ChangeNotifier {
AuthenticatedUser.fromJson(await sharedPref.getObject(USER_PROFILE)); AuthenticatedUser.fromJson(await sharedPref.getObject(USER_PROFILE));
//const request = new SwitchUserRequest(); //const request = new SwitchUserRequest();
request['LogInTokenID'] = ''; // request['LogInTokenID'] = '';
request['PatientOutSA'] = currentUser.outSA; //? 1 : 0; request['PatientOutSA'] = currentUser.outSA; //? 1 : 0;
request['PatientMobileNumber'] = request['PatientMobileNumber'] =
switchUser.mobileNumber; //['MobileNumber']; switchUser.mobileNumber; //['MobileNumber'];

@ -10,9 +10,12 @@ import 'package:flutter/services.dart';
import 'package:localstorage/localstorage.dart'; import 'package:localstorage/localstorage.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:vibration/vibration.dart'; import 'package:vibration/vibration.dart';
import 'package:geolocator/geolocator.dart' as geo;
import 'package:open_settings/open_settings.dart';
class PermissionService extends BaseService { class PermissionService extends BaseService {
final LocalStorage storage = new LocalStorage("permission"); final LocalStorage storage = new LocalStorage("permission");
geo.LocationPermission locationPermission;
AppGlobal appGlobal = new AppGlobal(); AppGlobal appGlobal = new AppGlobal();
setVibrationPermission(flag) async { setVibrationPermission(flag) async {
@ -20,23 +23,24 @@ class PermissionService extends BaseService {
} }
isVibrationEnabled() { isVibrationEnabled() {
return (storage.getItem('isVibration') ==null) || (storage.getItem('isVibration')) ==false ? false :true; return (storage.getItem('isVibration') == null) ||
(storage.getItem('isVibration')) == false
? false
: true;
} }
vibrate(callback, context) async{
if (callback == null) vibrate(callback, context) async {
return null; if (callback == null) return null;
if(isVibrationEnabled() ==true){ if (isVibrationEnabled() == true) {
if (await Vibration.hasVibrator()) { if (await Vibration.hasVibrator()) {
Vibration.vibrate(duration: 100); Vibration.vibrate(duration: 100);
callback(); callback();
} }
}else{ } else {
callback(); callback();
} }
} }
setTheme(flag) async { setTheme(flag) async {
storage.setItem('isTheme', flag); storage.setItem('isTheme', flag);
} }
@ -44,23 +48,36 @@ class PermissionService extends BaseService {
isThemeEnabled() { isThemeEnabled() {
return storage.getItem('isTheme'); return storage.getItem('isTheme');
} }
cameraPermission() async{
Map<Permission, PermissionStatus> statuses = await [ cameraPermission() async {
Permission.camera, Map<Permission, PermissionStatus> statuses = await [
].request(); Permission.camera,
} ].request();
isCameraEnabled() async{ }
print(await Permission.camera.status);
return await Permission.camera.status == PermissionStatus.granted ? true : false; isCameraEnabled() async {
return await Permission.camera.isGranted;
} }
setCameraLocationPermission(context) async{
setCameraLocationPermission(context) async {
Navigator.pop(context); Navigator.pop(context);
openAppSettings(); openAppSettings();
} }
isLocationEnabled() async{
return await Permission.location.status == PermissionStatus.granted ? true : false; isLocationEnabled() async {
var permission = await geo.Geolocator.checkPermission();
if (permission == geo.LocationPermission.denied) {
return false;
} else {
return true;
}
} }
openSettings() async{
openSettings() async {
openAppSettings(); openAppSettings();
} }
openAccessbility() {
OpenSettings.openAppSetting();
}
} }

@ -754,8 +754,10 @@ class TranslationBase {
String get shippedMethod => String get shippedMethod =>
localizedValues['shippedMethod'][locale.languageCode]; localizedValues['shippedMethod'][locale.languageCode];
String get orderDetail => localizedValues['orderDetail'][locale.languageCode]; String get orderDetail => localizedValues['orderDetail'][locale.languageCode];
String get deliveryDriverTrack => localizedValues['DeliveryDriverTrack'][locale.languageCode]; String get deliveryDriverTrack =>
String get deliveryLocation => localizedValues['DeliveryLocation'][locale.languageCode]; localizedValues['DeliveryDriverTrack'][locale.languageCode];
String get deliveryLocation =>
localizedValues['DeliveryLocation'][locale.languageCode];
String get driver => localizedValues['Driver'][locale.languageCode]; String get driver => localizedValues['Driver'][locale.languageCode];
String get subtotal => localizedValues['subtotal'][locale.languageCode]; String get subtotal => localizedValues['subtotal'][locale.languageCode];
String get shipping => localizedValues['shipping'][locale.languageCode]; String get shipping => localizedValues['shipping'][locale.languageCode];
@ -1038,6 +1040,9 @@ class TranslationBase {
localizedValues['ItemInSearch'][locale.languageCode]; localizedValues['ItemInSearch'][locale.languageCode];
String get bloodDonation => String get bloodDonation =>
localizedValues['blood-donation'][locale.languageCode]; localizedValues['blood-donation'][locale.languageCode];
String get bloodDonationInfo =>
localizedValues['blood-donation-info'][locale.languageCode];
String get bloodInstruction => String get bloodInstruction =>
localizedValues['blood-instruction'][locale.languageCode]; localizedValues['blood-instruction'][locale.languageCode];
String get bloodTermsNcondition => String get bloodTermsNcondition =>
@ -1562,14 +1567,17 @@ class TranslationBase {
localizedValues["submitncontinue"][locale.languageCode]; localizedValues["submitncontinue"][locale.languageCode];
String get areyousure => localizedValues["areyousure"][locale.languageCode]; String get areyousure => localizedValues["areyousure"][locale.languageCode];
// Offer And Packahes // Offer And Packahes
String get subT=> localizedValues['OffersAndPackages'][locale.languageCode]; String get subT => localizedValues['OffersAndPackages'][locale.languageCode];
String get totalWithColonRight => localizedValues['totalWithColonRight'][locale.languageCode]; String get totalWithColonRight =>
localizedValues['totalWithColonRight'][locale.languageCode];
String get preferredunit => String get preferredunit =>
localizedValues["preferredunit"][locale.languageCode]; localizedValues["preferredunit"][locale.languageCode];
String get trySaying => localizedValues["try-saying"][locale.languageCode]; String get trySaying => localizedValues["try-saying"][locale.languageCode];
String get somethingWentWrong =>
localizedValues["somethingWentWrong"][locale.languageCode];
String get enterIdentificationNumber => String get enterIdentificationNumber =>
localizedValues["enterIdentificationNumber"][locale.languageCode]; localizedValues["enterIdentificationNumber"][locale.languageCode];
String get accountActivationDesc => String get accountActivationDesc =>
@ -1609,11 +1617,17 @@ class TranslationBase {
String get insuranceID => String get insuranceID =>
localizedValues["insurance-id"][locale.languageCode]; localizedValues["insurance-id"][locale.languageCode];
String get enterFile => localizedValues["enter-file"][locale.languageCode]; String get enterFile => localizedValues["enter-file"][locale.languageCode];
String get enterReferralRequesterName => localizedValues["enterReferralRequesterName"][locale.languageCode]; String get allow => localizedValues["allow"][locale.languageCode];
String get selectRelationship => localizedValues["selectRelationship"][locale.languageCode]; String get reject => localizedValues["reject"][locale.languageCode];
String get requesterRelationship => localizedValues["requesterRelationship"][locale.languageCode]; String get enterReferralRequesterName =>
localizedValues["enterReferralRequesterName"][locale.languageCode];
String get selectRelationship =>
localizedValues["selectRelationship"][locale.languageCode];
String get requesterRelationship =>
localizedValues["requesterRelationship"][locale.languageCode];
String get newReferral => localizedValues["newReferral"][locale.languageCode]; String get newReferral => localizedValues["newReferral"][locale.languageCode];
String get searchForReferrals => localizedValues["searchForReferrals"][locale.languageCode]; String get searchForReferrals =>
localizedValues["searchForReferrals"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -309,7 +309,7 @@ class _AppDrawerState extends State<AppDrawer> {
padding: EdgeInsets.only(left: 5, right: 5), padding: EdgeInsets.only(left: 5, right: 5),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
AppText(TranslationBase.of(context).fileno + ": " + result.patientID.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
]))), ]))),
], ],
))) )))

@ -176,7 +176,7 @@ dependencies:
path: speech_to_text path: speech_to_text
badges: ^1.1.4 badges: ^1.1.4
open_settings: ^2.0.1
# Dep by Zohaib # Dep by Zohaib
shimmer: ^1.1.2 shimmer: ^1.1.2
carousel_slider: ^2.3.1 carousel_slider: ^2.3.1

Loading…
Cancel
Save