fix on design

merge-requests/550/head
Elham Rababh 4 years ago
parent 908bf8b634
commit d6eeb02c91

@ -1082,7 +1082,7 @@ const Map localizedValues = {
"removeFromWishlist": {"en": "Remove From Wishlist", "ar": "احذف للمفضلة"}, "removeFromWishlist": {"en": "Remove From Wishlist", "ar": "احذف للمفضلة"},
"noData": {"en": "There is no data", "ar": "لايوجد بيانات"}, "noData": {"en": "There is no data", "ar": "لايوجد بيانات"},
"no_data": {"en": "No data", "ar": "لايوجد بيانات"}, "no_data": {"en": "No data", "ar": "لايوجد بيانات"},
"buyNow": {"en": "buy now", "ar": "إشتري الان"}, "buyNow": {"en": "Buy Now", "ar": "إشتري الان"},
"quantityShortcut": {"en": "QTY", "ar": "كمية"}, "quantityShortcut": {"en": "QTY", "ar": "كمية"},
"pharmacyServiceTermsCondition": {"en": "I agree with the terms of service and I adhere to them unconditionally", "ar": " موافق على شروط الخدمة وألتزم بها دون قيد أو شرط"}, "pharmacyServiceTermsCondition": {"en": "I agree with the terms of service and I adhere to them unconditionally", "ar": " موافق على شروط الخدمة وألتزم بها دون قيد أو شرط"},
"Year": {"en": "YEAR", "ar": "السنة"}, "Year": {"en": "YEAR", "ar": "السنة"},

@ -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/gif_loader_dialog_utils.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/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -79,10 +80,11 @@ class _FooterWidgetState extends State<FooterWidget> {
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Texts(
TranslationBase.of(context).quantity, TranslationBase.of(context).productQuantity,
style: TextStyle( fontSize: 15,
fontSize: 15, fontWeight: FontWeight.bold), fontWeight: FontWeight.bold,
color: Color(0xFF575757)
), ),
), ),
InkWell( InkWell(
@ -144,7 +146,7 @@ class _FooterWidgetState extends State<FooterWidget> {
), ),
) )
: Container( : Container(
height: 20, height: 10,
), ),
Container( Container(
height: 58, height: 58,
@ -164,23 +166,25 @@ class _FooterWidgetState extends State<FooterWidget> {
AppText( AppText(
TranslationBase.of(context).productQuantity, TranslationBase.of(context).productQuantity,
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w600,
), ),
Row( Row(
children: [ children: [
AppText( AppText(
widget.quantity.toString(), widget.quantity.toString(),
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
width: 20, width: 20,
), ),
Icon(Icons.keyboard_arrow_down,color: Color(0xFF2E303A),size: 25,) Icon(
Icons.keyboard_arrow_down,
color: Color(0xFF2E303A),
size: 25,
)
], ],
), ),
], ],
), ),
SizedBox( SizedBox(
@ -216,10 +220,11 @@ class _FooterWidgetState extends State<FooterWidget> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.35, width: MediaQuery.of(context).size.width * 0.35,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).addToCart.toUpperCase(), label: TranslationBase.of(context).addToCart,
disabled: (!widget.isAvailable && widget.quantity > 0) || disabled: (!widget.isAvailable && widget.quantity > 0) ||
widget.quantity > widget.quantityLimit || widget.quantity > widget.quantityLimit ||
widget.item.isRx, widget.item.isRx,
fontSize: 16,
onTap: () async { onTap: () async {
if (!authenticatedUserObject.isLogin) { if (!authenticatedUserObject.isLogin) {
login(); login();
@ -232,7 +237,7 @@ class _FooterWidgetState extends State<FooterWidget> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
borderColor: Color(0xFF4CAF50).withOpacity(0.7), borderColor: Color(0xFF4CAF50).withOpacity(0.7),
borderRadius: 6, borderRadius: 6,
color: Color(0xFF5AB145).withOpacity(0.7), color: Color(0xFF535353),
), ),
), ),
SizedBox( SizedBox(
@ -241,7 +246,8 @@ class _FooterWidgetState extends State<FooterWidget> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.35, width: MediaQuery.of(context).size.width * 0.35,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).buyNow.toUpperCase(), label: TranslationBase.of(context).buyNow,
fontSize: 16,
disabled: (!widget.isAvailable && widget.quantity > 0) || disabled: (!widget.isAvailable && widget.quantity > 0) ||
(widget.quantity > widget.quantityLimit) || (widget.quantity > widget.quantityLimit) ||
widget.item.isRx, widget.item.isRx,
@ -263,7 +269,7 @@ class _FooterWidgetState extends State<FooterWidget> {
widget.quantity > widget.quantityLimit || widget.quantity > widget.quantityLimit ||
widget.item.isRx widget.item.isRx
? Color(0xFF535353).withOpacity(0.7) ? Color(0xFF535353).withOpacity(0.7)
: Colors.grey[800], : Color(0xFF5AB145),
), ),
), ),
], ],

@ -136,7 +136,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
if(model.isStockAvailable!= null && !model.isStockAvailable) if(model.isStockAvailable!= null && !model.isStockAvailable)
Container( Container(
height: MediaQuery.of(context).size.height * .40, height: MediaQuery.of(context).size.height * .40,
color: Colors.white.withOpacity(0.75), color: Colors.white.withOpacity(0.6),
// child: AppText("Out of Stock"), // child: AppText("Out of Stock"),
), ),
if(model.isStockAvailable!= null && !model.isStockAvailable) if(model.isStockAvailable!= null && !model.isStockAvailable)
@ -150,7 +150,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
// color: Colors.white.withOpacity(0.75), // color: Colors.white.withOpacity(0.75),
child: RotationTransition( child: RotationTransition(
turns: new AlwaysStoppedAnimation(310 / 360), 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 ,)),
), ),
), ),
), ),

@ -1,15 +1,20 @@
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class IconWithBg extends StatelessWidget { class IconWithBg extends StatelessWidget {
final IconData icon; final IconData icon;
final Color color; final Color color;
final Function onPress; 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); : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Container( return Container(
width: 40, width: 40,
height: 40, height: 40,
@ -18,12 +23,21 @@ class IconWithBg extends StatelessWidget {
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
), ),
child: Center( child: Center(
child: IconButton( child: Padding(
icon: Icon(icon, size: 20,), padding: EdgeInsets.only(
color: color, left: !projectViewModel.isArabic ? (hasPadding ? 4 : 0) : 0,
onPressed: () async { right: projectViewModel.isArabic ? (hasPadding ? 4 : 0) : 0
onPress(); ),
}, child: IconButton(
icon: Icon(
icon,
size: 20,
),
color: color,
onPressed: () async {
onPress();
},
),
), ),
)); ));
} }

@ -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/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.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/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/pages/pharmacies/screens/product-details/product-detail.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
@ -57,10 +56,12 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Row(
// mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
IconWithBg( IconWithBg(
icon: Icons.arrow_back_ios, icon: Icons.arrow_back_ios,
hasPadding: true,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
onPress: () { onPress: () {
Navigator.pop(context); Navigator.pop(context);

@ -30,7 +30,7 @@ class SecondaryButton extends StatefulWidget {
this.noBorderRadius = false, this.noBorderRadius = false,
this.borderRadius, this.borderRadius,
this.disableColor, this.disableColor,
this.fontWeight}) this.fontWeight, this.fontSize})
: super(key: key); : super(key: key);
final String label; final String label;
@ -47,6 +47,7 @@ class SecondaryButton extends StatefulWidget {
final double borderRadius; final double borderRadius;
final Color disableColor; final Color disableColor;
final FontWeight fontWeight; final FontWeight fontWeight;
final double fontSize;
@override @override
@ -247,7 +248,7 @@ class _SecondaryButtonState extends State<SecondaryButton>
widget.label, widget.label,
style: TextStyle( style: TextStyle(
color: widget.textColor, color: widget.textColor,
fontSize: widget.small ? 12.0 : 14.0, fontSize: widget.small ? 12.0 : widget.fontSize??14.0,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontFamily: projectViewModel.isArabic fontFamily: projectViewModel.isArabic
? 'Cairo' ? 'Cairo'

Loading…
Cancel
Save