Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

design fixes 3

Browse Source
merge-requests/448/merge
Mirza.Shafique 3 years ago
parent a273bacc17
commit 3d480bac5c
8 changed files with 142 additions and 87 deletions
Show Stats Download Patch File Download Diff File

8
lib/config/config.dart
Unescape Escape View File

@ -16,12 +16,12 @@ const PACKAGES_ORDERS = '/api/orders';
const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// // Pharmacy Production URLs
// const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
// const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity';

15
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_dialog.dart
Unescape Escape View File

@ -13,7 +13,10 @@ Future<void> showCMCConfirmDialog(BuildContext context, String requestId, {Funct
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ConfirmDialog(requestId,onClick: onClick,),
ConfirmDialog(
requestId,
onClick: onClick,
),
],
),
);
@ -36,7 +39,16 @@ class ConfirmDialog extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: 40,
height: 40,
margin: EdgeInsets.only(top: 20),
decoration: containerRadius(CustomColors.green, 200,),
child: Icon(Icons.done,color: Colors.white,),
),
mFlex(1),
IconButton(
icon: Icon(
@ -49,6 +61,7 @@ class ConfirmDialog extends StatelessWidget {
),
],
),
mHeight(12),
Text(
TranslationBase.of(context).RRTRequestSuccess,
textAlign: TextAlign.start,

95
lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
Unescape Escape View File

@ -44,57 +44,58 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
baseViewModel: widget.model,
body: Column(
children: [
ListView.separated(
physics: BouncingScrollPhysics(),
shrinkWrap: true,
padding: EdgeInsets.only(left: 21, right: 21, top: 12, bottom: 12),
itemBuilder: (context, index) {
HHCGetAllServicesResponseModel service = widget.model.hhcAllServicesList[index];
Expanded(
child: ListView.separated(
physics: BouncingScrollPhysics(),
shrinkWrap: true,
padding: EdgeInsets.only(left: 21, right: 21, top: 12, bottom: 12),
itemBuilder: (context, index) {
HHCGetAllServicesResponseModel service = widget.model.hhcAllServicesList[index];
return Padding(
padding: const EdgeInsets.only(top: 4, bottom: 4),
child: Row(
children: [
Checkbox(
value: isServiceSelected(num.tryParse(service.serviceID)),
activeColor: Color(0xffD02127),
tristate: false,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (bool newValue) {
setState(() {
if (!isServiceSelected(num.tryParse(service.serviceID)))
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.add(PatientERHHCInsertServicesList(
recordID: widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length,
serviceID: num.tryParse(service.serviceID),
serviceName: projectViewModel.isArabic ? service.textN : service.text));
else
removeSelected(num.tryParse(service.serviceID));
// widget.patientERInsertPresOrderRequestModel
// isPatientInsured = newValue;
});
}),
SizedBox(width: 6),
Expanded(
child: Text(
projectViewModel.isArabic ? service.textN : service.text.toLowerCase()?.capitalize(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64),
return Padding(
padding: const EdgeInsets.only(top: 4, bottom: 4),
child: Row(
children: [
Checkbox(
value: isServiceSelected(num.tryParse(service.serviceID)),
activeColor: Color(0xffD02127),
tristate: false,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (bool newValue) {
setState(() {
if (!isServiceSelected(num.tryParse(service.serviceID)))
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.add(PatientERHHCInsertServicesList(
recordID: widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length,
serviceID: num.tryParse(service.serviceID),
serviceName: projectViewModel.isArabic ? service.textN : service.text));
else
removeSelected(num.tryParse(service.serviceID));
// widget.patientERInsertPresOrderRequestModel
// isPatientInsured = newValue;
});
}),
SizedBox(width: 6),
Expanded(
child: Text(
projectViewModel.isArabic ? service.textN : service.text.toLowerCase()?.capitalize(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64),
),
),
),
],
),
);
},
separatorBuilder: (context, index) => Divider(
height: 1,
color: Color(0xffE5E5E5),
),
itemCount: widget.model.hhcAllServicesList.length),
],
),
);
},
separatorBuilder: (context, index) => Divider(
height: 1,
color: Color(0xffE5E5E5),
),
itemCount: widget.model.hhcAllServicesList.length),
),
Container(
color: Colors.white,
padding: EdgeInsets.only(top: 0, bottom: 16, right: 21, left: 21),
margin: EdgeInsets.only(top: 50.0),
padding: EdgeInsets.all(16),
child: DefaultButton(
TranslationBase.of(context).next,
(this.widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0 || widget.model.state == ViewState.BusyLocal)

94
lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart
Unescape Escape View File

@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -85,45 +86,60 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
)),
Container(
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(12)),
padding: EdgeInsets.all(8),
padding: EdgeInsets.all(12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(TranslationBase.of(context).selectedLocation, fontWeight: FontWeight.bold),
Text(
TranslationBase.of(context).selectedLocation,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: CustomColors.textColor,
letterSpacing: -0.56,
),
),
SizedBox(
height: 12,
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
height: 200,
// child: GoogleMap(
// mapType: MapType.normal,
// markers: markers,
// initialCameraPosition: _kGooglePlex,
// onMapCreated: (GoogleMapController controller) {
// _controller.complete(controller);
// },
// ),
child: Image.network(
"https://maps.googleapis.com/maps/api/staticmap?center=" +
widget.patientERInsertPresOrderRequestModel.latitude.toString() +
"," +
widget.patientERInsertPresOrderRequestModel.longitude.toString() +
"&zoom=16&size=600x300&maptype=roadmap&markers=color:red%7C" +
widget.patientERInsertPresOrderRequestModel.latitude.toString() +
"," +
widget.patientERInsertPresOrderRequestModel.longitude.toString() +
"&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8",
width: double.infinity,
height: double.infinity,
fit: BoxFit.cover,
)),
),
Container(
height: 200,
// child: GoogleMap(
// mapType: MapType.normal,
// markers: markers,
// initialCameraPosition: _kGooglePlex,
// onMapCreated: (GoogleMapController controller) {
// _controller.complete(controller);
// },
// ),
decoration: containerColorRadiusBorderWidth(Colors.transparent, 12,Colors.transparent,0.5),
clipBehavior: Clip.antiAlias,
child: Image.network(
"https://maps.googleapis.com/maps/api/staticmap?center=" +
widget.patientERInsertPresOrderRequestModel.latitude.toString() +
"," +
widget.patientERInsertPresOrderRequestModel.longitude.toString() +
"&zoom=16&size=600x300&maptype=roadmap&markers=color:red%7C" +
widget.patientERInsertPresOrderRequestModel.latitude.toString() +
"," +
widget.patientERInsertPresOrderRequestModel.longitude.toString() +
"&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8",
width: double.infinity,
height: double.infinity,
fit: BoxFit.cover,
)),
SizedBox(
height: 12,
),
Texts(TranslationBase.of(context).selectedService),
Text(
TranslationBase.of(context).selectedService,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: CustomColors.textColor,
letterSpacing: -0.56,
),
),
...List.generate(
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length,
(index) => Container(
@ -139,13 +155,23 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
),
Row(
children: [
Texts(
Text(
(index + 1).toString() + '. ',
fontSize: 15,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: CustomColors.black,
letterSpacing: -0.48,
),
),
Texts(
Text(
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList[index].serviceName,
fontSize: 15,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: CustomColors.black,
letterSpacing: -0.48,
),
),
],
)

2
lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
Unescape Escape View File

@ -149,6 +149,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
Expanded(
child: Text(
!projectViewModel.isArabic ? order.nearestProjectDescription.trim().toString() : order.nearestProjectDescriptionN.toString(),
textAlign: TextAlign.start,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56),
),
),
@ -173,6 +174,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
margin: EdgeInsets.only(left: 8,right: 8),
decoration: BoxDecoration(
color: Color(0xffD02127),
border: Border.all(color: Colors.white, width: 1),

2
lib/pages/landing/fragments/home_page_fragment2.dart
Unescape Escape View File

@ -15,6 +15,7 @@ import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart';
import 'package:diplomaticquarterapp/pages/packages_offers/OfferAndPackagesPage.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@ -282,6 +283,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
child: InkWell(
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage()));
},
child: Container(
width: double.infinity,

1
lib/theme/colors.dart
Unescape Escape View File

@ -5,6 +5,7 @@ class CustomColors {
static const Color purple = Color(0xFF6002EE);
static const Color deepPurple = Color(0xFF3900B1);
static const Color grey = Color(0xFF848484);
static const Color textColor = Color(0xFF575757);
static const Color grey2 = Color(0xFFA5A5A5);
static const Color darkGrey = Color(0xFF222222);
static const Color black = Color(0xFF141414);

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

@ -252,7 +252,17 @@ class NewAppBarWidget extends StatelessWidget with PreferredSizeWidget {
],
),
actions: <Widget>[
if (appBarIcons != null) ...appBarIcons,
if (appBarIcons != null) ...appBarIcons else
IconButton(
onPressed: () {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
},
icon: Icon(Icons.home),
),
],
);
}

Write Preview
Loading…
Cancel
Save