replace bottom sheet button

merge-update-with-lab-changes
Elham Rababh 5 years ago
parent 6fe41382c0
commit d5f1a162c0

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -22,13 +23,11 @@ class DetailsInfo extends StatelessWidget {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Container( Container(
child: Text( child: Texts(
TranslationBase.of(context) TranslationBase.of(context)
.description, .description,
style: TextStyle( fontSize: 17,
fontSize: 17, color: Colors.grey,
color: Colors.grey,
fontWeight: FontWeight.w600),
), ),
), ),
SizedBox( SizedBox(
@ -39,15 +38,13 @@ class DetailsInfo extends StatelessWidget {
height: 15, height: 15,
), ),
Container( Container(
child: Text( child: Texts(
projectViewModel.isArabic projectViewModel.isArabic
? product.fullDescriptionn ? product.fullDescriptionn
: product : product
.fullDescription ?? .fullDescription ??
"", "",
style: TextStyle( fontSize: 16,
fontSize: 16,
fontFamily: 'WorkSans-Regular'),
), ),
), ),
SizedBox( SizedBox(

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -403,84 +404,47 @@ class _FooterWidgetState extends State<FooterWidget> {
}, },
), ),
), ),
!widget.isAvailble && widget.price > 0 ||
widget.price > widget.quantityLimit || Container(
widget.item.rxMessage != null width: MediaQuery.of(context).size.width* 0.4,
? Container( child: SecondaryButton(
width: 190, label: TranslationBase.of(context).addToCart.toUpperCase(),
height: 46, disabled: !widget.isAvailble && widget.price > 0 ||
color: Colors.grey, widget.price > widget.quantityLimit ||
child: Align( widget.item.rxMessage != null,
alignment: Alignment.center, onTap: () {
child: Text( widget.addToCartFunction(widget.price, widget.item.id, context);
TranslationBase.of(context).addToCart, },
style: TextStyle( borderRadius: 5,
color: Colors.white, color:Colors.green,
fontWeight: FontWeight.bold,
fontSize: 15),
),
),
)
: InkWell(
onTap: () {
widget.addToCartFunction(widget.price, widget.item.id, context);
},
child: Container(
alignment: Alignment.center,
width: 190,
height: 46,
color: Colors.green,
child: Text(
TranslationBase.of(context).addToCart,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 15),
),
), ),
), ),
SizedBox( SizedBox(
width: 5, width: 5,
), ),
!widget.isAvailble && widget.price > 0 ||
widget.price > widget.quantityLimit || Container(
widget.item.rxMessage != null width: MediaQuery.of(context).size.width* 0.3,
? Container( child: SecondaryButton(
width: 120, label: TranslationBase.of(context).buyNow.toUpperCase(),
height: 46, disabled: !widget.isAvailble && widget.price > 0 ||
color: Colors.grey, widget.price > widget.quantityLimit ||
child: Align( widget.item.rxMessage != null,
alignment: Alignment.center, onTap: () {
child: Text( widget.addToCartFunction(
TranslationBase.of(context).buyNow, widget.price, widget.item.id, context);
style: TextStyle( Navigator.push(
color: Colors.white, context,
fontWeight: FontWeight.bold, FadePage(page: CartOrderPage()),
fontSize: 15), );
), },
), borderRadius: 5,
) color: !widget.isAvailble && widget.price > 0 ||
: InkWell( widget.price > widget.quantityLimit ||
onTap: () { widget.item.rxMessage != null?Colors.grey:Colors.grey[800],
print('buy now');
widget.addToCartFunction(widget.price, widget.item.id, context);
Navigator.push(
context,
FadePage(page: CartOrderPage()),
);
},
child: Container(
alignment: Alignment.center,
width: 120,
height: 46,
color: Colors.blue,
child: Text(
TranslationBase.of(context).buyNow,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 15),
),
), ),
), ),
], ],

@ -157,8 +157,7 @@ class __ProductDetailPageState extends State<ProductDetailPage>
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
padding: EdgeInsets.symmetric(vertical: 15, horizontal: 10),
padding: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
child: Texts( child: Texts(
TranslationBase.of(context).specification, TranslationBase.of(context).specification,
fontSize: 15, fontSize: 15,
@ -349,22 +348,26 @@ class __ProductDetailPageState extends State<ProductDetailPage>
], ],
), ),
), ),
Row(
children: [ ///TODO Elham* check if we need recommanded
customerId != null // Row(
? Container( // children: [
width: 410, // customerId != null
height: 50, // ? Container(
color: Colors.white, // width: 410,
child: Texts( // height: 50,
TranslationBase.of(context).recommended, // color: Colors.white,
bold: true, // child: Texts(
), // TranslationBase.of(context).recommended,
) // bold: true,
: Container(), // ),
], // )
), // : Container(),
RecommendedProducts(product: widget.product) // ],
// ),
// RecommendedProducts(product: widget.product)
SizedBox(height: 80,)
], ],
), ),
), ),

@ -143,12 +143,13 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
), ),
SizedBox(width: 10,), SizedBox(width: 10,),
Texts( Texts(
"${widget.item.approvedTotalReviews}", "${widget.item.approvedRatingSum}",
fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
SizedBox(width: 30,), SizedBox(width: 30,),
Texts( Texts(
"(${widget.item.approvedTotalReviews} ${TranslationBase.of(context).review})", "(${widget.item.approvedTotalReviews}${TranslationBase.of(context).review})",
fontSize: 12, fontSize: 12,
), ),
], ],

@ -29,7 +29,7 @@ class SecondaryButton extends StatefulWidget {
this.small = false, this.small = false,
this.disabled = false, this.disabled = false,
this.borderColor, this.borderColor,
this.noBorderRadius = false}) this.noBorderRadius = false, this.borderRadius})
: super(key: key); : super(key: key);
final String label; final String label;
@ -43,6 +43,9 @@ class SecondaryButton extends StatefulWidget {
final bool iconOnly; final bool iconOnly;
final bool disabled; final bool disabled;
final bool noBorderRadius; final bool noBorderRadius;
final double borderRadius;
@override @override
_SecondaryButtonState createState() => _SecondaryButtonState(); _SecondaryButtonState createState() => _SecondaryButtonState();
@ -169,7 +172,7 @@ class _SecondaryButtonState extends State<SecondaryButton>
child: ClipRRect( child: ClipRRect(
borderRadius: widget.noBorderRadius borderRadius: widget.noBorderRadius
? BorderRadius.all(Radius.circular(0.0)) ? BorderRadius.all(Radius.circular(0.0))
: BorderRadius.all(Radius.circular(10.0)), : BorderRadius.all(Radius.circular(widget.borderRadius??10.0)),
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
Positioned( Positioned(

Loading…
Cancel
Save