diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 311cb419..a2165f33 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1976,4 +1976,5 @@ const Map localizedValues = { "selectHospitalBloodDonation": {"en": "Please select the hospital you want to book an appointment with: ", "ar": "يرجى اختيار المستشفى الذي تريد حجز موعد معه:"}, "wecare": {"en": "We Care", "ar": "نحن نهتم"}, "myinstructions": {"en": "My Instructions", "ar": "تعليماتي"}, + "searchClinic": {"en": "Search Clinic", "ar": "بحث العيادة"}, }; diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 747dcb92..a929149d 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -1,6 +1,8 @@ import "dart:collection"; +import 'package:auto_size_text/auto_size_text.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; @@ -73,7 +75,7 @@ class _SearchByClinicState extends State { super.initState(); } - void checkPVM(){ + void checkPVM() { if (context.read().isLogin) { if (radioValue == null) { if (context.read().user.gender == 1) { @@ -89,7 +91,6 @@ class _SearchByClinicState extends State { ageController.text = context.read().isLogin ? context.read().user!.age.toString() : ""; ageController.selection = TextSelection.fromPosition(TextPosition(offset: ageController.text.length)); } - } @override @@ -209,7 +210,18 @@ class _SearchByClinicState extends State { }); }, ), - Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)), + AutoSizeText( + TranslationBase.of(context).nearestAppo.trim(), + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.4, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), + ), + // Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)), ], ), ), diff --git a/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart b/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart index c68db13a..ecbe1003 100644 --- a/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart +++ b/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart @@ -1,4 +1,7 @@ +import 'package:auto_size_text/auto_size_text.dart'; +import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/models/Clinics/ClinicListResponse.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -79,7 +82,7 @@ class _ClickListDialogState extends State { }, decoration: InputDecoration( hintStyle: TextStyle(fontSize: 17), - hintText: 'Search Clinic', + hintText: TranslationBase.of(context).searchClinic, suffixIcon: Icon(Icons.search), border: InputBorder.none, contentPadding: EdgeInsets.all(12), @@ -99,7 +102,19 @@ class _ClickListDialogState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Expanded(child: Text(tempClinicsList[index].clinicDescription!.trim())), + Expanded( + child: AutoSizeText( + tempClinicsList[index].clinicDescription!.trim(), + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.4, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), + ), + ), tempClinicsList[index].isLiveCareClinicAndOnline! ? SvgPicture.asset( 'assets/images/new-design/video_icon_green_right.svg', diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 46f4807c..9aa15082 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -2963,6 +2963,7 @@ class TranslationBase { String get selectHospitalBloodDonation => localizedValues["selectHospitalBloodDonation"][locale.languageCode]; String get wecare => localizedValues["wecare"][locale.languageCode]; String get myinstructions => localizedValues["myinstructions"][locale.languageCode]; + String get searchClinic => localizedValues["searchClinic"][locale.languageCode]; } diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 1b525e21..95e259d1 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -1,4 +1,5 @@ import 'dart:io' show Platform; +import 'package:auto_size_text/auto_size_text.dart'; import 'package:barcode_scan2/barcode_scan2.dart'; import 'package:diplomaticquarterapp/analytics/google-analytics.dart'; import 'package:diplomaticquarterapp/config/config.dart'; @@ -144,17 +145,30 @@ class _AppDrawerState extends State { (user != null && projectProvider!.isLogin) ? user!.firstName! + ' ' + user!.lastName! : TranslationBase.of(context).cantSeeProfile, style: TextStyle(color: Color(0xff2E303A), fontWeight: FontWeight.bold, fontSize: 20, letterSpacing: -1.2, height: 35 / 20), ), - Text( + AutoSizeText( (user != null && projectProvider!.isLogin) ? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString() : TranslationBase.of(context).loginRegisterNow, + maxLines: 1, + minFontSize: 10, style: TextStyle( - color: Color(0xff2E303A), - fontSize: 16, - letterSpacing: -0.96, - height: 1, + fontSize: SizeConfig.textMultiplier! * 1.6, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, ), ), + // Text( + // (user != null && projectProvider!.isLogin) + // ? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString() + // : TranslationBase.of(context).loginRegisterNow, + // style: TextStyle( + // color: Color(0xff2E303A), + // fontSize: 16, + // letterSpacing: -0.96, + // height: 1, + // ), + // ), mHeight(20.0), (user != null && projectProvider!.isLogin) ? Image.network("https://api.qrserver.com/v1/create-qr-code/?size=250x250&data=${user!.patientID.toString()}", fit: BoxFit.fill, height: 73.5, width: 73.5) diff --git a/lib/widgets/drawer/drawer_item_widget.dart b/lib/widgets/drawer/drawer_item_widget.dart index af0d81e9..d5bac14f 100644 --- a/lib/widgets/drawer/drawer_item_widget.dart +++ b/lib/widgets/drawer/drawer_item_widget.dart @@ -1,5 +1,6 @@ import 'dart:ui'; +import 'package:auto_size_text/auto_size_text.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; @@ -60,13 +61,24 @@ class _DrawerItemState extends State { child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, children: [ Row( children: [ - AppText( + AutoSizeText( widget.title!, - fontWeight: FontWeight.w600, - fontSize: widget.fontSize, - height: widget.fontHeight, - letterSpacing: widget.letterSpacing, + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.6, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), ), + // AppText( + // widget.title!, + // fontWeight: FontWeight.w600, + // fontSize: widget.fontSize, + // height: widget.fontHeight, + // letterSpacing: widget.letterSpacing, + // ), widget.count ?? SizedBox(), ], ),