Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_design' into 'development'

Browse Source 
Fix design

See merge request Cloud_Solution/diplomatic-quarter!235
merge-requests/236/merge
Mohammad Aljammal 4 years ago
parent 5f788b556f 2843b1393e
commit b01e718ae3
19 changed files with 550 additions and 559 deletions
Show Stats Download Patch File Download Diff File

4
android/app/build.gradle
Unescape Escape View File

@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 28
compileSdkVersion 30
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@ -41,7 +41,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.cloud.diplomaticquarterapp"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true

6
android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
Unescape Escape View File

@ -68,12 +68,12 @@ class HMGUtils {
}
}
fun getGeoZonesFromPreference(context: Context):List<GeoZoneModel>{
fun getGeoZonesFromPreference(context: Context): List<GeoZoneModel> {
val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
val json = pref.getString(PREF_KEY_HMG_ZONES,"[]")
val geoZones = GeoZoneModel().listFrom(json)
return geoZones
val geoZones = json?.let { GeoZoneModel().listFrom(it) }
return geoZones!!
}
}

BIN
assets/images/DQ/logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
assets/images/DQ/logo_big.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

19
lib/pages/landing/landing_page_pharmcy.dart
Unescape Escape View File

@ -78,11 +78,19 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
),
leading: Builder(
builder: (BuildContext context) {
return Container(
height: 2.0,
width: 10.0,
child: Image.asset(
'assets/images/pharmacy_logo.png',
return InkWell(
onTap: (){
setState(() {
currentTab = 0;
pageController.jumpToPage(0);
});
},
child: Container(
height: 2.0,
width: 10.0,
child: Image.asset(
'assets/images/pharmacy_logo.png',
),
),
);
},
@ -135,6 +143,7 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
physics: NeverScrollableScrollPhysics(),
controller: pageController,
children: [
// TODO mosa_comeback
PharmacyPage(),
PharmacyCategorisePage(),
// OffersCategorisePage(),

2
lib/pages/login/login-type.dart
Unescape Escape View File

@ -32,7 +32,7 @@ class LoginType extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/DQ/dq_logo_icon.png',
'assets/images/DQ/logo.png',
height: 90,
width: 90,
),

5
lib/pages/login/welcome.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -36,7 +37,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset('assets/images/DQ/dq_logo_icon.png',
Image.asset('assets/images/DQ/logo.png',
height: 90, width: 90),
Text(
TranslationBase.of(context).welcome,
@ -75,7 +76,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
LOGIN_TYPE,
),
},
color: Color(0xFF40ACC9),
color: Color(0xFFc5272c),
textColor: Colors.white,
))
],

35
lib/pages/pharmacies/screens/cart-order-page.dart
Unescape Escape View File

@ -19,26 +19,21 @@ class CartOrderPage extends StatelessWidget {
Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context);
PreferredSizeWidget appBarWidget =
AppBarWidget(TranslationBase.of(context).shoppingCart, null, true);
final height = mediaQuery.size.height -
appBarWidget.preferredSize.height -
mediaQuery.padding.top;
final height = mediaQuery.size.height - 60 - mediaQuery.padding.top;
return BaseView<OrderPreviewViewModel>(
onModelReady: (model) => model.getOrderPreviewData(),
builder: (_, model, wi) => ChangeNotifierProvider.value(
value: model.cartResponse,
child: AppScaffold(
title: TranslationBase.of(context).shoppingCart,
appBarTitle: TranslationBase.of(context).shoppingCart,
isShowAppBar: true,
isShowDecPage: false,
isPharmacy: true,
baseViewModel: model,
appBarWidget: appBarWidget,
backgroundColor: Colors.white,
body: !(model.cartResponse.shoppingCarts == null ||
model.cartResponse.shoppingCarts.length == 0)
model.cartResponse.shoppingCarts.length == 0)
? Container(
height: height * 0.85,
width: double.infinity,
@ -179,7 +174,29 @@ class CartOrderPage extends StatelessWidget {
),
),
)
: Container(),
: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Image.asset(
'assets/images/new-design/empty_box.png',
width: 100,
height: 100,
fit: BoxFit.cover,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'There is no data',
style: TextStyle(fontSize: 30),
),
)
],
),
),
bottomSheet: Container(
height: !(model.cartResponse.shoppingCarts == null ||
model.cartResponse.shoppingCarts.length == 0)

7
lib/pages/pharmacies/screens/cart-order-preview.dart
Unescape Escape View File

@ -24,11 +24,9 @@ class OrderPreviewPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
PreferredSizeWidget appBarWidget =
AppBarWidget("${TranslationBase.of(context).checkOut}", null, true);
final mediaQuery = MediaQuery.of(context);
final height = mediaQuery.size.height -
appBarWidget.preferredSize.height -
60 -
mediaQuery.padding.top;
return BaseView<OrderPreviewViewModel>(
@ -36,11 +34,10 @@ class OrderPreviewPage extends StatelessWidget {
builder: (_, model, wi) => ChangeNotifierProvider.value(
value: model.paymentCheckoutData,
child: AppScaffold(
title: "${TranslationBase.of(context).checkOut}",
appBarTitle: "${TranslationBase.of(context).checkOut}",
isShowAppBar: true,
isPharmacy: true,
isShowDecPage: false,
appBarWidget: appBarWidget,
backgroundColor: Colors.white,
baseViewModel: model,
body: Container(

10
lib/pages/pharmacies/screens/lacum-registration-page.dart
Unescape Escape View File

@ -34,7 +34,6 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
@override
Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context);
PreferredSizeWidget appBarWidget = AppBarWidget("Lakum", null, true);
languages.clear();
languages.add(IdNamePair(1, TranslationBase.of(context).arabic));
languages.add(IdNamePair(2, TranslationBase.of(context).english));
@ -49,19 +48,18 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
return BaseView<LacumRegistrationViewModel>(
builder: (_, model, wi) => AppScaffold(
title: "Register Lakum",
appBarTitle:
"${TranslationBase.of(context).register} ${TranslationBase.of(context).lakum}",
isShowAppBar: true,
isShowDecPage: false,
backgroundColor: Colors.white,
appBarWidget: appBarWidget,
baseViewModel: model,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: SizedBox(
height: mediaQuery.size.height -
appBarWidget.preferredSize.height -
mediaQuery.padding.top,
height:
mediaQuery.size.height - 60 - mediaQuery.padding.top,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.spaceBetween,

6
lib/pages/pharmacies/screens/lacum-setting-page.dart
Unescape Escape View File

@ -36,24 +36,22 @@ class _LakumSettingPageState extends State<LakumSettingPage> {
@override
Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context);
PreferredSizeWidget appBarWidget = AppBarWidget("Lakum", null, true);
return BaseView<LacumViewModel>(
onModelReady: (model) => model.setLakumData(
widget.lacumInformation, widget.lacumGroupInformation),
builder: (_, model, wi) => AppScaffold(
title: "Lakum",
appBarTitle: "${TranslationBase.of(context).lakum}",
isShowAppBar: true,
isShowDecPage: false,
backgroundColor: Colors.white,
appBarWidget: appBarWidget,
baseViewModel: model,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: SizedBox(
height: mediaQuery.size.height -
appBarWidget.preferredSize.height -
60 -
mediaQuery.padding.top,
child: _buildSettingScreen(mediaQuery, model),
),

4
lib/pages/pharmacies/screens/lacum-transfer-page.dart
Unescape Escape View File

@ -32,17 +32,15 @@ class _LacumTransferPageState extends State<LacumTransferPage> {
@override
Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context);
PreferredSizeWidget appBarWidget = AppBarWidget("Lakum", null, true);
return BaseView<LacumTranferViewModel>(
onModelReady: (model) => model.setLakumData(
widget.lacumInformation, widget.lacumGroupInformation),
builder: (_, model, wi) => AppScaffold(
title: "Lakum",
appBarTitle: "${TranslationBase.of(context).lakum}",
isShowAppBar: true,
isShowDecPage: false,
backgroundColor: Colors.white,
appBarWidget: appBarWidget,
baseViewModel: model,
body: Container(
width: double.infinity,

9
lib/pages/pharmacies/screens/lakum-terms-conditions-page.dart
Unescape Escape View File

@ -19,21 +19,14 @@ class LakumTermsConditions extends StatelessWidget {
Widget build(BuildContext context) {
ProjectViewModel projectProvider = Provider.of(context);
final mediaQuery = MediaQuery.of(context);
PreferredSizeWidget appBarWidget = AppBarWidget("Lakum", null, true);
double height = mediaQuery.size.height -
appBarWidget.preferredSize.height -
mediaQuery.padding.top;
return BaseView<LacumRegistrationViewModel>(
onModelReady: (model) => model.getUserTermsAndConditionsForEPharmcy(),
builder: (_, model, wi) => AppScaffold(
appBarTitle: "Register Lakum",
appBarTitle: "${TranslationBase.of(context).register} ${TranslationBase.of(context).lakum}",
isShowAppBar: true,
isShowDecPage: false,
backgroundColor: Colors.white,
baseViewModel: model,
appBarWidget: appBarWidget,
body: Container(
margin: EdgeInsets.all(8),
width: double.infinity,

5
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
Unescape Escape View File

@ -49,11 +49,9 @@ class _AddAddressPageState extends State<AddAddressPage> {
@override
Widget build(BuildContext context) {
PreferredSizeWidget appBarWidget = AppBarWidget(
"${TranslationBase.of(context).changeAddress}", null, true);
final mediaQuery = MediaQuery.of(context);
final height = mediaQuery.size.height -
appBarWidget.preferredSize.height -
60 -
mediaQuery.padding.top;
return BaseView<PharmacyAddressesViewModel>(
@ -62,7 +60,6 @@ class _AddAddressPageState extends State<AddAddressPage> {
isShowAppBar: true,
isPharmacy: true,
backgroundColor: Colors.white,
appBarWidget: appBarWidget,
body: Container(
height: height * 1,
child: PickupLocationFromMap(

13
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
Unescape Escape View File

@ -12,14 +12,12 @@ import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart';
class PharmacyAddressesPage extends StatefulWidget {
@override
_PharmacyAddressesState createState() => _PharmacyAddressesState();
}
class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
void navigateToAddressPage(
BuildContext ctx, PharmacyAddressesViewModel model, Addresses address) {
Navigator.push(
@ -31,12 +29,8 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
}
Widget build(BuildContext context) {
PreferredSizeWidget appBarWidget = AppBarWidget(
"${TranslationBase.of(context).changeAddress}", null, true);
final mediaQuery = MediaQuery.of(context);
final height = mediaQuery.size.height -
appBarWidget.preferredSize.height -
mediaQuery.padding.top;
final height = mediaQuery.size.height - 60 - mediaQuery.padding.top;
return BaseView<PharmacyAddressesViewModel>(
onModelReady: (model) => model.getAddressesList(),
@ -46,7 +40,6 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
isPharmacy: true,
baseViewModel: model,
backgroundColor: Colors.white,
appBarWidget: appBarWidget,
body: Container(
height: height * 0.90,
child: SingleChildScrollView(
@ -115,8 +108,8 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
handler: () {
model.saveSelectedAddressLocally(
model.addresses[model.selectedAddressIndex]);
Navigator.pop(context,
model.addresses[model.selectedAddressIndex]);
Navigator.pop(
context, model.addresses[model.selectedAddressIndex]);
},
),
),

902
lib/pages/pharmacy/profile/profile.dart
Unescape Escape View File

@ -94,7 +94,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
isShowAppBar:false,
isShowDecPage: false,
isPharmacy: true,
body: Container(
body: user != null ? Container(
child: SingleChildScrollView(
child: Column(
children: <Widget>[
@ -125,499 +125,499 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
Text(
languageID == "ar"
? user.firstNameN.toString()+ " " + user.lastNameN.toString()
: user.firstName.toString()+ " " + user.lastName.toString(),
? user.firstNameN.toString()+ " " + user.lastNameN.toString()
: user.firstName.toString()+ " " + user.lastName.toString(),
style: TextStyle(
fontSize: 14.0, fontWeight: FontWeight.bold),
),
],
),
)
],
)
],
),
),
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 5,
indent: 0,
endIndent: 0,
),
SizedBox(
height: 15,
),
Container(
child: Row(
children: <Widget>[
Expanded(
child: InkWell(
onTap: () {
if(customerId == null){
AppToast.showErrorToast(message: "Customer not found");
return;
}
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => OrderPage(customerID: customerId)));
},
child: Column(
children: <Widget>[
Divider(
color: Colors.grey[350],
height: 20,
thickness: 5,
indent: 0,
endIndent: 0,
),
SizedBox(
height: 15,
),
Container(
child: Row(
children: <Widget>[
Expanded(
child: InkWell(
onTap: () {
if(customerId == null){
AppToast.showErrorToast(message: "Customer not found");
return;
}
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => OrderPage(customerID: customerId)));
},
child: Column(
children: <Widget>[
// Image(image: AssetImage('assets/images/pharmacy/orders_icon.svg')),
SvgPicture.asset(
'assets/images/pharmacy/orders_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
SvgPicture.asset(
'assets/images/pharmacy/orders_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).orders,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
),
Text(
TranslationBase.of(context).orders,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LakumMainPage()));
},
child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/lakum_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).lakum,
style: TextStyle(
fontSize: 13.0, fontWeight: FontWeight.bold),
),
],
),
),
],
),
),
),
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LakumMainPage()));
},
child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/lakum_icon.svg',
width: 50,
height: 50,
),
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => WishlistPage()));
},
child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/wishlist_icon.svg',
width: 50,
height: 50,
),SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).wishlist,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
),
SizedBox(
height: 5,
),
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyReviewsPage()));
},child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/review_icon.svg',
width: 50,
height: 50,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).reviews,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
),
Text(
TranslationBase.of(context).lakum,
style: TextStyle(
fontSize: 13.0, fontWeight: FontWeight.bold),
),
],
),
],
)),
SizedBox(
height: 15,
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 5,
indent: 0,
endIndent: 0,
),
SizedBox(
height: 10,
),
Container(
padding: EdgeInsets.only(left: 10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
TranslationBase.of(context).myAccount,
style: TextStyle(
fontSize: 16.0, fontWeight: FontWeight.bold),
),
),
),
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => WishlistPage()));
},
child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/wishlist_icon.svg',
width: 50,
height: 50,
),SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).wishlist,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
),
),
],
SizedBox(
height: 10,
),
),
),
Expanded(
child: InkWell(
onTap: () {
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyReviewsPage()));
},child: Column(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/review_icon.svg',
width: 50,
height: 50,
builder: (context) => HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/my_prescription_icon.svg',
width: 28,
height: 28,
),
SizedBox(
height: 5,
),
Text(
TranslationBase.of(context).reviews,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold,
SizedBox(
width: 15,
),
),
],
),
),
),
],
)),
SizedBox(
height: 15,
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 5,
indent: 0,
endIndent: 0,
),
SizedBox(
height: 10,
),
Container(
padding: EdgeInsets.only(left: 10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
TranslationBase.of(context).myAccount,
style: TextStyle(
fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 10,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/my_prescription_icon.svg',
width: 28,
height: 28,
),
SizedBox(
width: 15,
),
Text(
TranslationBase.of(context).myPrescription,
style: TextStyle(
fontSize: 13.0,
Text(
TranslationBase.of(context).myPrescription,
style: TextStyle(
fontSize: 13.0,
),
),
),
],
],
),
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ComparePage()));
},
child: Row(
children: <Widget>[
Image.asset('assets/images/pharmacy/compare.png',
width: 35, height: 35),
SizedBox(
width: 15,
),
Text(
TranslationBase.of(context).compare,
style: TextStyle(
fontSize: 13.0,
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ComparePage()));
},
child: Row(
children: <Widget>[
Image.asset('assets/images/pharmacy/compare.png',
width: 35, height: 35),
SizedBox(
width: 15,
),
),
],
Text(
TranslationBase.of(context).compare,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/medication_refill_icon.svg',
width: 30,
height: 30,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).medicationsRefill,
style: TextStyle(
fontSize: 13.0,
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/medication_refill_icon.svg',
width: 30,
height: 30,
),
),
],
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).medicationsRefill,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyFamily()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/my_family_icon.svg',
width: 20,
height: 20,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).family,
style: TextStyle(
fontSize: 13.0,
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyFamily()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/my_family_icon.svg',
width: 20,
height: 20,
),
),
],
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).family,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PharmacyAddressesPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/shipping_addresses_icon.svg',
width: 30,
height: 30,
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PharmacyAddressesPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/shipping_addresses_icon.svg',
width: 30,
height: 30,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).shippingAddresses,
style: TextStyle(
fontSize: 13.0,
SizedBox(
width: 20,
),
),
],
Text(
TranslationBase.of(context).shippingAddresses,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PharmacyTermsConditions()));
},
child: Row(
children: <Widget>[
Image.asset('assets/images/pharmacy/terms.png',
width: 25,
height: 25,
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PharmacyTermsConditions()));
},
child: Row(
children: <Widget>[
Image.asset('assets/images/pharmacy/terms.png',
width: 25,
height: 25,
),
SizedBox(
width: 10,
),
Text(
TranslationBase.of(context).conditionsHMG,
style: TextStyle(
fontSize: 13.0,
SizedBox(
width: 10,
),
),
],
Text(
TranslationBase.of(context).conditionsHMG,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LakumTermsConditions(this.identificationNo, this.firstName, this.lastName,
this.mobileNo, this.languageId)));
},
child: Row(
children: <Widget>[
Image.asset('assets/images/pharmacy/terms.png',
width: 25,
height: 25,
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LakumTermsConditions(this.identificationNo, this.firstName, this.lastName,
this.mobileNo, this.languageId)));
},
child: Row(
children: <Widget>[
Image.asset('assets/images/pharmacy/terms.png',
width: 25,
height: 25,
),
// IconButton(icon: Icon(Icons.error_outline), iconSize: 30,
// color: Colors.black,),
SizedBox(
width: 10,
),
Text(
TranslationBase.of(context).conditions,
style: TextStyle(
fontSize: 13.0,
SizedBox(
width: 10,
),
),
],
Text(
TranslationBase.of(context).conditions,
style: TextStyle(
fontSize: 13.0,
),
),
],
),
),
),
],
],
),
),
),
SizedBox(
height: 10,
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 5,
indent: 0,
endIndent: 0,
),
SizedBox(
height: 10,
),
Container(
padding: EdgeInsets.only(left: 10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
TranslationBase.of(context).reachUs,
style: TextStyle(
fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LiveChatPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/contact_us_icon.svg',
width: 20,
height: 20,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).contactUs,
style: TextStyle(fontSize: 13.0),
),
],
SizedBox(
height: 10,
),
Divider(
color: Colors.grey[350],
height: 20,
thickness: 5,
indent: 0,
endIndent: 0,
),
SizedBox(
height: 10,
),
Container(
padding: EdgeInsets.only(left: 10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
TranslationBase.of(context).reachUs,
style: TextStyle(
fontSize: 16.0, fontWeight: FontWeight.bold),
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => FindUsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/our_locations_icon.svg',
width: 30,
height: 30,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).ourLocations,
style: TextStyle(fontSize: 13.0),
),
],
SizedBox(
height: 5,
),
)
],
),
)
],
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LiveChatPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/contact_us_icon.svg',
width: 20,
height: 20,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).contactUs,
style: TextStyle(fontSize: 13.0),
),
],
),
),
SizedBox(
height: 5,
),
Divider(
color: Colors.grey,
height: 20,
),
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => FindUsPage()));
},
child: Row(
children: <Widget>[
SvgPicture.asset(
'assets/images/pharmacy/our_locations_icon.svg',
width: 30,
height: 30,
),
SizedBox(
width: 20,
),
Text(
TranslationBase.of(context).ourLocations,
style: TextStyle(fontSize: 13.0),
),
],
),
)
],
),
)
],
),
),
),
),
) : Container(),
));
}}

20
lib/widgets/data_display/medical/LabResult/LineChartCurved.dart
Unescape Escape View File

@ -168,20 +168,28 @@ class LineChartCurvedState extends State<LineChartCurved> {
double getMaxY() {
double max = 0;
widget.labResult.forEach((element) {
try{
double resultValueDouble = double.parse(element.resultValue);
if (resultValueDouble > max) max = resultValueDouble;
if (resultValueDouble > max) max = resultValueDouble;}
catch(e){
print(e);
}
});
return max.roundToDouble();
}
double getMinY() {
double min = double.parse(widget.labResult[0].resultValue);
double min = 0;
try{
min = double.parse(widget.labResult[0].resultValue);
widget.labResult.forEach((element) {
double resultValueDouble = double.parse(element.resultValue);
if (resultValueDouble < min) min = resultValueDouble;
});
});}catch(e){
print(e);
}
int value = min.toInt();
return value.toDouble();
@ -190,8 +198,14 @@ class LineChartCurvedState extends State<LineChartCurved> {
List<LineChartBarData> getData() {
List<FlSpot> spots = List();
for (int index = 0; index < widget.labResult.length; index++) {
try{
var resultValueDouble = double.parse(widget.labResult[index].resultValue);
spots.add(FlSpot(index.toDouble(), resultValueDouble));
}catch(e){
print(e);
spots.add(FlSpot(index.toDouble(), 0.0));
}
}
final LineChartBarData lineChartBarData1 = LineChartBarData(

20
lib/widgets/drawer/app_drawer_widget.dart
Unescape Escape View File

@ -77,7 +77,7 @@ class _AppDrawerState extends State<AppDrawer> {
children: <Widget>[
Container(
child:
Image.asset('assets/images/DQ/DQ_logo.png'),
Image.asset('assets/images/DQ/logo_big.png'),
margin: EdgeInsets.all(
SizeConfig.imageSizeMultiplier * 4),
),
@ -95,7 +95,7 @@ class _AppDrawerState extends State<AppDrawer> {
EdgeInsets.only(right: 0),
child: Icon(
Icons.account_circle,
color: Color(0xFF40ACC9),
color: Color(0xFFc5272c),
size: 28,
)),
Padding(
@ -105,7 +105,7 @@ class _AppDrawerState extends State<AppDrawer> {
user.firstName +
' ' +
user.lastName,
color: Color(0xFF40ACC9),
color: Color(0xFFc5272c),
))
],
),
@ -124,7 +124,7 @@ class _AppDrawerState extends State<AppDrawer> {
": " +
user.patientID
.toString(),
color: Color(0xFF40ACC9),
color: Color(0xFFc5272c),
fontSize: SizeConfig
.textMultiplier *
1.5,
@ -161,8 +161,8 @@ class _AppDrawerState extends State<AppDrawer> {
child: DrawerItem(
TranslationBase.of(context).family,
Icons.group,
textColor: Color(0xFF40ACC9),
iconColor: Color(0xFF40ACC9),
textColor: Color(0xFFc5272c),
iconColor: Color(0xFFc5272c),
bottomLine: false,
sideArrow: true,
),
@ -225,7 +225,7 @@ class _AppDrawerState extends State<AppDrawer> {
Icons
.account_circle,
color: Color(
0xFF40ACC9),
0xFFc5272c),
size:
24,
),
@ -273,15 +273,15 @@ class _AppDrawerState extends State<AppDrawer> {
CrossAxisAlignment.start,
children: <Widget>[
Expanded(
child: Icon(Icons.account_circle, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
child: Icon(Icons.account_circle, color: result.responseID == user.patientID ? Color(0xFFc5272c) : Colors.black),
),
Expanded(
flex: 7,
child: Padding(
padding: EdgeInsets.only(left: 5, right: 5),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
AppText(result.patientName, 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),
AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFFc5272c) : Colors.black),
AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(), color: result.responseID == user.patientID ? Color(0xFFc5272c) : Colors.black),
]))),
],
))))

42
lib/widgets/others/app_scaffold_widget.dart
Unescape Escape View File

@ -46,7 +46,6 @@ class AppScaffold extends StatelessWidget {
final Color backgroundColor;
final double preferredSize;
final List<Widget> appBarIcons;
final PreferredSizeWidget appBarWidget;
final List<ImagesInfo> imagesInfo;
AuthenticatedUserObject authenticatedUserObject =
@ -69,25 +68,18 @@ class AppScaffold extends StatelessWidget {
this.backgroundColor,
this.preferredSize = 0.0,
this.appBarIcons,
this.appBarWidget,
this.image,
this.infoList, this.imagesInfo});
@override
Widget build(BuildContext context) {
AppGlobal.context = context;
ProjectViewModel projectViewModel = Provider.of<ProjectViewModel>(context);
AppGlobal.context = context;
PreferredSizeWidget appBar;
return Scaffold(
backgroundColor:
backgroundColor ?? Theme.of(context).scaffoldBackgroundColor,
appBar: isShowAppBar? AppBarWidget(
appBarTitle,
appBarIcons,
isShowAppBar,
appBarTitle:appBarTitle,
appBarIcons:appBarIcons,
isPharmacy: isPharmacy,
isShowDecPage: isShowDecPage,
image: image,
@ -95,22 +87,17 @@ class AppScaffold extends StatelessWidget {
body: (!Provider.of<ProjectViewModel>(context, listen: false).isLogin &&
isShowDecPage)
? NotAutPage(
title: appBarTitle,
title: title ?? appBarTitle,
description: description,
infoList: infoList,
imagesInfo: imagesInfo,
)
: baseViewModel != null
? NetworkBaseView(
child: buildBodyWidget(),
child: body,
baseViewModel: baseViewModel,
)
: buildBodyWidget(),
bottomSheet: bottomSheet,
//floatingActionButton: floatingActionButton ?? floatingActionButton,
// bottomNavigationBar:
// this.isBottomBar == true ? BottomBarSearch() : SizedBox()
// floatingActionButton: FloatingSearchButton(),
: body,
);
}
@ -118,12 +105,6 @@ class AppScaffold extends StatelessWidget {
return isLoading ? AppLoaderWidget() : Container();
}
buildBodyWidget() {
// return body; //Stack(children: <Widget>[body, buildAppLoaderWidget(isLoading)]);
return Stack(children: <Widget>[
body, /*FloatingSearchButton()*/
]);
}
}
class AppBarWidget extends StatelessWidget with PreferredSizeWidget {
@ -132,13 +113,12 @@ class AppBarWidget extends StatelessWidget with PreferredSizeWidget {
final String appBarTitle;
final List<Widget> appBarIcons;
final bool isShowAppBar;
final bool isPharmacy;
final bool isShowDecPage;
final String image;
AppBarWidget(this.appBarTitle, this.appBarIcons, this.isShowAppBar,
{this.isPharmacy = true, this.isShowDecPage = true, this.image});
AppBarWidget({this.appBarTitle, this.appBarIcons,
this.isPharmacy = true, this.isShowDecPage = true, this.image});
@override
Widget build(BuildContext context) {
@ -147,8 +127,7 @@ class AppBarWidget extends StatelessWidget with PreferredSizeWidget {
Widget buildAppBar(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return isShowAppBar
? AppBar(
return AppBar(
elevation: 0,
backgroundColor:
isPharmacy ? Colors.green : Theme.of(context).appBarTheme.color,
@ -194,10 +173,7 @@ class AppBarWidget extends StatelessWidget with PreferredSizeWidget {
),
if (appBarIcons != null) ...appBarIcons
],
)
: Container(
height: 0,
width: 0,
);
}

Write Preview
Loading…
Cancel
Save