Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'

Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!551
merge-update-with-lab-changes
haroon amjad 4 years ago
commit f06122d084

@ -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,
), ),
]), ]),
); );

@ -233,7 +233,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,
), ),
@ -264,7 +264,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,
), ),
@ -294,7 +294,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,
), ),

@ -81,13 +81,14 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
// regular: true, // regular: true,
fontSize: 17, fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing:-0.68
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
)), )),
], ],
)) ))
: Container(), : Container(),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.93,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -105,18 +106,23 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
color: getStatusBackgroundColor(), color: getStatusBackgroundColor(),
borderRadius: BorderRadius.circular(30.0)), borderRadius: BorderRadius.circular(30.0)),
child: Text( // child: Text(
widget.stockAvailability, // widget.stockAvailability,
style: TextStyle( // style: TextStyle(
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
fontSize: 11, // fontSize: 11,
color: Color(0xffFFFFFF), // color: Color(0xffFFFFFF),
), // ),
//color: widget.isStockAvailable ? Colors.white : Colors.red, // 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), // SizedBox(width: 20),
if (widget.authenticatedUserObject.isLogin) if (
widget.authenticatedUserObject.isLogin)
widget.stockAvailability != null && widget.stockAvailability != null &&
!widget.isStockAvailable && !widget.isStockAvailable &&
widget.customerId != null widget.customerId != null
@ -202,9 +208,9 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
Padding( Padding(
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( child: Container(
margin: EdgeInsets.only(left: 5, right: 5), margin: EdgeInsets.only(left: 10, right: 10),
child: Align( child: Align(
alignment: projectViewModel.isArabic alignment: projectViewModel.isArabic
? Alignment.topRight ? Alignment.topRight
@ -213,7 +219,10 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
projectViewModel.isArabic projectViewModel.isArabic
? widget.item.namen ? widget.item.namen
: widget.item.name, : 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<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: projectViewModel.isArabic
? Alignment.topRight ? Alignment.topRight
@ -230,7 +239,10 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
TranslationBase.of(context).sar + 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),
), ),
), ),
), ),
@ -240,6 +252,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(
@ -256,16 +269,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( style: TextStyle(
@ -291,7 +304,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