diff --git a/lib/pages/pharmacies/screens/product-details/details_info.dart b/lib/pages/pharmacies/screens/product-details/details_info.dart index bc5e7f80..e7a7f663 100644 --- a/lib/pages/pharmacies/screens/product-details/details_info.dart +++ b/lib/pages/pharmacies/screens/product-details/details_info.dart @@ -22,33 +22,34 @@ class DetailsInfo extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - child: Texts( - TranslationBase.of(context) - .description, - fontSize: 17, - color: Colors.grey, - ), - ), +// Container( +// child: Texts( +// TranslationBase.of(context) +// .description, +// fontSize: 17, +// color: Colors.grey, +// ), +// ), +// SizedBox( +// height: 10, +// ), +// Divider(height: 1, color: Colors.grey), SizedBox( height: 10, ), - Divider(height: 1, color: Colors.grey), - SizedBox( - height: 15, - ), Container( - child: Texts( + margin: EdgeInsets.only(left: 10, right: 10), + child: Text( projectViewModel.isArabic ? product.fullDescriptionn : product .fullDescription ?? "", - fontSize: 16, + style: TextStyle(fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.56), ), ), SizedBox( - height: 20, + height: 60, ), ]), ); diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index acbdb0a3..efb34510 100644 --- a/lib/pages/pharmacies/screens/product-details/product-detail.dart +++ b/lib/pages/pharmacies/screens/product-details/product-detail.dart @@ -233,7 +233,7 @@ class __ProductDetailPageState extends State { }, child: Text( TranslationBase.of(context).details, - style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14), + style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.84), ), color: Colors.white, ), @@ -264,7 +264,7 @@ class __ProductDetailPageState extends State { }, child: Text( TranslationBase.of(context).reviews, - style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14), + style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.84), ), color: Colors.white, ), @@ -294,7 +294,7 @@ class __ProductDetailPageState extends State { : null, child: Text( TranslationBase.of(context).availability, - style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14), + style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.84), ), color: Colors.white, ), diff --git a/lib/pages/pharmacies/screens/product-details/product-name-and-price.dart b/lib/pages/pharmacies/screens/product-details/product-name-and-price.dart index 21bff3c3..3a6f5c8d 100644 --- a/lib/pages/pharmacies/screens/product-details/product-name-and-price.dart +++ b/lib/pages/pharmacies/screens/product-details/product-name-and-price.dart @@ -81,13 +81,14 @@ class _ProductNameAndPriceState extends State { // regular: true, fontSize: 17, fontWeight: FontWeight.w600, + letterSpacing:-0.68 // textAlign: TextAlign.center, )), ], )) : Container(), FractionallySizedBox( - widthFactor: 0.95, + widthFactor: 0.93, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -105,18 +106,23 @@ class _ProductNameAndPriceState extends State { ), color: getStatusBackgroundColor(), borderRadius: BorderRadius.circular(30.0)), - child: Text( - widget.stockAvailability, - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xffFFFFFF), - ), - //color: widget.isStockAvailable ? Colors.white : Colors.red, - ), + // child: Text( + // widget.stockAvailability, + // style: TextStyle( + // fontWeight: FontWeight.w600, + // fontSize: 11, + // color: Color(0xffFFFFFF), + // ), + // color: getStatusBackgroundColor(), + // borderRadius: BorderRadius.circular(30.0)), + child: Text( + widget.stockAvailability, + style: TextStyle(fontWeight: FontWeight.w600, fontSize: 11, color: Color(0xffFFFFFF),letterSpacing:-0.44)), + //color: widget.isStockAvailable ? Colors.white : Colors.red, ), // SizedBox(width: 20), - if (widget.authenticatedUserObject.isLogin) + if ( + widget.authenticatedUserObject.isLogin) widget.stockAvailability != null && !widget.isStockAvailable && widget.customerId != null @@ -202,9 +208,9 @@ class _ProductNameAndPriceState extends State { ), Padding( padding: - const EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 15), + const EdgeInsets.only(left: 8, right: 8, top: 1, bottom: 12), child: Container( - margin: EdgeInsets.only(left: 5, right: 5), + margin: EdgeInsets.only(left: 10, right: 10), child: Align( alignment: projectViewModel.isArabic ? Alignment.topRight @@ -213,7 +219,10 @@ class _ProductNameAndPriceState extends State { projectViewModel.isArabic ? widget.item.namen : widget.item.name, - style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16), + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: 16, + letterSpacing: -0.96), ), ), ), @@ -221,7 +230,7 @@ class _ProductNameAndPriceState extends State { Padding( padding: const EdgeInsets.only(left: 8, right: 8), child: Container( - margin: EdgeInsets.only(left: 5, right: 5), + margin: EdgeInsets.only(left: 10, right: 10), child: Align( alignment: projectViewModel.isArabic ? Alignment.topRight @@ -230,7 +239,10 @@ class _ProductNameAndPriceState extends State { TranslationBase.of(context).sar + " " + widget.item.price.toString(), - style: TextStyle(fontWeight: FontWeight.bold, fontSize: 19), + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 19, + letterSpacing: -0.76), ), ), ), @@ -240,6 +252,7 @@ class _ProductNameAndPriceState extends State { child: Row( children: [ Container( + margin: EdgeInsets.only(left: 8, right: 8), child: Align( alignment: Alignment.bottomLeft, child: Row( @@ -256,16 +269,16 @@ class _ProductNameAndPriceState extends State { emptyIcon: Icons.star_border, ), SizedBox( - width: 10, + width: 5, ), // Texts( // "${widget.item.approvedRatingSum}", // fontWeight: FontWeight.bold, // fontSize: 12, // ), - SizedBox( - width: 30, - ), +// SizedBox( +// width: 30, +// ), Text( "(${widget.item.approvedTotalReviews}${TranslationBase.of(context).review})", style: TextStyle( @@ -291,7 +304,7 @@ class _ProductNameAndPriceState extends State { ), ), SizedBox( - height: 30, + height: 20, ), ], ), diff --git a/lib/pages/pharmacies/screens/product-details/reviews_info.dart b/lib/pages/pharmacies/screens/product-details/reviews_info.dart index e3050927..c4526790 100644 --- a/lib/pages/pharmacies/screens/product-details/reviews_info.dart +++ b/lib/pages/pharmacies/screens/product-details/reviews_info.dart @@ -41,8 +41,8 @@ class ReviewsInfo extends StatelessWidget { // .reviews[index].customerId // .toString(), style: TextStyle( - fontSize: 17, - color: Colors.grey, + fontSize: 14, + color: Colors.black, fontWeight: FontWeight.w600), ), ), @@ -83,10 +83,10 @@ class ReviewsInfo extends StatelessWidget { ), ); }, - ) + ) : Container( padding: EdgeInsets.fromLTRB(15,15,15,20), - margin: EdgeInsets.only(bottom: 20), + margin: EdgeInsets.only(bottom: 40), alignment: Alignment.center, child: Text( TranslationBase.of(context).noReviewsAvailable,