From f88c43802204ba827975c07f9d54250b07dd0027 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Wed, 22 Nov 2023 13:58:52 +0300 Subject: [PATCH] Apply design changes on labels --- lib/l10n/app_ar.arb | 8 +++++-- lib/l10n/app_en.arb | 8 +++++-- .../land_page/contact_us_bottom_sheet.dart | 23 +++++++++++++++++-- .../create_sub_workorder_page.dart | 2 +- .../requests/create_service_request_page.dart | 8 +++---- .../requests/update_service_request_page.dart | 2 +- .../work_order/create_service_report.dart | 2 +- .../work_order/edit_service_report.dart | 2 +- 8 files changed, 41 insertions(+), 14 deletions(-) diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index f043327..6e2c05b 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -259,8 +259,9 @@ "filter" : "تصنيف", "pickAsset" : "إختر جهاز", "firstAction" : "الإجراء الأول", - "priority" : "الأولوية", + "priority" : "أولوية الوظيفة", "equipmentStatus" : "حالة المعدات", + "jopStatus" : "حالة الوظيفة", "attachImage" : "إرفاق صورة", "callComments" : "تعليقات الطلب", "comments" : "تعليقات", @@ -371,5 +372,8 @@ "reset" : "اعادة تعيين", "solution" : "الحل", "technicalComment" : "تعليق تقني", - "recentActivities" : "الأنشطة الحالية" + "recentActivities" : "الأنشطة الحالية", + "problemDesc" : "وصف المشكلة", + "source": "المصدر", + "costCodeName" : "اسم رمز التكلفة" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 8e1727d..314676a 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -264,8 +264,9 @@ "viewWorkOrder" : "View All Work Order", "createWorkOrder" : "Create Work Order", "serviceDetails": "Service Details", - "priority" : "Priority", + "priority" : "Jop Priority", "equipmentStatus" : "Equipment Status", + "jopStatus" : "Jop Status", "attachImage" : "Attach Image", "callComments" : "Call Comments", "comments": "Comments", @@ -374,5 +375,8 @@ "reset" : "Reset", "solution" : "Solution", "technicalComment" : "Technical Comment", - "recentActivities" : "Recent Activities" + "recentActivities" : "Recent Activities", + "problemDesc" : "Problem Description", + "source": "Source", + "costCodeName" : "Cost Code Name" } \ No newline at end of file diff --git a/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart b/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart index 72b1d6a..e85c80e 100644 --- a/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart +++ b/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart @@ -1,9 +1,12 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:url_launcher/url_launcher_string.dart'; import '../../app_style/app_color.dart'; @@ -12,6 +15,7 @@ class ContactUsBottomSheet extends StatelessWidget { @override Widget build(BuildContext context) { + const contactNumber = "+966 546345567"; return Container( clipBehavior: Clip.antiAlias, decoration: BoxDecoration( @@ -41,9 +45,13 @@ class ContactUsBottomSheet extends StatelessWidget { 16.height, Row( children: [ - contactItem(context, context.isDark, "phone", context.translation.callUs, "+966 546345567").onPress(() {}).expanded, + contactItem(context, context.isDark, "phone", context.translation.callUs, contactNumber).onPress(() { + launchUrlString("tel://$contactNumber"); + }).expanded, 16.width, - contactItem(context, context.isDark, "whatsapp", context.translation.liveChat, context.translation.openWhatsapp).onPress(() {}).expanded, + contactItem(context, context.isDark, "whatsapp", context.translation.liveChat, context.translation.openWhatsapp).onPress(() { + _launchWhatsapp(contactNumber); + }).expanded, ], ), 32.height, @@ -52,6 +60,17 @@ class ContactUsBottomSheet extends StatelessWidget { ); } + void _launchWhatsapp(String number) async { + const url = "https://wa.me/"; + var androidUrl = "https://wa.me/$number&text=Hi, I need some help"; + var iosUrl = "https://wa.me/$number?text=${Uri.parse('Hi, I need some help')}"; + if (await canLaunchUrlString(Platform.isAndroid ? androidUrl : iosUrl)) { + await launchUrlString(Platform.isAndroid ? androidUrl : iosUrl); + } else { + throw 'Could not launch $url'; + } + } + Widget contactItem(BuildContext context, bool isDark, String iconName, String title, String subtitle) { return Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 4162a15..c7d9e2f 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -218,7 +218,7 @@ class _CreateSubWorkOrderPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.equipmentStatus, + title: context.translation.jopStatus, initialValue: _subWorkOrders.equipmentStatus, onSelect: (value) { _subWorkOrders.equipmentStatus = value; diff --git a/lib/views/pages/user/requests/create_service_request_page.dart b/lib/views/pages/user/requests/create_service_request_page.dart index fbad447..ed1eaea 100644 --- a/lib/views/pages/user/requests/create_service_request_page.dart +++ b/lib/views/pages/user/requests/create_service_request_page.dart @@ -146,7 +146,7 @@ class CreateServiceRequestPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.equipmentStatus, + title: context.translation.jopStatus, initialValue: _serviceRequest?.defectType, onSelect: (value) { _serviceRequest.defectType = value; @@ -157,14 +157,14 @@ class CreateServiceRequestPageState extends State { return SingleItemDropDownMenu( context: context, enabled: false, - title: context.translation.requestedThrough, + title: context.translation.source, initialValue: snapshot.items?.firstWhere((element) => element.value == 3, orElse: () => null), ); }), 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.typeOfRequest, + title: context.translation.costCodeName, initialValue: _serviceRequest?.type, onSelect: (value) { _serviceRequest.type = value; @@ -180,7 +180,7 @@ class CreateServiceRequestPageState extends State { 8.height, AppTextFormField( controller: _commentController, - labelText: context.translation.comments, + labelText: context.translation.problemDesc, suffixIcon: "warning".toSvgAsset(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, width: 24).paddingOnly(end: 16), initialValue: _serviceRequest.callComments, onSaved: (text) { diff --git a/lib/views/pages/user/requests/update_service_request_page.dart b/lib/views/pages/user/requests/update_service_request_page.dart index 8fdd323..3414e1e 100644 --- a/lib/views/pages/user/requests/update_service_request_page.dart +++ b/lib/views/pages/user/requests/update_service_request_page.dart @@ -89,7 +89,7 @@ class _UpdateServiceRequestPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.equipmentStatus, + title: context.translation.jopStatus, initialValue: widget.serviceRequest?.defectType, onSelect: (value) { widget.serviceRequest.defectType = value; diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index 1686331..140e580 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -185,7 +185,7 @@ class _CreateServiceReportState extends State with TickerPr 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.equipmentStatus, + title: context.translation.jopStatus, initialValue: _serviceReport.equipmentStatus, onSelect: (value) { _serviceReport.equipmentStatus = value; diff --git a/lib/views/pages/user/requests/work_order/edit_service_report.dart b/lib/views/pages/user/requests/work_order/edit_service_report.dart index 1025f68..4d57b11 100644 --- a/lib/views/pages/user/requests/work_order/edit_service_report.dart +++ b/lib/views/pages/user/requests/work_order/edit_service_report.dart @@ -170,7 +170,7 @@ class _EditServiceReportState extends State with TickerProvid 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.equipmentStatus, + title: context.translation.jopStatus, initialValue: _serviceReport.equipmentStatus, onSelect: (value) { _serviceReport.equipmentStatus = value;