From 84e6bf70a14c9e631009e413704e14b5b8870a37 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Mon, 13 Nov 2023 15:04:57 +0300 Subject: [PATCH] dark / ligth dark & localization --- lib/l10n/app_ar.arb | 1 + lib/l10n/app_en.arb | 1 + .../calender_fragments/monthly_fragment.dart | 2 +- .../calender_fragments/weekly_fragment.dart | 2 +- .../progress_fragment.dart | 2 +- .../my_request/my_requests_page.dart | 6 +++-- .../requests/gas_refill_item_view.dart | 16 +++++------- .../land_page/requests/ppm_item_view.dart | 21 ++++++---------- .../requests/service_request_item_view.dart | 25 ++++++------------- 9 files changed, 29 insertions(+), 47 deletions(-) diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index f4f5c82..5a6c4c9 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -341,6 +341,7 @@ "nurseSignature" : "توقيع الممرض", "actualVisitDate": "تاريخ الزيارة الفعلي", "ppmVisit": "موعد زيارة الصيانة الوقائية", + "ppmRequest": "طلب الصيانة الوقائية", "timer": "مؤقت", "deviceStatus" : "حالة الجهاز", "addAsset" : "اضافة جهاز", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index aa168e1..4ae532c 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -341,6 +341,7 @@ "commentHere" : "Comment Here", "nurseSignature" : "Nurse Signature", "ppmVisit": "PPM Visit Status", + "ppmRequest": "PPMs Request", "timer": "Timer", "deviceStatus" : "Device Status", "addAsset" : "Add Asset", diff --git a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart index 864d806..e01f614 100644 --- a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart @@ -66,7 +66,7 @@ class _MonthlyFragmentState extends State { }), dowBuilder: (context, dateTime) { final day = DateFormat("EE", context.isAr ? "ar" : "en").format(dateTime).toUpperCase(); - return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50)); + return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10 : AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) { final day = DateFormat("d").format(dateTime); diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index b198444..38ff0a7 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -71,7 +71,7 @@ class _WeeklyFragmentState extends State { ), dowBuilder: (context, dateTime) { final day = DateFormat("EE", context.isAr ? "ar" : "en").format(dateTime).toUpperCase(); - return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50)); + return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10: AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) { final day = DateFormat("d").format(dateTime); diff --git a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart index 221045c..b248f2b 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart @@ -64,7 +64,7 @@ class ProgressFragment extends StatelessWidget { unselectedLabelStyle: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), labelStyle: AppTextStyles.bodyText.copyWith(color: AppColor.neutral60), indicatorPadding: const EdgeInsets.all(4), - indicator: BoxDecoration(color: Theme.of(context).cardColor, borderRadius: BorderRadius.circular(13)), + indicator: BoxDecoration(color: context.isDark? AppColor.neutral20:Theme.of(context).cardColor, borderRadius: BorderRadius.circular(13)), onTap: (index) { // setState(() {}); }, diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index 04c5d95..8d9a8e0 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -40,8 +40,10 @@ class _MyRequestsPageState extends State { padding: const EdgeInsets.only(left: 16, right: 8), alignment: Alignment.center, decoration: ShapeDecoration( - color: const Color(0xFFEAF1F4), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + color: context.isDark ? Color(0xFF3B3D4A) : Color(0xFFEAF1F4), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), ), child: Row( children: [ diff --git a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart index 9972cda..7891e83 100644 --- a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart +++ b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart @@ -11,6 +11,8 @@ import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/pages/user/gas_refill/gas_refill_details.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart'; +import '../../../app_style/app_color.dart'; + class GasRefillItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; @@ -33,19 +35,13 @@ class GasRefillItemView extends StatelessWidget { 8.width, StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)), 1.width.expanded, - Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark?AppColor.neutral10: Color(0xFF3B3D4A))), ], ), 8.height, - Text(context.translation.gasRefillRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), - Text( - '${context.translation.gasType}: ${request.gasType}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - '${context.translation.site}: ${request.site}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), + context.translation.gasRefillRequest.heading5(context), + '${context.translation.gasType}: ${request.gasType}'.bodyText(context), + '${context.translation.site}: ${request.site}'.bodyText(context), 8.height, Row( mainAxisSize: MainAxisSize.min, diff --git a/lib/new_views/pages/land_page/requests/ppm_item_view.dart b/lib/new_views/pages/land_page/requests/ppm_item_view.dart index 1114800..20e31fa 100644 --- a/lib/new_views/pages/land_page/requests/ppm_item_view.dart +++ b/lib/new_views/pages/land_page/requests/ppm_item_view.dart @@ -12,6 +12,8 @@ import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/pages/user/visits/visit_details.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart'; +import '../../../app_style/app_color.dart'; + class PpmItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; @@ -34,24 +36,15 @@ class PpmItemView extends StatelessWidget { backgroundColor: AColors.getRequestStatusColorByName(request.status), ), 1.width.expanded, - Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark?AppColor.neutral10: Color(0xFF3B3D4A))), ], ), 8.height, - Text("PPMs Request", style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), + context.translation.ppmRequest.heading5(context), 8.height, - Text( - '${context.translation.assetNumber}: ${request.assetName}', - style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), - ), - Text( - '${context.translation.assetSN}: ${request.assetNo}', - style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), - ), - Text( - '${context.translation.code}: ${request.code}', - style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF757575)), - ), + '${context.translation.assetNumber}: ${request.assetName}'.bodyText(context), + '${context.translation.assetSN}: ${request.assetNo}'.bodyText(context), + '${context.translation.code}: ${request.code}'.bodyText(context), 16.height, Row( mainAxisSize: MainAxisSize.min, diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 6f9e997..7a93e93 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -6,6 +6,7 @@ import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; import 'package:test_sa/models/service_request/service_request.dart'; +import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/pages/user/requests/service_request_details.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart'; @@ -29,27 +30,15 @@ class ServiceRequestItemView extends StatelessWidget { 8.width, StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)), 1.width.expanded, - Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark?AppColor.neutral10: Color(0xFF3B3D4A))), ], ), 8.height, - Text(context.translation.serviceRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), - Text( - '${context.translation.assetName}: ${request.assetName}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - '${context.translation.assetNumber}: ${request.assetNo}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - '${context.translation.requestType}: ${request.requestType}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - '${context.translation.requestNo}: ${request.requestNo}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), + context.translation.serviceRequest.heading5(context), + '${context.translation.assetName}: ${request.assetName}'.bodyText(context), + '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context), + '${context.translation.requestType}: ${request.requestType}'.bodyText(context), + '${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), 8.height, Row( mainAxisSize: MainAxisSize.min,