From a18acb9871ff6d9042b91c744757b7e19a2ba843 Mon Sep 17 00:00:00 2001 From: Rand Alshammari Date: Mon, 20 Jul 2026 11:12:21 +0300 Subject: [PATCH] fixed issues --- .../branch/branch_detail_page.dart | 3 +- .../branch/branch_list_page.dart | 28 +++++++++++++++++-- .../services/services_list_page.dart | 7 +++-- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/lib/views/branch_management/branch/branch_detail_page.dart b/lib/views/branch_management/branch/branch_detail_page.dart index bbb81fc..55b0cad 100644 --- a/lib/views/branch_management/branch/branch_detail_page.dart +++ b/lib/views/branch_management/branch/branch_detail_page.dart @@ -221,6 +221,7 @@ class _BranchDetailPageState extends State { @override Widget build(BuildContext context) { + bool isArabic = AppState().isArabic(context); return Scaffold( appBar: CustomAppBar(title: LocaleKeys.branchDetail.tr()), body: Consumer(builder: (context, serviceVM, _) { @@ -267,7 +268,7 @@ class _BranchDetailPageState extends State { ), Column( children: [ - showData("${LocaleKeys.location.tr()}:", "${widget.branchData.cityName.toString()}, ${widget.branchData.countryName.toString()}"), + showData("${LocaleKeys.location.tr()}:", "${isArabic ? widget.branchData.cityName.toString() : widget.branchData.cityName.toString()}, ${widget.branchData.countryName.toString()}"), showData("${LocaleKeys.provider.tr()}:", widget.branchData.serviceProviderName.toString()), showData("${LocaleKeys.time.tr()}:", "${widget.branchData.openTime.toString()} - ${widget.branchData.closeTime.toString()}"), showData("${LocaleKeys.address.tr()}:", widget.branchData.address.toString()), diff --git a/lib/views/branch_management/branch/branch_list_page.dart b/lib/views/branch_management/branch/branch_list_page.dart index fa439f3..068e951 100644 --- a/lib/views/branch_management/branch/branch_list_page.dart +++ b/lib/views/branch_management/branch/branch_list_page.dart @@ -1,6 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; @@ -59,6 +60,7 @@ class BranchListPage extends StatelessWidget { @override Widget build(BuildContext context) { + bool isArabic = AppState().isArabic(context); return Scaffold( appBar: CustomAppBar( title: LocaleKeys.myBranches.tr(), @@ -74,15 +76,35 @@ class BranchListPage extends StatelessWidget { Padding( padding: const EdgeInsets.only(left: 21, right: 21, top: 21), child: RoleTypeTab( - context.watch().selectedBranchStatus == 3 ? 0 : context.watch().selectedBranchStatus, + context.watch().selectedBranchStatus == 3 + ? 0 + : context.watch().selectedBranchStatus, [ - DropValue(3, "Active", ""), - DropValue(1, "Requested", ""), + DropValue( + 3, + isArabic ? "نشط" : "Active", + "", + ), + DropValue( + 1, + isArabic ? "مطلوب" : "Requested", + "", + ), ], onSelect: (DropValue value) { context.read().updateSelectedBranchType(value.id); }, ), + // child: RoleTypeTab( + // context.watch().selectedBranchStatus == 3 ? 0 : context.watch().selectedBranchStatus, + // [ + // DropValue(3, "Active", ""), + // DropValue(1, "Requested", ""), + // ], + // onSelect: (DropValue value) { + // context.read().updateSelectedBranchType(value.id); + // }, + // ), ), Expanded( child: Consumer( diff --git a/lib/views/branch_management/services/services_list_page.dart b/lib/views/branch_management/services/services_list_page.dart index 827b04e..d065214 100644 --- a/lib/views/branch_management/services/services_list_page.dart +++ b/lib/views/branch_management/services/services_list_page.dart @@ -5,6 +5,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; @@ -88,6 +89,7 @@ class _ServicesListPageState extends State { bool isEditDisabled = false; Widget buildCategoryTileWidget() { + bool isArabic = AppState().isArabic(context); return Row( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, @@ -111,7 +113,7 @@ class _ServicesListPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Flexible(child: categoryData.categoryName.toString().toText(fontSize: 16)), + Flexible(child: isArabic ? categoryData.categoryNameN.toString().toText(fontSize: 16) : categoryData.categoryName.toString().toText(fontSize: 16)), ], ), // 5.height, @@ -280,6 +282,7 @@ class _ServicesListPageState extends State { ) : ListView.separated( itemBuilder: (context, index) { + bool isArabic = AppState().isArabic(context); return SizedBox( width: double.infinity, child: Column( @@ -291,7 +294,7 @@ class _ServicesListPageState extends State { // ], Row( children: [ - Expanded(child: (filteredServices[index].serviceDescription ?? "").toText(fontSize: 16)), + Expanded(child: (isArabic ? filteredServices[index].serviceDescriptionN ?? "" :filteredServices[index].serviceDescription ?? "").toText(fontSize: 16)), if (filteredServices[index].serviceStatusEnum != ServiceStatusEnum.pending) ...[ Padding( padding: const EdgeInsets.all(4.0),