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

merge done

Browse Source
This commit is contained in:
Surendiran 2025-04-18 13:48:18 +05:30
commit 43d1771bca
12 changed files with 602 additions and 588 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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  <EFBFBD>·»žä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  ͽ¦èã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  ͽ¦èã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  ͽ¦èã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  ͽ¦èã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  ν¦èã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  ν¦èã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  ν¦èã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  ν¦èã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  ν¦èã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  ν¦èã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  Ͻ¦èã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  <EFBFBD>ئèã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  <EFBFBD>ئèã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

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

@ -469,10 +469,10 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
Text(
title,
textAlign: TextAlign.center,
style: robotoRegular11,
style: robotoRegular11(context),
),
SizedBox(height: 0.1),
Text(subtitle, textAlign: TextAlign.center, style: subtitleStyle),
Text(subtitle, textAlign: TextAlign.center, style: subtitleStyle(context)),
SizedBox(height: 0.3),
Row(
mainAxisAlignment: MainAxisAlignment.center,

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

@ -321,6 +321,10 @@ class ChartWidget extends StatelessWidget {
// Increase size when touched
titleStyle: TextStyle(
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
fontSize: isTouched ? 12 : (percentage < 1 ? 10 : 11),
fontWeight: FontWeight.bold,
color: Colors.black,

25
lib/presentation/components/constant/constant.dart
View File

@ -1,20 +1,19 @@
import 'package:flutter/material.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
const Color economyColor = Color(0xFF90B0D5);
const Color socialColor = Color(0xFFAA8E83);
const Color environmentColor = Color(0xFF7DAFBC);
const Color environmentboldColor = Color(0xFF90B0D5);
const TextStyle subtitleStyle = TextStyle(
fontFamily: 'Roboto', // Font family set to Roboto
fontWeight: FontWeight.w400, // Regular weight (w400)
// fontSize: 11,
fontSize: 11 * 1.2, // Increase by 20%
color: Color(0xFF8E8E8E) // Font size 11
);
const TextStyle robotoRegular11 = TextStyle(
fontFamily: 'Roboto', // Font family set to Roboto
fontWeight: FontWeight.w400, // Regular weight (w400)
fontSize: 11 * 1.1,
color: Color(0xFF000000) // Font size 11
TextStyle subtitleStyle(BuildContext context) {
return TextStyle(
fontFamily: context.translate('Roboto', 'NotoKufi'),
fontWeight: FontWeight.w400,
fontSize: 11 * 1.2,
color: const Color(0xFF8E8E8E),
);
}
TextStyle robotoRegular11(BuildContext context)
{return TextStyle(fontFamily: context.translate('Roboto', 'NotoKufi'),
fontWeight: FontWeight.w400,
fontSize: 11 * 1.1,color: Color(0xFF000000),);}

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

@ -269,6 +269,13 @@ class LoginRoute extends HookConsumerWidget {
final locale = ref.watch(localeProvider);
final emailCtl = useTextEditingController();
final pwCtl = useTextEditingController();
useEffect(() {
// Clear controllers when the widget is built
emailCtl.clear();
pwCtl.clear();
formKey.currentState?.reset();
return null; // No cleanup needed
}, const []);
final forgotPwBtn = TextButton(
onPressed: () async {
final forgotPwFormKey = GlobalKey<FormState>();

4
lib/presentation/routes/bottom_bar_routes/tab_routes/uae_numbers_routes/list_uae_numbers_route.dart
View File

@ -347,6 +347,10 @@ class _PerSubtopicBody extends ConsumerWidget {
color: _titleColor,
fontWeight: FontWeight.w600,
fontSize: 16,
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
),
);
final shownIds = ids.where(

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

@ -71,7 +71,7 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
}
print('count is $count');
if(count>0){
notificationCount='{$count}';}
notificationCount='($count)';}
else{notificationCount='';}
}

1046
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart
View File

File diff suppressed because it is too large Load Diff

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

@ -38,7 +38,7 @@ class _UserguideState extends State<Userguide> {
),
// fontFamily: 'Handel',
fontWeight: FontWeight.w700,
fontSize: 20,
fontSize: 18,
letterSpacing: 1.6,
color: color, // Apply color dynamically
),