merge conflict resolved

merge-update-with-lab-changes
hussam al-habibeh 4 years ago
parent 141e650276
commit 01a56da151

@ -23,10 +23,17 @@ class ProductNameAndPrice extends StatefulWidget {
final bool isStockAvailable; final bool isStockAvailable;
final String stockAvailability; final String stockAvailability;
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>(); AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
ProductNameAndPrice(this.context, this.item, ProductNameAndPrice(this.context, this.item,
{this.customerId, this.isInWishList, this.notifyMeWhenAvailable, this.addToWishlistFunction, this.deleteFromWishlistFunction, this.isStockAvailable = true, this.stockAvailability}); {this.customerId,
this.isInWishList,
this.notifyMeWhenAvailable,
this.addToWishlistFunction,
this.deleteFromWishlistFunction,
this.isStockAvailable = true,
this.stockAvailability});
@override @override
_ProductNameAndPriceState createState() => _ProductNameAndPriceState(); _ProductNameAndPriceState createState() => _ProductNameAndPriceState();
@ -66,17 +73,18 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
), ),
Text( Text(
projectViewModel.isArabic ? widget.item.rxMessagen.toString() : widget.item.rxMessage.toString(), projectViewModel.isArabic
style: TextStyle(color: Colors.white, ? widget.item.rxMessagen.toString()
: widget.item.rxMessage.toString(),
style: TextStyle(
color: Colors.white,
// regular: true, // regular: true,
fontSize: 17, fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
) )),
),
], ],
) ))
)
: Container(), : Container(),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.95,
@ -84,9 +92,11 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
// Texts(widget.item.price.toString() + " " + TranslationBase.of(context).sar, fontWeight: FontWeight.bold, fontSize: 20), // Texts(widget.item.price.toString() + " " + TranslationBase.of(context).sar, fontWeight: FontWeight.bold, fontSize: 20),
if (widget.stockAvailability != null)
Container( Container(
margin: EdgeInsets.only(top: 10.0, right: 10.0), margin: EdgeInsets.only(top: 10.0, right: 10.0),
padding: EdgeInsets.only(left: 11.0, right: 11.0, top: 0, bottom: 0), padding: EdgeInsets.only(
left: 11.0, right: 11.0, top: 0, bottom: 0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: getStatusBackgroundColor(), color: getStatusBackgroundColor(),
@ -97,30 +107,44 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
borderRadius: BorderRadius.circular(30.0)), borderRadius: BorderRadius.circular(30.0)),
child: Text( child: Text(
widget.stockAvailability, widget.stockAvailability,
style: TextStyle(fontWeight: FontWeight.w600, fontSize: 11, color: Color(0xffFFFFFF),), style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: 11,
color: Color(0xffFFFFFF),
),
//color: widget.isStockAvailable ? Colors.white : Colors.red, //color: widget.isStockAvailable ? Colors.white : Colors.red,
), ),
), ),
// SizedBox(width: 20), // SizedBox(width: 20),
if (widget.authenticatedUserObject.isLogin) if (widget.authenticatedUserObject.isLogin)
!widget.isStockAvailable && widget.customerId != null widget.stockAvailability != null &&
?IconButton( !widget.isStockAvailable &&
widget.customerId != null
? IconButton(
iconSize: 25, iconSize: 25,
icon:Icon(Icons.notifications_active), icon: Icon(Icons.notifications_active),
color: new Color(0xff2E303A), color: new Color(0xff2E303A),
onPressed: () onPressed: () {
{ widget.notifyMeWhenAvailable(context, widget.item.id);}, widget.notifyMeWhenAvailable(
context, widget.item.id);
): IconButton( },
icon: Icon(!widget.isInWishList ? Icons.favorite_border : Icons.favorite), )
color: !widget.isInWishList ? Color(0xff2E303A) : Color(0xffD02127), : IconButton(
icon: Icon(!widget.isInWishList
? Icons.favorite_border
: Icons.favorite),
color: !widget.isInWishList
? Color(0xff2E303A)
: Color(0xffD02127),
onPressed: () async { onPressed: () async {
{ {
if (widget.customerId != null) { if (widget.customerId != null) {
if (!widget.isInWishList) { if (!widget.isInWishList) {
await widget.addToWishlistFunction(widget.item.id); await widget
.addToWishlistFunction(widget.item.id);
} else { } else {
await widget.deleteFromWishlistFunction(widget.item.id); await widget.deleteFromWishlistFunction(
widget.item.id);
} }
} else { } else {
return; return;
@ -177,31 +201,39 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 8,right: 8, top: 1, bottom: 15), padding:
const EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 15),
child: Container( child: Container(
margin: EdgeInsets.only(left: 5, right: 5), margin: EdgeInsets.only(left: 5, right: 5),
child: Align( child: Align(
alignment: projectViewModel.isArabic ? Alignment.topRight : Alignment.topLeft, alignment: projectViewModel.isArabic
? Alignment.topRight
: Alignment.topLeft,
child: Text( child: Text(
projectViewModel.isArabic ? widget.item.namen : widget.item.name, projectViewModel.isArabic
style: TextStyle( fontWeight: FontWeight.w600, fontSize: 16), ? widget.item.namen
: widget.item.name,
style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16),
), ),
), ),
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 8,right: 8), padding: const EdgeInsets.only(left: 8, right: 8),
child: Container( child: Container(
margin: EdgeInsets.only(left: 5, right: 5), margin: EdgeInsets.only(left: 5, right: 5),
child: Align( child: Align(
alignment: projectViewModel.isArabic ? Alignment.topRight : Alignment.topLeft, alignment: projectViewModel.isArabic
child: Text( TranslationBase.of(context).sar+ " " + ? Alignment.topRight
: Alignment.topLeft,
child: Text(
TranslationBase.of(context).sar +
" " +
widget.item.price.toString(), widget.item.price.toString(),
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 19),), style: TextStyle(fontWeight: FontWeight.bold, fontSize: 19),
),
), ),
), ),
), ),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.95,
@ -213,7 +245,8 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
child: Row( child: Row(
children: [ children: [
RatingBar.readOnly( RatingBar.readOnly(
initialRating: double.parse(widget.item.approvedRatingSum.toString()), initialRating: double.parse(
widget.item.approvedRatingSum.toString()),
size: 18.0, size: 18.0,
filledColor: Color(0XFFD02127), filledColor: Color(0XFFD02127),
emptyColor: Color(0XFFD02127), emptyColor: Color(0XFFD02127),
@ -235,7 +268,8 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
Text( Text(
"(${widget.item.approvedTotalReviews}${TranslationBase.of(context).review})", "(${widget.item.approvedTotalReviews}${TranslationBase.of(context).review})",
style: TextStyle(fontWeight: FontWeight.w600, fontSize: 12), style: TextStyle(
fontWeight: FontWeight.w600, fontSize: 12),
), ),
SizedBox( SizedBox(
width: 70, width: 70,
@ -267,6 +301,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
Color getStatusBackgroundColor() { Color getStatusBackgroundColor() {
if (widget.isStockAvailable) if (widget.isStockAvailable)
return Color(0xFF5AB145); return Color(0xFF5AB145);
else return Color(0xFFD02127); else
return Color(0xFFD02127);
} }
} }

Loading…
Cancel
Save