From c6be53d800cd99824c6b00ccb0dd306b55017de7 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 23 Nov 2021 13:00:33 +0200 Subject: [PATCH] first step from product details --- lib/config/localized_values.dart | 1 + .../product-details/footor/footer-widget.dart | 51 +++++++++++++------ .../product-name-and-price.dart | 1 + .../shared/product_details_app_bar.dart | 9 ++-- lib/uitl/translations_delegate_base.dart | 1 + lib/widgets/buttons/secondary_button.dart | 4 +- lib/widgets/data_display/text.dart | 2 +- lib/widgets/text/app_texts_widget.dart | 2 + 8 files changed, 47 insertions(+), 24 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 923a561c..aa9c5b16 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1735,5 +1735,6 @@ const Map localizedValues = { "availableBalance": {"en": "Available Balance", "ar": "الرصيد المتوفر"}, "ordersDashboard": {"en": "My Orders", "ar": "طلباتي"}, "productOutOfStock": {"en": "Out Of Stock", "ar": "إنتهى من المخزن"}, + "productQuantity": {"en": "Quantity", "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 e8f09a4c..abe3328b 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/text/app_texts_widget.dart'; import 'package:flutter/material.dart'; import '../../../../../locator.dart'; @@ -152,25 +153,44 @@ class _FooterWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 90, height: 60, child: FlatButton( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, + child: Row( children: [ - Expanded( - flex: 4, - child: Text( - widget.quantity.toString(), - style: TextStyle(fontSize: 20), - ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).productQuantity, + fontSize: 10, + + ), + Row( + + children: [ + AppText( + widget.quantity.toString(), + fontSize: 16, + fontWeight: FontWeight.bold, + ), + SizedBox( + width: 20, + ), + Icon(Icons.keyboard_arrow_down,color: Color(0xFF2E303A),size: 25,) + ], + ), + + ], ), - Expanded( - flex: 5, - child: Text( - TranslationBase.of(context).quantityShortcut, - style: TextStyle(fontSize: 16), + SizedBox( + width: 10, + ), + SizedBox( + height: 40, + width: 1, + child: Container( + color: Color(0xFFEFEFEF), ), ), ], @@ -190,7 +210,6 @@ class _FooterWidgetState extends State { : null, ), ), - SizedBox( width: 10, ), 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 f71c92a4..65855401 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 @@ -49,6 +49,7 @@ class _ProductNameAndPriceState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Texts(widget.item.price.toString() + " " + TranslationBase.of(context).sar, fontWeight: FontWeight.bold, fontSize: 20), + if(widget.isStockAvailable != null) Texts( widget.stockAvailability, fontWeight: FontWeight.bold, 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 3d10f769..368c3c2d 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 @@ -57,12 +57,11 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Row( - mainAxisAlignment: MainAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.start, children: [ IconWithBg( icon: Icons.arrow_back_ios, color: Color(0xFF2B353E), - onPress: () { Navigator.pop(context); }, @@ -76,7 +75,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { children: [ IconWithBg( icon: Icons.shopping_cart, - color: Colors.grey[800], + color: Color(0xFF2B353E), onPress: () { Navigator.pushAndRemoveUntil( @@ -109,7 +108,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { .quantityCount .toString(), style: "caption", - medium: true, + // medium: true, color: Colors.white, )), ), @@ -121,7 +120,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { ), IconWithBg( icon: FontAwesomeIcons.ellipsisV, - color: Colors.grey, + color: Color(0xFF2B353E), onPress: () { settingModalBottomSheet(context); }, diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index c1270603..9484c69d 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -1117,6 +1117,7 @@ class TranslationBase { String get myPrescription => localizedValues['myPrescription'][locale.languageCode]; String get quantity => localizedValues['quantity'][locale.languageCode]; + String get productQuantity => localizedValues['productQuantity'][locale.languageCode]; String get conditionsHMG => localizedValues['conditionsHMG'][locale.languageCode]; diff --git a/lib/widgets/buttons/secondary_button.dart b/lib/widgets/buttons/secondary_button.dart index dadabc71..e62a4a3b 100644 --- a/lib/widgets/buttons/secondary_button.dart +++ b/lib/widgets/buttons/secondary_button.dart @@ -248,10 +248,10 @@ class _SecondaryButtonState extends State style: TextStyle( color: widget.textColor, fontSize: widget.small ? 12.0 : 14.0, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w700, fontFamily: projectViewModel.isArabic ? 'Cairo' - : 'WorkSans' + : 'Poppins' ), ), ) diff --git a/lib/widgets/data_display/text.dart b/lib/widgets/data_display/text.dart index 4a00c9fe..4b9ac2f9 100644 --- a/lib/widgets/data_display/text.dart +++ b/lib/widgets/data_display/text.dart @@ -272,7 +272,7 @@ class _TextsState extends State { style: _getFontStyle().copyWith( color: Theme.of(context).primaryColor, fontWeight: FontWeight.w800, - fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans', + fontFamily: projectViewModel.isArabic ? 'Poppins' : 'Poppins', ), ), ), diff --git a/lib/widgets/text/app_texts_widget.dart b/lib/widgets/text/app_texts_widget.dart index a143236f..ea62e89a 100644 --- a/lib/widgets/text/app_texts_widget.dart +++ b/lib/widgets/text/app_texts_widget.dart @@ -60,11 +60,13 @@ class _AppTextState extends State { widget.data, textAlign: widget.textAlign, overflow: TextOverflow.clip, + style: TextStyle( color: widget.color == null ? Theme.of(context).textTheme.bodyText1.color : widget.color, fontWeight: widget.fontWeight, fontSize: widget.fontSize ?? (SizeConfig.textMultiplier * 2), height: widget.height, + fontFamily: "Poppins", letterSpacing: widget.letterSpacing, // fontFamily: widget.fontFamily == null // ? projectViewModel.isArabic