fix bugs in patient search

pull/168/head
Elham Rababah 5 years ago
parent 4d31d5e0e4
commit 53862ec1b3

@ -232,4 +232,9 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'Add Details Of Patient To search', 'en': 'Add Details Of Patient To search',
'ar': ' أضف تفاصيل المريض للبحث' 'ar': ' أضف تفاصيل المريض للبحث'
}, },
"welcome": {'en': 'Welcome', 'ar': ' أهلا بك'},
'youDoNotHaveAnyItem': {
'en': 'You don\'t have any Items',
'ar': 'لا يوجد اي نتائج'
},
}; };

@ -100,7 +100,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
Row( Row(
children: <Widget>[ children: <Widget>[
AppText( AppText(
"Welcome", TranslationBase
.of(context)
.welcome,
fontSize: SizeConfig.textMultiplier * 1.7, fontSize: SizeConfig.textMultiplier * 1.7,
color: Colors.white, color: Colors.white,
) )
@ -110,63 +112,75 @@ class _DashboardScreenState extends State<DashboardScreen> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Dr. ${authProvider.doctorProfile 'Dr. ${authProvider.doctorProfile.doctorName}',
.doctorName}',
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2.5, fontSize: SizeConfig.textMultiplier * 2.5,
color: Colors.white, color: Colors.white,
) )
], ],
), ),
Row( SizedBox(
mainAxisAlignment: height: 4,
MainAxisAlignment.spaceBetween, ),
children: <Widget>[ InkWell(
Container( onTap: () async {
child: AppText( showCupertinoPicker(
authProvider.selectedClinicName != decKey: '',
null context: context,
? authProvider.selectedClinicName actionList: projectsProvider
: authProvider.doctorProfile .doctorClinicsList);
.clinicDescription, },
fontSize: child: Row(
SizeConfig.textMultiplier * 1.7, mainAxisAlignment:
color: Colors.white, MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
child: AppText(
authProvider.selectedClinicName !=
null
? authProvider.selectedClinicName
: authProvider.doctorProfile
.clinicDescription,
fontSize:
SizeConfig.textMultiplier * 1.7,
color: Colors.white,
textAlign: TextAlign.center,
),
alignment: projectsProvider.isArabic
? Alignment.topRight
: Alignment.topLeft,
), ),
alignment: projectsProvider.isArabic Row(
? Alignment.topRight mainAxisAlignment:
: Alignment.topLeft, MainAxisAlignment.start,
), mainAxisSize: MainAxisSize.max,
Row( crossAxisAlignment:
mainAxisAlignment: CrossAxisAlignment.start,
MainAxisAlignment.start, children: <Widget>[
mainAxisSize: MainAxisSize.max, InkWell(
crossAxisAlignment:
CrossAxisAlignment.start, child: Container(
children: <Widget>[ margin: EdgeInsets.only(
InkWell( left: 5,
onTap: () async { top: projectsProvider
showCupertinoPicker( .isArabic ? 0 : 5,
decKey: '', right: 10,
context: context, bottom: projectsProvider
actionList: projectsProvider .isArabic ? 15 : 7),
.doctorClinicsList); child: Icon(
}, DoctorApp.sync_icon,
child: Container(
margin: EdgeInsets.only( color: Colors.white,
left: 5, top: 5, right: 10), size: SizeConfig
child: Icon( .textMultiplier *
DoctorApp.sync_icon, 1.8,
)),
),
],
),
]),
),
color: Colors.white,
size: SizeConfig
.textMultiplier *
1.8,
)),
),
],
),
])
], ],
), ),
Expanded( Expanded(
@ -650,6 +664,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
.of(context) .of(context)
.searchPatient, .searchPatient,
color: Colors.black, color: Colors.black,
textAlign: TextAlign.center,
) )
], ],
), ),
@ -671,6 +686,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
TranslationBase TranslationBase
.of(context) .of(context)
.doctorReply, .doctorReply,
textAlign: TextAlign.center,
color: Colors.black, color: Colors.black,
) )
], ],
@ -886,6 +902,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: actionList children: actionList
.map((e) => Flexible( .map((e) => Flexible(
child: Container( child: Container(
height: 50,
child: InkWell( child: InkWell(
onTap: () => onTap: () =>
changeClinic(e.clinicID, context), changeClinic(e.clinicID, context),
@ -894,8 +911,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier *
1.9, 1.9,
)), )),
), ),
)) ))

@ -7,6 +7,7 @@
*@desc: *@desc:
*/ */
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart';
@ -14,23 +15,16 @@ import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart';
import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/providers/patients_provider.dart';
import 'package:doctor_app_flutter/providers/project_provider.dart'; import 'package:doctor_app_flutter/providers/project_provider.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/profile_image_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../config/size_config.dart'; import '../../config/size_config.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/app_scaffold_widget.dart';
import '../../widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class PatientsScreen extends StatefulWidget { class PatientsScreen extends StatefulWidget {
@override @override
@ -38,12 +32,12 @@ class PatientsScreen extends StatefulWidget {
} }
class _PatientsScreenState extends State<PatientsScreen> { class _PatientsScreenState extends State<PatientsScreen> {
List<dynamic> litems; List<dynamic> lItems;
List parsed; List parsed;
List date; List date;
List unfilterDate; List unFilterDate;
Color sideColor = Colors.black; Color sideColor = Colors.black;
List<PatiantInformtion> responseModelList; List<PatiantInformtion> responseModelList;
@ -60,7 +54,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
bool _isInit = true; bool _isInit = true;
String patientType; String patientType;
String patientTypetitle; String patientTypeTitle;
var _isLoading = false; var _isLoading = false;
bool _isError = true; bool _isError = true;
@ -83,9 +77,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
patientType = routeArgs['selectedType']; patientType = routeArgs['selectedType'];
if (!projectsProvider.isArabic) if (!projectsProvider.isArabic)
patientTypetitle = SERVICES_PATIANT_HEADER[int.parse(patientType)]; patientTypeTitle = SERVICES_PATIANT_HEADER[int.parse(patientType)];
else else
patientTypetitle = SERVICES_PATIANT_HEADER_AR[int.parse(patientType)]; patientTypeTitle = SERVICES_PATIANT_HEADER_AR[int.parse(patientType)];
print(patientType); print(patientType);
@ -101,8 +95,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
_isLoading = false; _isLoading = false;
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
int val2 = int.parse(patientType); int val2 = int.parse(patientType);
litems = res[SERVICES_PATIANT2[val2]]; lItems = res[SERVICES_PATIANT2[val2]];
parsed = litems; parsed = lItems;
responseModelList = new ModelResponse.fromJson(parsed).list; responseModelList = new ModelResponse.fromJson(parsed).list;
responseModelList2 = responseModelList; responseModelList2 = responseModelList;
_isError = false; _isError = false;
@ -314,12 +308,12 @@ class _PatientsScreenState extends State<PatientsScreen> {
PatientsProvider patientsProv = Provider.of<PatientsProvider>(context); PatientsProvider patientsProv = Provider.of<PatientsProvider>(context);
return AppScaffold( return AppScaffold(
appBarTitle: patientTypetitle, appBarTitle: patientTypeTitle,
body: _isLoading body: _isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: _isError : _isError
? DrAppEmbeddedError(error: error) ? DrAppEmbeddedError(error: error)
: litems == null : lItems == null || lItems.length == 0
? DrAppEmbeddedError( ? DrAppEmbeddedError(
error: TranslationBase.of(context).youDontHaveAnyPatient) error: TranslationBase.of(context).youDontHaveAnyPatient)
: Container( : Container(
@ -327,7 +321,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
children: <Widget>[ children: <Widget>[
Container( Container(
child: litems == null child: lItems == null
? Column( ? Column(
children: <Widget>[ children: <Widget>[
Container( Container(
@ -373,214 +367,235 @@ class _PatientsScreenState extends State<PatientsScreen> {
height: 10.0, height: 10.0,
), ),
Container( Container(
//===============
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), color: Color(0Xffffffff),
borderRadius: borderRadius:
BorderRadius.circular(20)), BorderRadius.circular(20)),
//================
margin: margin:
EdgeInsets.fromLTRB(15, 0, 15, 0), EdgeInsets.fromLTRB(15, 0, 15, 0),
child: Column( child: (responseModelList.length > 0)
? Column(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: responseModelList children: responseModelList
.map((PatiantInformtion item) { .map((PatiantInformtion item) {
return Container( return Container(
decoration: myBoxDecoration(), decoration: myBoxDecoration(),
child: InkWell( child: InkWell(
child: CardWithBgWidgetNew( child: Row(
//CardWithBgWidget( children: <Widget>[
Column(
widget: Column( mainAxisAlignment:
children: <Widget>[ MainAxisAlignment
Container( .start,
// decoration: myBoxDecoration(), children: <Widget>[
child: Row( Container(
children: <Widget>[ decoration:
Column( BoxDecoration(
mainAxisAlignment: gradient: LinearGradient(
MainAxisAlignment begin:
.start, Alignment(
children: < -1,
Widget>[ -1),
Container( end:
decoration: Alignment(
BoxDecoration( 1, 1),
gradient: LinearGradient( colors: [
begin: Alignment( Colors.grey[
-1, 100],
-1), Colors.grey[
end: Alignment( 200],
1, ]),
1), boxShadow: [
colors: [ BoxShadow(
Colors.grey[100], color: Color
Colors.grey[200], .fromRGBO(
]), 0,
boxShadow: [ 0,
BoxShadow( 0,
color: Color.fromRGBO( 0.08),
0, offset:
0, Offset(
0, 0.0,
0.08), 5.0),
offset: Offset(0.0, blurRadius:
5.0), 16.0)
blurRadius:
16.0)
],
borderRadius:
BorderRadius.all(
Radius.circular(50.0)),
),
width: 80,
height: 80,
child: Icon(
item.genderDescription ==
"Male"
? DoctorApp
.male
: DoctorApp
.female_icon,
size: 80,
)),
], ],
borderRadius: BorderRadius
.all(Radius
.circular(
50.0)),
), ),
SizedBox( width: 80,
width: 10, height: 80,
), child: Icon(
Column( item
crossAxisAlignment: .genderDescription ==
CrossAxisAlignment "Male"
.start, ? DoctorApp
children: < .male
Widget>[ : DoctorApp
AppText( .female_icon,
item.firstName + size: 80,
" " + )),
item.lastName, ],
fontSize: 2.0 * ),
SizeConfig SizedBox(
.textMultiplier, width: 10,
fontWeight: ),
FontWeight Expanded(
.bold, child: Column(
backGroundcolor: crossAxisAlignment:
Colors CrossAxisAlignment
.white, .start,
), children: <Widget>[
SizedBox( SizedBox(
height: 8, height: 15,
),
AppText(
item.firstName +
" " +
item.lastName,
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height: 8,
),
AppText(
TranslationBase
.of(
context)
.fileNo +
item.patientId
.toString(),
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
AppText(
TranslationBase
.of(
context)
.age +
item.age
.toString(),
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height: 8,
),
SERVICES_PATIANT2[
int.parse(
patientType)] ==
"List_MyOutPatient"
? Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: <
Widget>[
Container(
height:
20,
width: 80,
decoration:
BoxDecoration(
borderRadius:
BorderRadius
.circular(
50),
color: Hexcolor(
"#20A169"),
), ),
child:
AppText( AppText(
TranslationBase.of( item
context) .startTime,
.fileNo + color: Colors
item.patientId .white,
.toString(), fontSize:
fontSize: 2.0 * 2 * SizeConfig
SizeConfig .textMultiplier,
.textMultiplier, textAlign:
TextAlign
.center,
fontWeight: fontWeight:
FontWeight FontWeight
.bold, .bold,
backGroundcolor:
Colors
.white,
), ),
),
// SizedBox( SizedBox(
// height: 8, width: 60,
// ), ),
Container(
child:
AppText( AppText(
TranslationBase.of( convertDateFormat2(
context) item
.age + .appointmentDate
item.age .toString()),
.toString(), fontSize:
fontSize: 2.0 * 2.0 *
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
fontWeight: fontWeight:
FontWeight FontWeight
.bold, .bold,
backGroundcolor:
Colors
.white,
),
SizedBox(
height: 8,
), ),
SERVICES_PATIANT2[ )
int.parse(patientType)] == ],
"List_MyOutPatient" )
? Row( : AppText(
mainAxisAlignment: item
MainAxisAlignment.spaceBetween, .nationalityName ??
children: < item
Widget>[ .nationalityNameN,
Container( fontSize: 2.5 *
height: SizeConfig
20, .textMultiplier,
width: ),
80, SizedBox(
decoration: height: 15,
BoxDecoration( ),
borderRadius: BorderRadius.circular(50), ],
color: Hexcolor("#20A169"),
),
child:
AppText(
item.startTime,
color: Colors.white,
fontSize: 2 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
SizedBox(
width:
60,
),
Container(
child:
AppText(
convertDateFormat2(item.appointmentDate.toString()),
fontSize: 2.0 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
)
],
)
: AppText(
item.nationalityName ??
item.nationalityNameN,
fontSize:
2.5 *
SizeConfig.textMultiplier,
),
],
),
// Divider(color: Colors.grey)
],
),
), ),
// Divider(color: Colors.grey) ),
], // Divider(color: Colors.grey)
), ],
), ),
onTap: () { onTap: () {
Navigator.of(context) Navigator.of(context)
.pushNamed( .pushNamed(
PATIENTS_PROFILE, PATIENTS_PROFILE,
arguments: { arguments: {
"patient": item "patient": item
}); });
}, },
), ),
); );
}).toList(), }).toList(),
)
: Center(
child: DrAppEmbeddedError(
error: TranslationBase
.of(context)
.youDontHaveAnyPatient),
), ),
), ),
], ],
@ -611,8 +626,11 @@ class _PatientsScreenState extends State<PatientsScreen> {
Widget _locationBar(BuildContext _context) { Widget _locationBar(BuildContext _context) {
return Container( return Container(
height: MediaQuery.of(context).size.height * 0.065, height: MediaQuery
width: SizeConfig.screenWidth * 0.9, .of(context)
.size
.height * 0.065,
width: SizeConfig.screenWidth * 0.95,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)), color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)),
child: Row( child: Row(
@ -639,9 +657,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
color: _isActive color: _isActive
? Colors.white ? Colors.white
: Colors.black, //Colors.black, : Colors.black, //Colors.black,
// backgroundColor:_isActive
// ? Hexcolor("#B8382B")
// : Colors.white,//sideColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@ -677,7 +692,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
return BoxDecoration( return BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
// <--- top side
color: Colors.grey, color: Colors.grey,
width: 1.0, width: 1.0,
), ),

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/insurance_aprovals_request.dart'; import 'package:doctor_app_flutter/models/patient/insurance_aprovals_request.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.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';
@ -15,7 +16,6 @@ import '../../../util/dr_app_shared_pref.dart';
import '../../../widgets/shared/app_scaffold_widget.dart'; import '../../../widgets/shared/app_scaffold_widget.dart';
import '../../../widgets/shared/app_texts_widget.dart'; import '../../../widgets/shared/app_texts_widget.dart';
import '../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -475,6 +475,7 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
} }
convertDateFormat(String str) { convertDateFormat(String str) {
if (str == null) return '';
const start = "/Date("; const start = "/Date(";
const end = "+0300)"; const end = "+0300)";

@ -81,7 +81,7 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
? DrAppEmbeddedError(error: patientsProv.error) ? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientRadiologyList.length == 0 : patientsProv.patientRadiologyList.length == 0
? DrAppEmbeddedError( ? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoVitalSign) error: TranslationBase.of(context).youDoNotHaveAnyItem)
: Container( : Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05, SizeConfig.realScreenWidth * 0.05,

File diff suppressed because one or more lines are too long

@ -182,7 +182,8 @@ class TranslationBase {
localizedValues['pleaseEnterTheCode'][locale.languageCode]; localizedValues['pleaseEnterTheCode'][locale.languageCode];
String get youDontHaveAnyPatient => String get youDontHaveAnyPatient =>
localizedValues['youDon\'tHaveAnyPatient'][locale.languageCode]; localizedValues['youDon\'tHaveAnyPatient'][locale.languageCode];
String get youDoNotHaveAnyItem =>
localizedValues['youDoNotHaveAnyItem'][locale.languageCode];
String get age => localizedValues['age'][locale.languageCode]; String get age => localizedValues['age'][locale.languageCode];
String get today => localizedValues['today'][locale.languageCode]; String get today => localizedValues['today'][locale.languageCode];
String get tomorrow => localizedValues['tomorrow'][locale.languageCode]; String get tomorrow => localizedValues['tomorrow'][locale.languageCode];
@ -262,6 +263,8 @@ class TranslationBase {
String get searchPatientImageCaptionBody => String get searchPatientImageCaptionBody =>
localizedValues['searchPatientImageCaptionBody'][locale.languageCode]; localizedValues['searchPatientImageCaptionBody'][locale.languageCode];
String get welcome => localizedValues['welcome'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -284,14 +284,13 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
Form( Form(
key: _formKey, key: _formKey,
child: TextFields( child: TextFields(
controller:answerController,
maxLines: 2, maxLines: 2,
minLines: 2, minLines: 2,
hintText: hintText:
TranslationBase.of(context).answerThePatient, TranslationBase.of(context).answerThePatient,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
initialValue: widget.myReferralPatientModel
.referredDoctorRemarks ??
'',
readOnly: _isLoading, readOnly: _isLoading,
validator: (value) { validator: (value) {
if (value.isEmpty) if (value.isEmpty)

@ -164,15 +164,17 @@ class PatientProfileButton extends StatelessWidget {
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
), ),
), ),
Container( Expanded(
child: Row( child: Container(
mainAxisAlignment: MainAxisAlignment.end, child: Row(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.end,
Container( children: <Widget>[
padding: EdgeInsets.all(10), Container(
child: new Image.asset(url + icon)) padding: EdgeInsets.all(10),
], child: new Image.asset(url + icon))
)) ],
)),
)
]), ]),
), ),
decoration: BoxDecoration( decoration: BoxDecoration(

@ -15,7 +15,7 @@ class AppButton extends StatefulWidget {
final double fontSize; final double fontSize;
final double padding; final double padding;
AppButton({@required this.onPressed, this.title, this.icon, this.color, this.fontSize = 2, this.padding = 5}); AppButton({@required this.onPressed, this.title, this.icon, this.color, this.fontSize = 2, this.padding = 13});
_AppButtonState createState() => _AppButtonState(); _AppButtonState createState() => _AppButtonState();

Loading…
Cancel
Save