From d6eeb02c913f7407e642a4a54158f5ab2895bafb Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 24 Nov 2021 17:30:00 +0200 Subject: [PATCH] fix on design --- lib/config/localized_values.dart | 2 +- .../product-details/footor/footer-widget.dart | 34 +++++++++++-------- .../product-details/product-detail.dart | 4 +-- .../product-details/shared/icon_with_bg.dart | 28 +++++++++++---- .../shared/product_details_app_bar.dart | 5 +-- lib/widgets/buttons/secondary_button.dart | 5 +-- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index aa9c5b16..77a81ddf 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1082,7 +1082,7 @@ const Map localizedValues = { "removeFromWishlist": {"en": "Remove From Wishlist", "ar": "احذف للمفضلة"}, "noData": {"en": "There is no data", "ar": "لايوجد بيانات"}, "no_data": {"en": "No data", "ar": "لايوجد بيانات"}, - "buyNow": {"en": "buy now", "ar": "إشتري الان"}, + "buyNow": {"en": "Buy Now", "ar": "إشتري الان"}, "quantityShortcut": {"en": "QTY", "ar": "كمية"}, "pharmacyServiceTermsCondition": {"en": "I agree with the terms of service and I adhere to them unconditionally", "ar": " موافق على شروط الخدمة وألتزم بها دون قيد أو شرط"}, "Year": {"en": "YEAR", "ar": "السنة"}, diff --git a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart index abe3328b..e0cf8168 100644 --- a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart +++ b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:flutter/material.dart'; @@ -79,10 +80,11 @@ class _FooterWidgetState extends State { children: [ Padding( padding: const EdgeInsets.all(8.0), - child: Text( - TranslationBase.of(context).quantity, - style: TextStyle( - fontSize: 15, fontWeight: FontWeight.bold), + child: Texts( + TranslationBase.of(context).productQuantity, + fontSize: 15, + fontWeight: FontWeight.bold, + color: Color(0xFF575757) ), ), InkWell( @@ -144,7 +146,7 @@ class _FooterWidgetState extends State { ), ) : Container( - height: 20, + height: 10, ), Container( height: 58, @@ -164,23 +166,25 @@ class _FooterWidgetState extends State { AppText( TranslationBase.of(context).productQuantity, fontSize: 10, - + fontWeight: FontWeight.w600, ), Row( - children: [ AppText( widget.quantity.toString(), fontSize: 16, fontWeight: FontWeight.bold, - ), + ), SizedBox( width: 20, ), - Icon(Icons.keyboard_arrow_down,color: Color(0xFF2E303A),size: 25,) + Icon( + Icons.keyboard_arrow_down, + color: Color(0xFF2E303A), + size: 25, + ) ], ), - ], ), SizedBox( @@ -216,10 +220,11 @@ class _FooterWidgetState extends State { Container( width: MediaQuery.of(context).size.width * 0.35, child: SecondaryButton( - label: TranslationBase.of(context).addToCart.toUpperCase(), + label: TranslationBase.of(context).addToCart, disabled: (!widget.isAvailable && widget.quantity > 0) || widget.quantity > widget.quantityLimit || widget.item.isRx, + fontSize: 16, onTap: () async { if (!authenticatedUserObject.isLogin) { login(); @@ -232,7 +237,7 @@ class _FooterWidgetState extends State { fontWeight: FontWeight.w600, borderColor: Color(0xFF4CAF50).withOpacity(0.7), borderRadius: 6, - color: Color(0xFF5AB145).withOpacity(0.7), + color: Color(0xFF535353), ), ), SizedBox( @@ -241,7 +246,8 @@ class _FooterWidgetState extends State { Container( width: MediaQuery.of(context).size.width * 0.35, child: SecondaryButton( - label: TranslationBase.of(context).buyNow.toUpperCase(), + label: TranslationBase.of(context).buyNow, + fontSize: 16, disabled: (!widget.isAvailable && widget.quantity > 0) || (widget.quantity > widget.quantityLimit) || widget.item.isRx, @@ -263,7 +269,7 @@ class _FooterWidgetState extends State { widget.quantity > widget.quantityLimit || widget.item.isRx ? Color(0xFF535353).withOpacity(0.7) - : Colors.grey[800], + : Color(0xFF5AB145), ), ), ], diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index acbdb0a3..49e295ea 100644 --- a/lib/pages/pharmacies/screens/product-details/product-detail.dart +++ b/lib/pages/pharmacies/screens/product-details/product-detail.dart @@ -136,7 +136,7 @@ class __ProductDetailPageState extends State { if(model.isStockAvailable!= null && !model.isStockAvailable) Container( height: MediaQuery.of(context).size.height * .40, - color: Colors.white.withOpacity(0.75), + color: Colors.white.withOpacity(0.6), // child: AppText("Out of Stock"), ), if(model.isStockAvailable!= null && !model.isStockAvailable) @@ -150,7 +150,7 @@ class __ProductDetailPageState extends State { // color: Colors.white.withOpacity(0.75), child: RotationTransition( turns: new AlwaysStoppedAnimation(310 / 360), - child: AppText(TranslationBase.of(context).productOutOfStock ,color:Color(0xFF000000).withOpacity(0.1),fontSize: projectViewModel.isArabic?40: 50, fontWeight: FontWeight.bold ,)), + child: AppText(TranslationBase.of(context).productOutOfStock ,color:Color(0xFF000000).withOpacity(0.19),fontSize: projectViewModel.isArabic?40: 50, fontWeight: FontWeight.bold ,)), ), ), ), diff --git a/lib/pages/pharmacies/screens/product-details/shared/icon_with_bg.dart b/lib/pages/pharmacies/screens/product-details/shared/icon_with_bg.dart index f2406614..a78f04b8 100644 --- a/lib/pages/pharmacies/screens/product-details/shared/icon_with_bg.dart +++ b/lib/pages/pharmacies/screens/product-details/shared/icon_with_bg.dart @@ -1,15 +1,20 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; class IconWithBg extends StatelessWidget { final IconData icon; final Color color; final Function onPress; + final bool hasPadding; - const IconWithBg({Key key, this.icon, this.color, this.onPress}) + IconWithBg( + {Key key, this.icon, this.color, this.onPress, this.hasPadding = false}) : super(key: key); @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return Container( width: 40, height: 40, @@ -18,12 +23,21 @@ class IconWithBg extends StatelessWidget { borderRadius: BorderRadius.circular(30), ), child: Center( - child: IconButton( - icon: Icon(icon, size: 20,), - color: color, - onPressed: () async { - onPress(); - }, + child: Padding( + padding: EdgeInsets.only( + left: !projectViewModel.isArabic ? (hasPadding ? 4 : 0) : 0, + right: projectViewModel.isArabic ? (hasPadding ? 4 : 0) : 0 + ), + child: IconButton( + icon: Icon( + icon, + size: 20, + ), + color: color, + onPressed: () async { + onPress(); + }, + ), ), )); } diff --git a/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart b/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart index ca59a0fb..d40f222b 100644 --- a/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart +++ b/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart @@ -3,7 +3,6 @@ import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page_pharmcy.dart'; -import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; @@ -57,10 +56,12 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Row( - // mainAxisAlignment: MainAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, children: [ IconWithBg( icon: Icons.arrow_back_ios, + hasPadding: true, color: Color(0xFF2B353E), onPress: () { Navigator.pop(context); diff --git a/lib/widgets/buttons/secondary_button.dart b/lib/widgets/buttons/secondary_button.dart index e62a4a3b..8f0ae5f1 100644 --- a/lib/widgets/buttons/secondary_button.dart +++ b/lib/widgets/buttons/secondary_button.dart @@ -30,7 +30,7 @@ class SecondaryButton extends StatefulWidget { this.noBorderRadius = false, this.borderRadius, this.disableColor, - this.fontWeight}) + this.fontWeight, this.fontSize}) : super(key: key); final String label; @@ -47,6 +47,7 @@ class SecondaryButton extends StatefulWidget { final double borderRadius; final Color disableColor; final FontWeight fontWeight; + final double fontSize; @override @@ -247,7 +248,7 @@ class _SecondaryButtonState extends State widget.label, style: TextStyle( color: widget.textColor, - fontSize: widget.small ? 12.0 : 14.0, + fontSize: widget.small ? 12.0 : widget.fontSize??14.0, fontWeight: FontWeight.w700, fontFamily: projectViewModel.isArabic ? 'Cairo'