From 3c03647392bbb5186d65448ea23df9b931459151 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 May 2020 09:19:40 +0300 Subject: [PATCH 1/2] out of stuk --- lib/screens/medicine/pharmacies_list_screen.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/screens/medicine/pharmacies_list_screen.dart b/lib/screens/medicine/pharmacies_list_screen.dart index c68da864..0b7afab7 100644 --- a/lib/screens/medicine/pharmacies_list_screen.dart +++ b/lib/screens/medicine/pharmacies_list_screen.dart @@ -27,6 +27,7 @@ class _PharmaciesListState extends State { var _data; Helpers helpers = new Helpers(); MedicineProvider _medicineProvider; + //bool _isOutOfStuck = false; @override Widget build(BuildContext context) { @@ -121,6 +122,7 @@ class _PharmaciesListState extends State { _medicineProvider.getPharmaciesList(widget.itemID).then((result) { this.setState(() { _data = _medicineProvider.pharmaciesList; + //if(_data == null || _data.length == 0) }); }); return true; From 80b6716091d2f924c11c217c608ae04e9ffb3ded Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 May 2020 01:20:08 +0300 Subject: [PATCH 2/2] call phramicies --- lib/config/config.dart | 6 ++- .../medicine/pharmacies_list_screen.dart | 54 ++++++++++++++----- .../medicine/medicine_item_widget.dart | 3 +- lib/widgets/shared/app_buttons_widget.dart | 10 ++-- pubspec.yaml | 3 ++ 5 files changed, 57 insertions(+), 19 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 3c3a1491..93dfa881 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -3,7 +3,7 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z]"; const ONLY_DATE = "[0-9/]"; -const BASE_URL = 'https://hmgwebservices.com/Services/'; +const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; //*********change value to decode json from Dropdown ************ @@ -11,3 +11,7 @@ const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; var SERVICES_PATIANT2 = ["List_MyOutPatient", "List_MyInPatient","List_MyDischargePatient" ,"List_MyReferredPatient","List_MyDischargeReferralPatient","List_MyTomorrowPatient","List_MyReferralPatient"]; var SERVICES_PATIANT_HEADER = ["OutPatient", "InPatient", "Discharge","Referred","Referral Discharge","Tomorrow","Referral"]; //****************** + + +// Colors ////// by : ibrahim +const PRIMARY_COLOR = 0xff58434F; \ No newline at end of file diff --git a/lib/screens/medicine/pharmacies_list_screen.dart b/lib/screens/medicine/pharmacies_list_screen.dart index 0b7afab7..c34d26e4 100644 --- a/lib/screens/medicine/pharmacies_list_screen.dart +++ b/lib/screens/medicine/pharmacies_list_screen.dart @@ -1,15 +1,20 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/models/pharmacies_List_request_model.dart'; import 'package:doctor_app_flutter/providers/medicine_provider.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:maps_launcher/maps_launcher.dart'; +import 'package:url_launcher/url_launcher.dart'; + DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); @@ -95,20 +100,43 @@ class _PharmaciesListState extends State { shrinkWrap: true, itemCount: _data == null ? 0 : _data.length, itemBuilder: (BuildContext context, int index) { - return InkWell( - child: MedicineItemWidget( - label: _data[index]["LocationDescription"], - ), - onTap: () { - //Navigator.of(context).pushNamed(PHARMACIES_LIST); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => PharmaciesListScreen( - itemID: _data[index]["ItemID"]), + return Column( + children: [ + MedicineItemWidget( + label: _data[index]["LocationDescription"], + ), + Container( + margin: EdgeInsets.only(bottom: 10), + child: Row( + children: [ + Expanded(flex: 2, child: SizedBox()), + Expanded( + flex: 6, + child: AppButton( + title: "Call", + fontSize: 2, + color: Colors.brown[200], + padding: 0, + onPressed: () => launch("tel://"+_data[index]["PhoneNumber"])), + ), + Expanded(flex: 1, child: SizedBox()), + Expanded( + flex: 6, + child: AppButton( + title: "Direction", + fontSize: 2, + color: Color(PRIMARY_COLOR), + padding: 0, + onPressed: () { + MapsLauncher.launchCoordinates(double.parse(_data[index]["Latitude"]), double.parse( _data[index]["Longitude"]), _data[index]["LocationDescription"] ); + }), + + ), + Expanded(flex: 2, child: SizedBox()), + ], ), - ); - }, + ) + ], ); }, ), diff --git a/lib/widgets/medicine/medicine_item_widget.dart b/lib/widgets/medicine/medicine_item_widget.dart index 56cf4638..e18477c4 100644 --- a/lib/widgets/medicine/medicine_item_widget.dart +++ b/lib/widgets/medicine/medicine_item_widget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import '../shared/rounded_container_widget.dart'; @@ -35,7 +36,7 @@ class _MedicineItemWidgetState extends State { children: [ RoundedContainer( width: SizeConfig.widthMultiplier * 2, - backgroundColor: Colors.red, + backgroundColor: Color(PRIMARY_COLOR), margin: 0, topLeft: 6, topRight: 0, diff --git a/lib/widgets/shared/app_buttons_widget.dart b/lib/widgets/shared/app_buttons_widget.dart index 49c0c92e..10bf6997 100644 --- a/lib/widgets/shared/app_buttons_widget.dart +++ b/lib/widgets/shared/app_buttons_widget.dart @@ -11,8 +11,10 @@ class AppButton extends StatefulWidget { final String title; final IconData icon; final Color color; + final double fontSize; + final double padding; - AppButton({@required this.onPressed, this.title, this.icon, this.color}); + AppButton({@required this.onPressed, this.title, this.icon, this.color, this.fontSize = 2.5, this.padding = 15}); _AppButtonState createState() => _AppButtonState(); @@ -29,8 +31,8 @@ class AppButton extends StatefulWidget { padding: EdgeInsets.only( top: 10, bottom: 10, - right: SizeConfig.widthMultiplier * 15, - left: SizeConfig.widthMultiplier* 15 + right: SizeConfig.widthMultiplier * widget.padding, + left: SizeConfig.widthMultiplier * widget.padding ), child: Row( mainAxisSize: MainAxisSize.min, @@ -45,7 +47,7 @@ class AppButton extends StatefulWidget { AppText( widget.title, color: Colors.white, - fontSize: SizeConfig.textMultiplier * 2.5, + fontSize: SizeConfig.textMultiplier * widget.fontSize , fontWeight: FontWeight.bold, ), ], diff --git a/pubspec.yaml b/pubspec.yaml index 20f3f50a..8a82ea4a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,6 +32,9 @@ dependencies: http_interceptor: ^0.2.0 progress_hud_v2: ^2.0.0 connectivity: ^0.4.8+2 + maps_launcher: ^1.2.0 + url_launcher: ^5.4.5 + # The following adds the Cupertino Icons font to your application.