first step from product details

merge-requests/542/head
Elham Rababh 4 years ago
parent a71e7e4075
commit c6be53d800

@ -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": "كمية"},
};

@ -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<FooterWidget> {
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<FooterWidget> {
: null,
),
),
SizedBox(
width: 10,
),

@ -49,6 +49,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
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,

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

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

@ -248,10 +248,10 @@ class _SecondaryButtonState extends State<SecondaryButton>
style: TextStyle(
color: widget.textColor,
fontSize: widget.small ? 12.0 : 14.0,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w700,
fontFamily: projectViewModel.isArabic
? 'Cairo'
: 'WorkSans'
: 'Poppins'
),
),
)

@ -272,7 +272,7 @@ class _TextsState extends State<Texts> {
style: _getFontStyle().copyWith(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.w800,
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans',
fontFamily: projectViewModel.isArabic ? 'Poppins' : 'Poppins',
),
),
),

@ -60,11 +60,13 @@ class _AppTextState extends State<AppText> {
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

Loading…
Cancel
Save