fix_issues
Mohammad Aljmma 4 years ago
parent 0f938fafd2
commit 5e8b61bf2d

@ -825,5 +825,10 @@ const Map localizedValues = {
}, },
"orderStatus": {"en": "Order Status", "ar": "حالة الطلب"}, "orderStatus": {"en": "Order Status", "ar": "حالة الطلب"},
"CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"}, "CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"},
"FindUs": {"en": "Find Us", "ar": "اين تجدنا"},
"Feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
"LiveChat": {"en": "Live Chat", "ar": "محادثة مباشرة"},
"Service": {"en": "Service", "ar": "خدمة"},
"HMGServiceLabel": {"en": "HMG Service", 'ar': 'خدمات الحبيب'},
}; };

@ -27,8 +27,8 @@ class _ContactUsPageState extends State<ContactUsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isShowAppBar: true,//widget.isAppbar, isShowAppBar: true,
appBarTitle: "HMG Services",//TranslationBase.of(context).bookAppo, appBarTitle: TranslationBase.of(context).hMGServiceLabel,
isShowDecPage: false, isShowDecPage: false,
body: Container( body: Container(
margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
@ -43,7 +43,7 @@ class _ContactUsPageState extends State<ContactUsPage> {
Expanded( Expanded(
child: CardCommonContact( child: CardCommonContact(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: "Find us", text: TranslationBase.of(context).findUs,
subText: "", subText: "",
type: 0, type: 0,
@ -52,7 +52,7 @@ class _ContactUsPageState extends State<ContactUsPage> {
Expanded( Expanded(
child: CardCommonContact( child: CardCommonContact(
image: 'assets/images/new-design/feedback_icon.png', image: 'assets/images/new-design/feedback_icon.png',
text: "Feedback", text: TranslationBase.of(context).feedback,
subText: "", subText: "",
type: 1), type: 1),
@ -66,21 +66,14 @@ class _ContactUsPageState extends State<ContactUsPage> {
Expanded( Expanded(
child: CardCommonContact( child: CardCommonContact(
image: 'assets/images/new-design/live_chat_icon.png', image: 'assets/images/new-design/live_chat_icon.png',
text: "Live Chat", text: TranslationBase.of(context).liveChat,
subText: "Service", subText: TranslationBase.of(context).service,
type: 2, type: 2,
), ),
), ),
Expanded( Expanded(
child: Opacity( child: Container(),
opacity: 0,
child: CardCommonContact(
image: 'assets/images/new-design/feedback_icon.png',
text: "Feedback",
subText: "",
type: 3),
),
), ),
], ],

@ -1,8 +1,10 @@
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart';
import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.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';
import 'package:provider/provider.dart';
class CardCommonContact extends StatelessWidget { class CardCommonContact extends StatelessWidget {
final image; final image;
@ -17,6 +19,7 @@ class CardCommonContact extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
navigateToSearch(context, this.type); navigateToSearch(context, this.type);
@ -45,10 +48,12 @@ class CardCommonContact extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)), color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)),
), ),
Container( Align(
alignment: Alignment.bottomRight, alignment: projectViewModel.isArabic? Alignment.bottomLeft:Alignment.bottomRight,
margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0), child: Container(
child: Image.asset(this.image, width: 60.0, height: 60.0), margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 8.0),
child: Image.asset(this.image, width: 60.0, height: 60.0),
),
), ),
], ],
), ),

@ -779,7 +779,11 @@ class TranslationBase {
String get orderStatus => localizedValues['orderStatus'][locale.languageCode]; String get orderStatus => localizedValues['orderStatus'][locale.languageCode];
String get cancelOrder => localizedValues['CancelOrder'][locale.languageCode]; String get cancelOrder => localizedValues['CancelOrder'][locale.languageCode];
// String get viewAll => localizedValues['viewMore'][locale.languageCode]; String get findUs => localizedValues['FindUs'][locale.languageCode];
String get feedback => localizedValues['Feedback'][locale.languageCode];
String get liveChat => localizedValues['LiveChat'][locale.languageCode];
String get service => localizedValues['Service'][locale.languageCode];
String get hMGServiceLabel => localizedValues['HMGServiceLabel'][locale.languageCode];
} }

Loading…
Cancel
Save