SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Surendiran 2025-04-29 18:40:41 +05:30
commit 8dfbb504fe
9 changed files with 76 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Logc
a
_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ¬¡‡Šæ2  瘝èã2`
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ׈“ãç2  瘝èã2`
^
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build.json  ­¡‡Šæ2º ««¤èã2e
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build.json  ׈“ãç2º ««¤èã2e
c
aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build_mini.json  ­¡‡Šæ2<18> Ø«¤èã2R
aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build_mini.json  ׈“ãç2<18> Ø«¤èã2R
P
NC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja  ­¡‡Šæ2÷Û ̨¤èã2V
NC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja  ׈“ãç2÷Û ̨¤èã2V
T
RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja.txt  ­¡‡Šæ2[
RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja.txt  ؈“ãç2[
Y
WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build_file_index.txt  ­¡‡Šæ2 S 諤èã2\
WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build_file_index.txt  ؈“ãç2 S 諤èã2\
Z
XC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json  ­¡‡Šæ2`
XC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json  ؈“ãç2`
^
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json.bin  ­¡‡Šæ2 f
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json.bin  ؈“ãç2 f
d
bC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\metadata_generation_command.txt  ­¡‡Šæ2
bC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\metadata_generation_command.txt  ؈“ãç2
Ä Þ«¤èã2Y
W
UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\prefab_config.json  ­¡‡Šæ2  ( 櫤èã2^
UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\prefab_config.json  ؈“ãç2  ( 櫤èã2^
\
ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\symbol_folder_index.txt  ­¡‡Šæ2  Q 諤èã2W
ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\symbol_folder_index.txt  ؈“ãç2  Q 諤èã2W
U
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ­¡‡Šæ2 § ÑÜÐßÓ2
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ؈“ãç2 § ÑÜÐßÓ2

24
android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Loge
c
aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  û£‡Šæ2  ²ÿ¥èã2b
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  –‰“ãç2  ²ÿ¥èã2b
`
^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build.json  û£‡Šæ2¾ µÿ¥èã2g
^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build.json  –‰“ãç2¾ µÿ¥èã2g
e
cC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build_mini.json  û£‡Šæ2‘ âÿ¥èã2T
cC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build_mini.json  —‰“ãç2‘ âÿ¥èã2T
R
PC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja  û£‡Šæ2<18>Ü °õ¥èã2X
PC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja  —‰“ãç2<18>Ü °õ¥èã2X
V
TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja.txt  û£‡Šæ2]
TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja.txt  —‰“ãç2]
[
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build_file_index.txt  û£‡Šæ2 S “€¦èã2^
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build_file_index.txt  —‰“ãç2 S “€¦èã2^
\
ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json  û£‡Šæ2b
ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json  —‰“ãç2b
`
^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json.bin  û£‡Šæ2 h
^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json.bin  —‰“ãç2 h
f
dC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\metadata_generation_command.txt  û£‡Šæ2
dC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\metadata_generation_command.txt  —‰“ãç2
Î ‰€¦èã2[
Y
WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\prefab_config.json  û£‡Šæ2  ( ’€¦èã2`
WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\prefab_config.json  —‰“ãç2  ( ’€¦èã2`
^
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\symbol_folder_index.txt  û£‡Šæ2  S “€¦èã2W
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\symbol_folder_index.txt  —‰“ãç2  S “€¦èã2W
U
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  û£‡Šæ2 § ÑÜÐßÓ2
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  —‰“ãç2 § ÑÜÐßÓ2

24
android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Log]
[
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Œ¯‡Šæ2  †½¦èã2Z
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  щ“ãç2  †½¦èã2Z
X
VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build.json  <EFBFBD>¯‡Šæ2® ˜½¦èã2_
VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build.json  щ“ãç2® ˜½¦èã2_
]
[C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build_mini.json  <EFBFBD>¯‡Šæ2<18> ©½¦èã2L
[C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build_mini.json  щ“ãç2<18> ©½¦èã2L
J
HC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja  <EFBFBD>¯‡Šæ2ÙÛ µ»¦èã2P
HC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja  щ“ãç2ÙÛ µ»¦èã2P
N
LC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja.txt  <EFBFBD>¯‡Šæ2U
LC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja.txt  щ“ãç2U
S
QC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build_file_index.txt  <EFBFBD>¯‡Šæ2 S »½¦èã2V
QC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build_file_index.txt  щ“ãç2 S »½¦èã2V
T
RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json  <EFBFBD>¯‡Šæ2Z
RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json  щ“ãç2Z
X
VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json.bin  <EFBFBD>¯‡Šæ2 `
VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json.bin  щ“ãç2 `
^
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\metadata_generation_command.txt  <EFBFBD>¯‡Šæ2
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\metadata_generation_command.txt  щ“ãç2
¦ ¬½¦èã2S
Q
OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\prefab_config.json  <EFBFBD>¯‡Šæ2  ( ±½¦èã2X
OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\prefab_config.json  щ“ãç2  ( ±½¦èã2X
V
TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\symbol_folder_index.txt  <EFBFBD>¯‡Šæ2  K ¶½¦èã2W
TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\symbol_folder_index.txt  Ò‰“ãç2  K ¶½¦èã2W
U
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  <EFBFBD>¯‡Šæ2 § ÑÜÐßÓ2
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  Ó‰“ãç2 § ÑÜÐßÓ2

24
android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Log`
^
\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  䯇Šæ2  üצèã2]
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ÿ‰“ãç2  üצèã2]
[
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build.json  䯇Šæ2´ ‚ئèã2b
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build.json  ÿ‰“ãç2´ ‚ئèã2b
`
^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build_mini.json  䯇Šæ2‡ …ئèã2O
^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build_mini.json  ÿ‰“ãç2‡ …ئèã2O
M
KC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja  䯇Šæ2èÛ ¥Ö¦èã2S
KC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja  ÿ‰“ãç2èÛ ¥Ö¦èã2S
Q
OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja.txt  䯇Šæ2X
OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja.txt  ÿ‰“ãç2X
V
TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build_file_index.txt  䯇Šæ2 S ˆØ¦èã2Y
TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build_file_index.txt  ÿ‰“ãç2 S ˆØ¦èã2Y
W
UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json  䯇Šæ2]
UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json  ÿ‰“ãç2]
[
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json.bin  䯇Šæ2 c
YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json.bin  ÿ‰“ãç2 c
a
_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\metadata_generation_command.txt  䯇Šæ2
_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\metadata_generation_command.txt  ÿ‰“ãç2
µ †Ø¦èã2V
T
RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\prefab_config.json  䯇Šæ2  ( ‡Ø¦èã2[
RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\prefab_config.json  €Š“ãç2  ( ‡Ø¦èã2[
Y
WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\symbol_folder_index.txt  䯇Šæ2  N ˆØ¦èã2W
WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\symbol_folder_index.txt  €Š“ãç2  N ˆØ¦èã2W
U
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  䯇Šæ2 § ÑÜÐßÓ2
SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  €Š“ãç2 § ÑÜÐßÓ2

2
lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart
View File

@ -273,7 +273,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
width: 18,
),
),
contentPadding: EdgeInsets.only(top: 14), // vertical alignment for hint text
contentPadding: EdgeInsets.symmetric(vertical: 9, horizontal: 18.0),
border: InputBorder.none,
// contentPadding:
// EdgeInsets.symmetric(vertical: 9, horizontal: 18.0),

16
lib/presentation/Screens/auth_verification/forgot_password.dart
View File

@ -407,6 +407,10 @@ class _ForgotPasswordState extends ConsumerState<ForgotPassword> {
text: context.translate('from Previously Used Password',
'عن كلمة المرور المستخدمة سابقًا'),
style: TextStyle(
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
fontSize:
passwordLocale?.languageCode == 'ar' ? 14 : 15,
color: Color(0xFF898C81),
@ -426,7 +430,11 @@ class _ForgotPasswordState extends ConsumerState<ForgotPassword> {
hintStyle: TextStyle(
color: Color(0xFFC3C6CB),
fontWeight: FontWeight.w400,
fontFamily: 'Roboto'),
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
),
prefixIconConstraints: const BoxConstraints(
maxWidth: 25 + 16 + 10,
maxHeight: 25 + (8 * 2),
@ -505,7 +513,11 @@ class _ForgotPasswordState extends ConsumerState<ForgotPassword> {
hintStyle: TextStyle(
color: Color(0xFFC3C6CB),
fontWeight: FontWeight.w400,
fontFamily: 'Roboto'),
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
),
prefixIconConstraints: const BoxConstraints(
maxWidth: 25 + 16 + 10,
maxHeight: 25 + (8 * 2),

21
lib/presentation/Screens/charts/widgets/chart_widget.dart
View File

@ -1236,7 +1236,8 @@ class ChartWidget extends StatelessWidget {
runSpacing: 8,
children: groupByValues.map((group) {
return Row(
mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.max, // Take full width
mainAxisAlignment: MainAxisAlignment.start, // Align to left
children: [
Container(
width: 12,
@ -1245,14 +1246,14 @@ class ChartWidget extends StatelessWidget {
),
SizedBox(width: 6),
Text(
group,
style: TextStyle(
fontSize: 14,
fontFamily: context.translate(
'Roboto',
'NotoKufi',
)
)
group,
style: TextStyle(
fontSize: 14,
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
),
),
],
);
@ -3761,7 +3762,7 @@ class ChartWidget extends StatelessWidget {
if (_lastFormattedValue == formattedValue) {
return const SizedBox.shrink(); // Empty widget for duplicates
}
// Update the last formatted value for the next comparison
// Update the last formatted value for the next
_lastFormattedValue = formattedValue;
print('formattedValue - $formattedValue');

2
lib/presentation/routes/auth_routes/login_route.dart
View File

@ -378,7 +378,7 @@ class LoginRoute extends HookConsumerWidget {
child: Text(
context.translate(
'Send Email',
'إرسال إعادة تعيين البريد الإلكتروني',
'إرسال بريد إلكتروني',
),
style: TextStyle( fontSize: context.translate(12, 10), fontFamily: context.translate(
'Roboto',

2
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/userguide.dart
View File

@ -16,7 +16,7 @@ class Userguide extends StatefulWidget {
class _UserguideState extends State<Userguide> {
final List<Map<String, dynamic>> guideList = [
{'routePath':'aboutApp','color': Color(0xFF90B0D5), 'text': 'Getting Started', 'icon': 'cbi:start-tv', 'text-ar': 'البدء' },
{'routePath':'features','color': Color(0xFFAA8E83), 'text': 'Features', 'icon': 'pajamas:issue-type-feature', 'text-ar' : 'استخدام الميزات'},
{'routePath':'features','color': Color(0xFFAA8E83), 'text': 'Features', 'icon': 'pajamas:issue-type-feature', 'text-ar' : 'الميزات'},
{'routePath':'faq','color': Color(0xFF7296BE), 'text': 'FAQs', 'icon': 'mdi:faq', 'text-ar': 'لأسئلة الشائعة'},
];