Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/doctor_app_flutter!166
pull/169/head
Elham 5 years ago
commit 546112a677

@ -72,7 +72,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
children: <Widget>[ children: <Widget>[
RoundedContainer( _medicineProvider.pharmaciesList.length >0 ?RoundedContainer(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
@ -80,7 +80,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(7)), Radius.circular(7)),
child: Image.memory( child: widget.url != null ?Image.memory(
dataFromBase64String(widget.url), dataFromBase64String(widget.url),
height: height:
SizeConfig.imageSizeMultiplier * SizeConfig.imageSizeMultiplier *
@ -89,7 +89,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
SizeConfig.imageSizeMultiplier * SizeConfig.imageSizeMultiplier *
20, 20,
fit: BoxFit.cover, fit: BoxFit.cover,
), ): Container(),
), ),
), ),
Expanded( Expanded(
@ -136,7 +136,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
), ),
) )
], ],
)), )): Container(),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: SizeConfig.widthMultiplier * 2, top: SizeConfig.widthMultiplier * 2,
@ -247,6 +247,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
//TODO CHECK THE URL IS NULL OR NOT //TODO CHECK THE URL IS NULL OR NOT
Uint8List dataFromBase64String(String base64String) { Uint8List dataFromBase64String(String base64String) {
if(base64String !=null)
return base64Decode(base64String); return base64Decode(base64String);
} }

Loading…
Cancel
Save