fix issues

merge-requests/551/head
Fatimah Alshammari 4 years ago
parent dbe74b3eb4
commit fb974af726

@ -22,33 +22,34 @@ class DetailsInfo extends StatelessWidget {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Container( // Container(
child: Texts( // child: Texts(
TranslationBase.of(context) // TranslationBase.of(context)
.description, // .description,
fontSize: 17, // fontSize: 17,
color: Colors.grey, // color: Colors.grey,
), // ),
), // ),
// SizedBox(
// height: 10,
// ),
// Divider(height: 1, color: Colors.grey),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Divider(height: 1, color: Colors.grey),
SizedBox(
height: 15,
),
Container( Container(
child: Texts( margin: EdgeInsets.only(left: 10, right: 10),
child: Text(
projectViewModel.isArabic projectViewModel.isArabic
? product.fullDescriptionn ? product.fullDescriptionn
: product : product
.fullDescription ?? .fullDescription ??
"", "",
fontSize: 16, style: TextStyle(fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.56),
), ),
), ),
SizedBox( SizedBox(
height: 20, height: 60,
), ),
]), ]),
); );

@ -205,7 +205,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).details, TranslationBase.of(context).details,
style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14), style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.84),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -236,7 +236,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).reviews, TranslationBase.of(context).reviews,
style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14), style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.84),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -266,7 +266,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
: null, : null,
child: Text( child: Text(
TranslationBase.of(context).availability, TranslationBase.of(context).availability,
style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14), style: TextStyle( fontWeight: FontWeight.w600, fontSize: 14, letterSpacing:-0.84),
), ),
color: Colors.white, color: Colors.white,
), ),

@ -70,7 +70,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
style: TextStyle(color: Colors.white, style: TextStyle(color: Colors.white,
// regular: true, // regular: true,
fontSize: 17, fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600, letterSpacing:-0.68
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
) )
), ),
@ -79,14 +79,14 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
) )
: Container(), : Container(),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.93,
child: Row( child: Row(
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),
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, right: 11,),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: getStatusBackgroundColor(), color: getStatusBackgroundColor(),
@ -97,7 +97,7 @@ 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),letterSpacing:-0.44),
//color: widget.isStockAvailable ? Colors.white : Colors.red, //color: widget.isStockAvailable ? Colors.white : Colors.red,
), ),
), ),
@ -177,14 +177,14 @@ 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: 12),
child: Container( child: Container(
margin: EdgeInsets.only(left: 5, right: 5), margin: EdgeInsets.only(left: 10, right: 10),
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 ? widget.item.namen : widget.item.name,
style: TextStyle( fontWeight: FontWeight.w600, fontSize: 16), style: TextStyle( fontWeight: FontWeight.w600, fontSize: 16, letterSpacing:-0.96),
), ),
), ),
), ),
@ -193,12 +193,12 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
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: 10, right: 10),
child: Align( child: Align(
alignment: projectViewModel.isArabic ? Alignment.topRight : Alignment.topLeft, alignment: projectViewModel.isArabic ? Alignment.topRight : Alignment.topLeft,
child: Text( TranslationBase.of(context).sar+ " " + 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, letterSpacing:-0.76),),
), ),
), ),
@ -208,6 +208,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
child: Row( child: Row(
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 8, right: 8),
child: Align( child: Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Row( child: Row(
@ -223,16 +224,16 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
emptyIcon: Icons.star_border, emptyIcon: Icons.star_border,
), ),
SizedBox( SizedBox(
width: 10, width: 5,
), ),
// Texts( // Texts(
// "${widget.item.approvedRatingSum}", // "${widget.item.approvedRatingSum}",
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
// fontSize: 12, // fontSize: 12,
// ), // ),
SizedBox( // SizedBox(
width: 30, // width: 30,
), // ),
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),
@ -257,7 +258,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
), ),
SizedBox( SizedBox(
height: 30, height: 20,
), ),
], ],
), ),

@ -41,8 +41,8 @@ class ReviewsInfo extends StatelessWidget {
// .reviews[index].customerId // .reviews[index].customerId
// .toString(), // .toString(),
style: TextStyle( style: TextStyle(
fontSize: 17, fontSize: 14,
color: Colors.grey, color: Colors.black,
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
), ),
), ),
@ -83,10 +83,10 @@ class ReviewsInfo extends StatelessWidget {
), ),
); );
}, },
) )
: Container( : Container(
padding: EdgeInsets.fromLTRB(15,15,15,20), padding: EdgeInsets.fromLTRB(15,15,15,20),
margin: EdgeInsets.only(bottom: 20), margin: EdgeInsets.only(bottom: 40),
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
TranslationBase.of(context).noReviewsAvailable, TranslationBase.of(context).noReviewsAvailable,

Loading…
Cancel
Save