Merge branch 'pharmacy_redesign' into 'development'

first step form redesign pharmacy page

See merge request Cloud_Solution/doctor_app_flutter!964
merge-requests/965/merge
Elham Ali 4 years ago
commit 2a0148467e

@ -1,21 +1,28 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:typed_data'; import 'dart:typed_data';
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/core/service/AnalyticsService.dart';
import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.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:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/medicine/medicine_item_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_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.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:maps_launcher/maps_launcher.dart'; import 'package:maps_launcher/maps_launcher.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../locator.dart';
DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
class PharmaciesListScreen extends StatefulWidget { class PharmaciesListScreen extends StatefulWidget {
@ -42,158 +49,98 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
appBarTitle: TranslationBase.of(context).pharmaciesList, appBarTitle: TranslationBase.of(context).pharmaciesList,
body: Container( body: Center(
height: SizeConfig.screenHeight, child: FractionallySizedBox(
child: ListView( widthFactor: 0.95,
shrinkWrap: true, child: Container(
scrollDirection: Axis.vertical, height: SizeConfig.screenHeight,
physics: const AlwaysScrollableScrollPhysics(), child: ListView(
children: <Widget>[ shrinkWrap: true,
model.pharmaciesList.length > 0 scrollDirection: Axis.vertical,
? RoundedContainer( physics: const AlwaysScrollableScrollPhysics(),
child: Row( children: <Widget>[
children: <Widget>[ model.pharmaciesList.length > 0
Expanded( ? MedicineItemWidget(
flex: 1, label: model.pharmaciesList[0]["ItemDescription"],
child: ClipRRect( url: widget.url,
borderRadius: showArrow: false,
BorderRadius.all(Radius.circular(7)), showPrice: true,
child: widget.url != null price: model.pharmaciesList[0]["SellingPrice"]
? Image.network( .toString(),
widget.url,
height:
SizeConfig.imageSizeMultiplier * 21,
width:
SizeConfig.imageSizeMultiplier * 20,
fit: BoxFit.cover,
)
: Container(),
),
),
Expanded(
flex: 3,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
AppText(
TranslationBase.of(context).description,
marginLeft: 10,
marginTop: 0,
marginRight: 10,
marginBottom: 2,
fontWeight: FontWeight.bold,
),
AppText(
model.pharmaciesList[0]["ItemDescription"],
marginLeft: 10,
marginTop: 0,
marginRight: 10,
marginBottom: 10,
),
AppText(
TranslationBase.of(context).price,
marginLeft: 10,
marginTop: 0,
marginRight: 10,
marginBottom: 2,
fontWeight: FontWeight.bold,
),
AppText(
model.pharmaciesList[0]["SellingPrice"]
.toString(),
marginLeft: 10,
marginTop: 0,
marginRight: 10,
marginBottom: 10,
),
],
),
) )
], : Container(),
)) Container(
: Container(), margin: EdgeInsets.only(
Container( top: SizeConfig.widthMultiplier * 2,
margin: EdgeInsets.only( bottom: SizeConfig.widthMultiplier * 2,
top: SizeConfig.widthMultiplier * 2, right: SizeConfig.widthMultiplier * 4,
bottom: SizeConfig.widthMultiplier * 2, left: SizeConfig.widthMultiplier * 4,
right: SizeConfig.widthMultiplier * 4, ),
left: SizeConfig.widthMultiplier * 4, child: Align(
), alignment: Alignment.centerLeft,
child: Align( child: AppText(
alignment: Alignment.centerLeft, TranslationBase.of(context).youCanFindItIn,
child: AppText( fontWeight: FontWeight.bold,
TranslationBase.of(context).youCanFindItIn, ),
fontWeight: FontWeight.bold, ),
alignment: projectsProvider.isArabic
? Alignment.topRight
: Alignment.topLeft,
), ),
), Container(
alignment: projectsProvider.isArabic width: SizeConfig.screenWidth * 0.99,
? Alignment.topRight margin: EdgeInsets.only(left: 10, right: 10),
: Alignment.topLeft, child: ListView.builder(
), shrinkWrap: true,
Container( physics: const NeverScrollableScrollPhysics(),
width: SizeConfig.screenWidth * 0.99, itemCount: model.pharmaciesList == null
margin: EdgeInsets.only(left: 10, right: 10), ? 0
child: ListView.builder( : model.pharmaciesList.length,
shrinkWrap: true, itemBuilder: (BuildContext context, int index) {
physics: const NeverScrollableScrollPhysics(), return CardWithBgWidget(
itemCount: model.pharmaciesList == null bgColor: Colors.transparent,
? 0 hasBorder: false,
: model.pharmaciesList.length, widget: Row(
itemBuilder: (BuildContext context, int index) { children: <Widget>[
return RoundedContainer( Expanded(
margin: EdgeInsets.only(top: 5), flex: 1,
child: Row( child: ClipRRect(
children: <Widget>[ borderRadius:
Expanded( BorderRadius.all(Radius.circular(7)),
flex: 1, child: Image.network(
child: ClipRRect( model.pharmaciesList[index]
borderRadius: ["ProjectImageURL"],
BorderRadius.all(Radius.circular(7)), height:
child: Image.network( SizeConfig.imageSizeMultiplier * 15,
model.pharmaciesList[index] width:
["ProjectImageURL"], SizeConfig.imageSizeMultiplier * 15,
height: SizeConfig.imageSizeMultiplier * 15, fit: BoxFit.cover,
width: SizeConfig.imageSizeMultiplier * 15,
fit: BoxFit.cover,
),
),
),
Expanded(
flex: 4,
child: AppText(
model.pharmaciesList[index]
["LocationDescription"],
margin: 10,
),
),
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://" +
model.pharmaciesList[index]
["PhoneNumber"]),
), ),
), ),
Padding( ),
padding: EdgeInsets.all(5), Expanded(
child: InkWell( flex: 4,
child: Icon( child: AppText(
Icons.pin_drop, Helpers.convertToTitleCase(
color: Colors.red, model.pharmaciesList[index]
), ["LocationDescription"] ??
onTap: () { ''),
margin: 10,
fontHeight: 1.4,
color: AppGlobal.appTextColor,
textAlign: TextAlign.start,
fontWeight: FontWeight.w600,
letterSpacing: -0.33,
),
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
InkWell(
onTap: () async {
MapsLauncher.launchCoordinates( MapsLauncher.launchCoordinates(
double.parse( double.parse(
model.pharmaciesList[index] model.pharmaciesList[index]
@ -204,17 +151,123 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
model.pharmaciesList[index] model.pharmaciesList[index]
["LocationDescription"]); ["LocationDescription"]);
}, },
child: Container(
decoration: BoxDecoration(
color: Colors.grey,
borderRadius:
BorderRadius.circular(10),
),
// color:Colors.red[600],
child: Row(
children: [
Icon(
Icons.pin_drop,
size: 15,
color: Colors.white,
),
SizedBox(
width: 2,
),
AppText(
"location",
fontSize: 8,
color: Colors.white,
),
],
),
padding: EdgeInsets.all(6),
),
), ),
), SizedBox(
], height: 10,
), ),
InkWell(
onTap: () {
launch("tel://" +
model.pharmaciesList[index]
["PhoneNumber"]);
},
child: Container(
decoration: BoxDecoration(
color: Colors.grey,
borderRadius:
BorderRadius.circular(10),
),
// color:Colors.red[600],
child: Row(
children: [
Icon(
DoctorApp.call,
size: 12,
color: Colors.white,
),
SizedBox(
width: 2,
),
AppText(
"Call Now",
fontSize: 8,
color: Colors.white,
),
],
),
padding: EdgeInsets.all(6),
),
),
],
),
// 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://" +
// model.pharmaciesList[index]
// ["PhoneNumber"]),
// ),
// ),
// Padding(
// padding: EdgeInsets.all(5),
// child: InkWell(
// child: Icon(
// Icons.pin_drop,
// color: Colors.red,
// ),
// onTap: () {
// MapsLauncher.launchCoordinates(
// double.parse(
// model.pharmaciesList[index]
// ["Latitude"]),
// double.parse(
// model.pharmaciesList[index]
// ["Longitude"]),
// model.pharmaciesList[index]
// ["LocationDescription"]);
// },
// ),
// ),
// ],
// ),
// ),
],
), ),
], );
), }),
); )
}), ]),
) ),
]), ),
), ),
), ),
); );

Loading…
Cancel
Save