Merge branch 'develop' into 'master'

Develop

See merge request Cloud_Solution/doctor_app_flutter!88
merge-requests/89/merge
ibrahim albitar 6 years ago
commit 936c2c1b54

@ -4,7 +4,7 @@ const ONLY_LETTERS = "[a-zA-Z]";
const ONLY_DATE = "[0-9/]"; const ONLY_DATE = "[0-9/]";
//const BASE_URL = 'https://hmgwebservices.com/Services/'; //const BASE_URL = 'https://hmgwebservices.com/Services/';
const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; const BASE_URL = 'https://uat.hmgwebservices.com/Services/';
const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems"; const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems_Region";
const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient"; const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient";
const PATIENT_INSURANCE_APPROVALS_URL = "DoctorApplication.svc/REST/GetApprovalStatusForInpatient"; const PATIENT_INSURANCE_APPROVALS_URL = "DoctorApplication.svc/REST/GetApprovalStatusForInpatient";

@ -29,7 +29,7 @@ class PharmaciesListRequestModel {
this.stamp = '2020-04-23T21:01:21.492Z', this.stamp = '2020-04-23T21:01:21.492Z',
this.ipAdress = '11.11.11.11', this.ipAdress = '11.11.11.11',
this.versionID = 1.2, this.versionID = 1.2,
this.tokenID = '@dm!n', this.tokenID ,
this.sessionID = 'e29zoooEJ4', this.sessionID = 'e29zoooEJ4',
this.isLoginForDoctorApp = true, this.isLoginForDoctorApp = true,
this.channel = 9, this.channel = 9,

@ -22,10 +22,10 @@ class PharmaciesItemsRequestModel {
this.patientTypeID = 1, this.patientTypeID = 1,
this.languageID = 2, this.languageID = 2,
this.stamp = '2020-04-23T21:01:21.492Z', this.stamp = '2020-04-23T21:01:21.492Z',
this.ipAdress = '11.11.11.11', this.ipAdress = '10.20.10.20',
this.versionID = 1.2, this.versionID = 5.2,
this.tokenID = '@dm!n', this.tokenID ,
this.sessionID = 'e29zoooEJ4', this.sessionID = "KvFJENeAUCxyVdIfEkHw",
this.isLoginForDoctorApp = true, this.isLoginForDoctorApp = true,
this.patientOutSA = false}); this.patientOutSA = false});

@ -2,15 +2,19 @@ import 'dart:convert';
import 'package:doctor_app_flutter/client/app_client.dart'; import 'package:doctor_app_flutter/client/app_client.dart';
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/models/pharmacies_List_request_model.dart'; import 'package:doctor_app_flutter/models/pharmacies_List_request_model.dart';
import 'package:doctor_app_flutter/models/pharmacies_items_request_model.dart'; import 'package:doctor_app_flutter/models/pharmacies_items_request_model.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/util/helpers.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
class MedicineProvider with ChangeNotifier { class MedicineProvider with ChangeNotifier {
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
var pharmacyItemsList = []; var pharmacyItemsList = [];
var pharmaciesList = []; var pharmaciesList = [];
bool isFinished = false; bool isFinished = true;
bool hasError = false; bool hasError = false;
String errorMsg = ''; String errorMsg = '';
@ -18,12 +22,15 @@ class MedicineProvider with ChangeNotifier {
PharmaciesListRequestModel _listRequestModel = PharmaciesListRequestModel(); PharmaciesListRequestModel _listRequestModel = PharmaciesListRequestModel();
Future<String> getMedicineItem(String itemName) async { Future<String> getMedicineItem(String itemName) async {
resetDefaultValues();
try { try {
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
_itemsRequestModel.phrItemName = itemName; _itemsRequestModel.phrItemName = itemName;
final response = await AppClient.post(PHARMACY_ITEMS_URL, final response = await AppClient.post(PHARMACY_ITEMS_URL,
body: json.encode(_itemsRequestModel.toJson())); body: json.encode(_itemsRequestModel.toJson()));
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
isFinished = true;
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
isFinished = true; isFinished = true;
hasError = true; hasError = true;
@ -31,7 +38,7 @@ class MedicineProvider with ChangeNotifier {
} else { } else {
var parsed = json.decode(response.body.toString()); var parsed = json.decode(response.body.toString());
if (parsed['MessageStatus'] == 1) { if (parsed['MessageStatus'] == 1) {
pharmacyItemsList = parsed['ListPharmcy']; pharmacyItemsList = parsed['ListPharmcy_Region'];
hasError = false; hasError = false;
isFinished = true; isFinished = true;
errorMsg = "Done"; errorMsg = "Done";
@ -54,12 +61,16 @@ class MedicineProvider with ChangeNotifier {
} }
Future<String> getPharmaciesList(int itemId) async { Future<String> getPharmaciesList(int itemId) async {
String token = await sharedPref.getString(TOKEN);
resetDefaultValues();
try { try {
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
_listRequestModel.itemID = itemId; _listRequestModel.itemID = itemId;
_listRequestModel.tokenID = token;
final response = await AppClient.post(PHARMACY_LIST_URL, final response = await AppClient.post(PHARMACY_LIST_URL,
body: json.encode(_listRequestModel.toJson())); body: json.encode(_listRequestModel.toJson()));
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
isFinished = true;
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
isFinished = true; isFinished = true;
hasError = true; hasError = true;
@ -88,4 +99,11 @@ class MedicineProvider with ChangeNotifier {
return errorMsg; return errorMsg;
} }
resetDefaultValues() {
isFinished = false;
hasError = false;
errorMsg = '';
notifyListeners();
}
} }

@ -34,7 +34,15 @@ class PatientsProvider with ChangeNotifier {
List<LabOrdersResModel> patientLabResultOrdersList = []; List<LabOrdersResModel> patientLabResultOrdersList = [];
List<PrescriptionResModel> patientPrescriptionsList = []; List<PrescriptionResModel> patientPrescriptionsList = [];
List<RadiologyResModel> patientRadiologyList = []; List<RadiologyResModel> patientRadiologyList = [];
<<<<<<< HEAD
/*@author: ibrahe albitar
*@Date:2/6/2020
*@desc: getPatientPrescriptions
*/
=======
List<LabResult> labResultList = []; List<LabResult> labResultList = [];
>>>>>>> 4afca06aec89273155b264baea03db8fc2a9051d
var patientProgressNoteList = []; var patientProgressNoteList = [];
var insuranceApporvalsList = []; var insuranceApporvalsList = [];
@ -304,7 +312,15 @@ class PatientsProvider with ChangeNotifier {
} }
} }
<<<<<<< HEAD
/*@author: ibrahe albitar
*@Date:2/6/2020
*@desc: getPatientPrescriptions
*/
getPatientProgressNote(patient) async{
=======
getPatientProgressNote(patient) async { getPatientProgressNote(patient) async {
>>>>>>> 4afca06aec89273155b264baea03db8fc2a9051d
setBasicData(); setBasicData();
try { try {
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
@ -336,6 +352,13 @@ class PatientsProvider with ChangeNotifier {
handelCatchErrorCase(err); handelCatchErrorCase(err);
} }
} }
<<<<<<< HEAD
/*@author: ibrahe albitar
*@Date:2/6/2020
*@desc: getPatientPrescriptions
*/
getPatientInsuranceApprovals(patient) async{
=======
getLabResult(LabOrdersResModel labOrdersResModel) async { getLabResult(LabOrdersResModel labOrdersResModel) async {
labResultList.clear(); labResultList.clear();
@ -361,6 +384,7 @@ class PatientsProvider with ChangeNotifier {
notifyListeners(); notifyListeners();
} }
>>>>>>> 4afca06aec89273155b264baea03db8fc2a9051d
getPatientInsuranceApprovals(patient) async { getPatientInsuranceApprovals(patient) async {
setBasicData(); setBasicData();

@ -9,6 +9,8 @@ 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_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.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:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -31,45 +33,51 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
MedicineProvider _medicineProvider; MedicineProvider _medicineProvider;
bool _isInit = true;
@override
void didChangeDependencies() {
super.didChangeDependencies();
if (_isInit) {
_medicineProvider = Provider.of<MedicineProvider>(context);
}
_isInit = false;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_medicineProvider = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: "Search Medicine", appBarTitle: "Search Medicine",
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
RoundedContainer(
child: Column(
children: <Widget>[
Icon(
Icons.search,
size: SizeConfig.imageSizeMultiplier * 15,
),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: SizeConfig.heightMultiplier * 5, bottom: SizeConfig.heightMultiplier * 1,
right: SizeConfig.heightMultiplier * 3, right: SizeConfig.heightMultiplier * 2,
left: SizeConfig.heightMultiplier * 3, left: SizeConfig.heightMultiplier * 2,
top: SizeConfig.heightMultiplier * 3), top: SizeConfig.heightMultiplier * 3),
child: AppTextFormField( child: AppTextFormField(
hintText: 'Type Medicine Name Here..', hintText: 'Search Medicine Name Here..',
controller: myController, controller: myController,
onSaved: (value) {}, onSaved: (value) {},
// validator: (value) { // validator: (value) {
// return TextValidator().validateName(value); // return TextValidator().validateName(value);
// }, // },
inputFormatter: ONLY_LETTERS), inputFormatter: ONLY_LETTERS),
) ),
],
)),
Container( Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), margin: EdgeInsets.only(bottom: 5,
left: 10,
right: 10,
top: 0),
child: Wrap( child: Wrap(
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: "Search", title: "Search",
color: Color(0xff58434F), color: Color(PRIMARY_COLOR),
onPressed: () { onPressed: () {
searchMedicine(context); searchMedicine(context);
}, },
@ -77,17 +85,40 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
], ],
), ),
), ),
Container(
margin: EdgeInsets.only(left: SizeConfig.heightMultiplier * 2),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
"You find " + (data == null ? "0": data.length.toString())+" items in search",
fontWeight: FontWeight.bold,
margin: 5,),
],
),
),
Expanded( Expanded(
child: Container( child: Container(
width: SizeConfig.screenWidth * 0.80, width: SizeConfig.screenWidth * 0.80,
child: ListView.builder( child: !_medicineProvider.isFinished
? DrAppCircularProgressIndeicator()
: _medicineProvider.hasError
? Center(
child: Text(
_medicineProvider.errorMsg,
style: TextStyle(
color: Theme.of(context).errorColor),
),
):ListView.builder(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: data == null ? 0 : data.length, itemCount: data == null ? 0 : data.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
child: MedicineItemWidget( child: MedicineItemWidget(
label: data[index]["ItemDescription"], label: data[index]["ItemDescription"],
url: data[index]["ProductImageBase64"],
), ),
onTap: () { onTap: () {
Navigator.push( Navigator.push(

@ -15,7 +15,6 @@ import 'package:provider/provider.dart';
import 'package:maps_launcher/maps_launcher.dart'; import 'package:maps_launcher/maps_launcher.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
class PharmaciesListScreen extends StatefulWidget { class PharmaciesListScreen extends StatefulWidget {
@ -32,118 +31,139 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
var _data; var _data;
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
MedicineProvider _medicineProvider; MedicineProvider _medicineProvider;
bool _isInit = true;
//bool _isOutOfStuck = false; //bool _isOutOfStuck = false;
@override
void didChangeDependencies() {
super.didChangeDependencies();
if (_isInit) {
_medicineProvider = Provider.of<MedicineProvider>(context);
pharmaciesList();
}
_isInit = false;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_medicineProvider = Provider.of(context);
pharmaciesList();
return AppScaffold( return AppScaffold(
appBarTitle: "Pharmacies List", appBarTitle: "Pharmacies List",
body: Column( body: Column(children: <Widget>[
children: <Widget>[ RoundedContainer(
RoundedContainer( child: !_medicineProvider.isFinished
child: !_medicineProvider.isFinished ? DrAppCircularProgressIndeicator()
? DrAppCircularProgressIndeicator() : _medicineProvider.hasError
: _medicineProvider.hasError ? Center(
? Center( child: Text(
child: Text( _medicineProvider.errorMsg,
_medicineProvider.errorMsg, style:
style: TextStyle( TextStyle(color: Theme.of(context).errorColor),
color: Theme.of(context).errorColor), ),
)
: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
AppText(
"Description",
margin: 10,
fontWeight: FontWeight.bold,
), ),
) AppText(
: Column( _data[0]["ItemDescription"],
mainAxisAlignment: MainAxisAlignment.start, marginLeft: 10,
crossAxisAlignment: CrossAxisAlignment.stretch, marginTop: 0,
children: <Widget>[ marginRight: 10,
AppText( marginBottom: 10,
"Description", ),
margin: 10, AppText(
fontWeight: FontWeight.bold, "Price",
), margin: 10,
AppText( fontWeight: FontWeight.bold,
_data[0]["ItemDescription"], ),
marginLeft: 10, AppText(
marginTop: 0, _data[0]["SellingPrice"].toString(),
marginRight: 10, marginLeft: 10,
marginBottom: 10, marginTop: 0,
), marginRight: 10,
AppText( marginBottom: 10,
"Price", ),
margin: 10, ],
fontWeight: FontWeight.bold, )),
), Container(
AppText( margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
_data[0]["SellingPrice"].toString(), child: Align(
marginLeft: 10, alignment: Alignment.centerLeft,
marginTop: 0, child: AppText(
marginRight: 10, "You can Find it in",
marginBottom: 10, fontWeight: FontWeight.bold,
), fontSize: SizeConfig.textMultiplier * 3,
], ))),
)), Expanded(
Container( child: Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), width: SizeConfig.screenWidth * 0.99,
child: Align( child: ListView.builder(
alignment: Alignment.centerLeft,
child: AppText(
"You can Find it in",
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 3,
))),
Expanded(
child: Container(
width: SizeConfig.screenWidth * 0.80,
child: ListView.builder(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: _data == null ? 0 : _data.length, itemCount: _data == null ? 0 : _data.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Column( return RoundedContainer(
children: <Widget>[ child: Row(
MedicineItemWidget( children: <Widget>[
label: _data[index]["LocationDescription"], Expanded(
), flex: 1,
Container( child: ClipRRect(
margin: EdgeInsets.only(bottom: 10), borderRadius:BorderRadius.all(Radius.circular(7)),
child: Row( child: Image.network(
children: <Widget>[ _data[index]["ProjectImageURL"],
Expanded(flex: 2, child: SizedBox()), height: SizeConfig.imageSizeMultiplier * 15,
Expanded( width: SizeConfig.imageSizeMultiplier * 15,
flex: 6, fit: BoxFit.cover,
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, Expanded(
child: AppButton( flex: 4,
title: "Direction", child: AppText(
fontSize: 2, _data[index]["LocationDescription"],
color: Color(PRIMARY_COLOR), margin: 10,
padding: 0, ),
onPressed: () { ),
MapsLauncher.launchCoordinates(double.parse(_data[index]["Latitude"]), double.parse( _data[index]["Longitude"]), _data[index]["LocationDescription"] ); Expanded(
}), flex: 2,
child: Wrap(
direction: Axis.horizontal,
alignment: WrapAlignment.end,
crossAxisAlignment: WrapCrossAlignment.end,
children: <Widget>[
Padding(
padding: EdgeInsets.all(5),
child: InkWell(child: Icon(Icons.call, color: Colors.red,),onTap: ()=>launch(
"tel://" + _data[index]["PhoneNumber"]),),
), ),
Expanded(flex: 2, child: SizedBox()), Padding(
], padding: EdgeInsets.all(5),
child: InkWell(child: Icon(Icons.pin_drop, color: Colors.red,),onTap: () {
MapsLauncher.launchCoordinates(
double.parse(_data[index]["Latitude"]),
double.parse(_data[index]["Longitude"]),
_data[index]["LocationDescription"]);
},),
),
],
),
), ),
)
],
],
),
); );
}, }),
),
),
), ),
], )
)); ]));
} }
Future<bool> pharmaciesList() async { Future<bool> pharmaciesList() async {

@ -1,5 +1,9 @@
import 'dart:convert';
import 'dart:typed_data';
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/profile_image_widget.dart';
import '../shared/rounded_container_widget.dart'; import '../shared/rounded_container_widget.dart';
import '../shared/app_texts_widget.dart'; import '../shared/app_texts_widget.dart';
@ -19,8 +23,9 @@ final String label;
final Color backgroundColor; final Color backgroundColor;
final bool showBorder; final bool showBorder;
final Color borderColor; final Color borderColor;
final String url;
MedicineItemWidget({ @required this.label, this.backgroundColor = Colors.white, this.showBorder = false, this.borderColor = Colors.white}); MedicineItemWidget({ @required this.label, this.backgroundColor = Colors.white, this.showBorder = false, this.borderColor = Colors.white, this.url});
@override @override
_MedicineItemWidgetState createState() => _MedicineItemWidgetState(); _MedicineItemWidgetState createState() => _MedicineItemWidgetState();
} }
@ -30,23 +35,41 @@ class _MedicineItemWidgetState extends State<MedicineItemWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new RoundedContainer( return new RoundedContainer(
height: SizeConfig.heightMultiplier * 8, height: SizeConfig.heightMultiplier * 8,
child:Row( child:Padding(
crossAxisAlignment: CrossAxisAlignment.stretch, padding: const EdgeInsets.all(5.0),
mainAxisAlignment: MainAxisAlignment.start, child: Row(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.stretch,
RoundedContainer( mainAxisAlignment: MainAxisAlignment.start,
width: SizeConfig.widthMultiplier * 2, children: <Widget>[
backgroundColor: Color(PRIMARY_COLOR), if(widget.url != null) Container(
margin: 0, height: 39,
topLeft: 6, width: 39,
topRight: 0, child: ClipRRect(
bottomLeft: 6, borderRadius:BorderRadius.all(Radius.circular(7)),
bottomRight: 0, child: Image.memory(
customCornerRaduis: true, dataFromBase64String(widget.url),
child: SizedBox(width: SizeConfig.widthMultiplier, height: SizeConfig.heightMultiplier*3,), height: SizeConfig.imageSizeMultiplier * 15,
width: SizeConfig.imageSizeMultiplier * 15,
fit: BoxFit.cover,
),
),
), ),
Expanded(child: Padding( padding: EdgeInsets.all(5), child: Align( alignment: Alignment.centerLeft, child: AppText(widget.label)))) Expanded(child: Padding( padding: EdgeInsets.all(5), child: Align( alignment: Alignment.centerLeft, child: AppText(widget.label))))
],), ],),
),
backgroundColor: widget.backgroundColor, showBorder: widget.showBorder, borderColor: widget.borderColor, margin: 4, raduis: 10,); backgroundColor: widget.backgroundColor, showBorder: widget.showBorder, borderColor: widget.borderColor, margin: 4, raduis: 10,);
} }
Image imageFromBase64String(String base64String) {
return Image.memory(base64Decode(base64String));
}
Uint8List dataFromBase64String(String base64String) {
return base64Decode(base64String);
}
String base64String(Uint8List data) {
return base64Encode(data);
}
} }

@ -29,21 +29,22 @@ class AppButton extends StatefulWidget {
splashColor: widget.color, splashColor: widget.color,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10, top: 15,
bottom: 10, bottom: 15,
right: SizeConfig.widthMultiplier * widget.padding, //right: SizeConfig.widthMultiplier * widget.padding,
left: SizeConfig.widthMultiplier * widget.padding //left: SizeConfig.widthMultiplier * widget.padding
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
/*Icon( if (widget.icon != null) Icon(
widget.icon, widget.icon,
color: Colors.white, color: Colors.white,
), ),
SizedBox( if (widget.icon != null) SizedBox(
width: 10.0, width: 5.0,
),*/ ),
AppText( AppText(
widget.title, widget.title,
color: Colors.white, color: Colors.white,
@ -54,7 +55,7 @@ class AppButton extends StatefulWidget {
), ),
), ),
onPressed: widget.onPressed, onPressed: widget.onPressed,
shape: const StadiumBorder(), shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
); );
} }
} }

@ -36,17 +36,16 @@ class AppTextFormField extends FormField<String> {
hintText: hintText, hintText: hintText,
hintStyle: TextStyle(fontSize: SizeConfig.textMultiplier * 2), hintStyle: TextStyle(fontSize: SizeConfig.textMultiplier * 2),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(30)), borderRadius: BorderRadius.all(Radius.circular(10)),
borderSide: BorderSide(color: Color(0xff707070)), borderSide: BorderSide(color: Color(0xff707070)),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(30)), borderRadius: BorderRadius.all(Radius.circular(10)),
) )
//BorderRadius.all(Radius.circular(20)); //BorderRadius.all(Radius.circular(20));
), ),
onTap: onTap, onTap: onTap,
controller: controller, controller: controller,
), ),
state.hasError? state.hasError?
Text( Text(

Loading…
Cancel
Save