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

code merge dark/light added

Browse Source
This commit is contained in:
Surendiran 2025-07-25 10:35:22 +05:30
parent f5ddbcfc01
commit 5fbc97c1fb
30 changed files with 2257 additions and 2070 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/app/.cxx/Debug/4y161to1/arm64-v8a/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Log}
{
y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ãĹŽƒ3  ¡¹ñÀ÷2z
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  …Žœÿƒ3  ¡¹ñÀ÷2z
x
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build.json  ãĹŽƒ3€ £¹ñÀ÷2
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build.json  …Žœÿƒ3€ £¹ñÀ÷2
}
{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build_mini.json  ãĹŽƒ3ƒ ¥¹ñÀ÷2l
{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build_mini.json  …Žœÿƒ3ƒ ¥¹ñÀ÷2l
j
h/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja  ãĹŽƒ3êÌ Ž¹ñÀ÷2p
h/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja  …Žœÿƒ3êÌ Ž¹ñÀ÷2p
n
l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja.txt  ãĹŽƒ3u
l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja.txt  …Žœÿƒ3u
s
q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build_file_index.txt  ãĹŽƒ3 _ ¦¹ñÀ÷2v
q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build_file_index.txt  …Žœÿƒ3 _ ¦¹ñÀ÷2v
t
r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json  ãĹŽƒ3z
r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json  …Žœÿƒ3z
x
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json.bin  ãĹŽƒ3 €
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json.bin  …Žœÿƒ3 €
~
|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/metadata_generation_command.txt  ãĹŽƒ3
|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/metadata_generation_command.txt  …Žœÿƒ3
ö ¦¹ñÀ÷2s
q
o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/prefab_config.json  äĹŽƒ3  ( ¦¹ñÀ÷2x
o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/prefab_config.json  …Žœÿƒ3  ( ¦¹ñÀ÷2x
v
t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/symbol_folder_index.txt  äĹŽƒ3  k ¦¹ñÀ÷2c
t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/symbol_folder_index.txt  …Žœÿƒ3  k ¦¹ñÀ÷2c
a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  äĹŽƒ3 ¤ òÑÞ€á2
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  …Žœÿƒ3 ¤ òÑÞ€á2

24
android/app/.cxx/Debug/4y161to1/armeabi-v7a/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Log
}
{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  鏎ƒ3  ¸ïòÀ÷2|
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  €<EFBFBD>œÿƒ3  ¸ïòÀ÷2|
z
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build.json  鏎ƒ3„ ºïòÀ÷2<C3B7>
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build.json  €<EFBFBD>œÿƒ3„ ºïòÀ÷2<C3B7>

}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build_mini.json  鏎ƒ3‡ »ïòÀ÷2n
}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build_mini.json  €<EFBFBD>œÿƒ3‡ »ïòÀ÷2n
l
j/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja  鏎ƒ3öÌ ªïòÀ÷2r
j/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja  €<EFBFBD>œÿƒ3öÌ ªïòÀ÷2r
p
n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja.txt  鏎ƒ3w
n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja.txt  €<EFBFBD>œÿƒ3w
u
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build_file_index.txt  鏎ƒ3 _ »ïòÀ÷2x
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build_file_index.txt  €<EFBFBD>œÿƒ3 _ »ïòÀ÷2x
v
t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json  鏎ƒ3|
t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json  €<EFBFBD>œÿƒ3|
z
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json.bin  鏎ƒ3 ƒ
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json.bin  €<EFBFBD>œÿƒ3 ƒ
€
~/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/metadata_generation_command.txt  鏎ƒ3
~/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/metadata_generation_command.txt  €<EFBFBD>œÿƒ3
€ »ïòÀ÷2u
s
q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/prefab_config.json  鏎ƒ3  ( »ïòÀ÷2z
q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/prefab_config.json  €<EFBFBD>œÿƒ3  ( »ïòÀ÷2z
x
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/symbol_folder_index.txt  鏎ƒ3  m »ïòÀ÷2c
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/symbol_folder_index.txt  €<EFBFBD>œÿƒ3  m »ïòÀ÷2c
a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  鏎ƒ3 ¤ òÑÞ€á2
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  €<EFBFBD>œÿƒ3 ¤ òÑÞ€á2

24
android/app/.cxx/Debug/4y161to1/x86/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Logw
u
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ôŹŽƒ3  „òòÀ÷2t
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Œ<EFBFBD>œÿƒ3  „òòÀ÷2t
r
p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build.json  ôŹŽƒ3ô „òòÀ÷2y
p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build.json  Œ<EFBFBD>œÿƒ3ô „òòÀ÷2y
w
u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build_mini.json  ôŹŽƒ3÷ …òòÀ÷2f
u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build_mini.json  Œ<EFBFBD>œÿƒ3÷ …òòÀ÷2f
d
b/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja  ôŹŽƒ3ÆÌ ûñòÀ÷2j
b/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja  Œ<EFBFBD>œÿƒ3ÆÌ ûñòÀ÷2j
h
f/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja.txt  ôŹŽƒ3o
f/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja.txt  Œ<EFBFBD>œÿƒ3o
m
k/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build_file_index.txt  ôŹŽƒ3 _ …òòÀ÷2p
k/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build_file_index.txt  Œ<EFBFBD>œÿƒ3 _ …òòÀ÷2p
n
l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json  ôŹŽƒ3t
l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json  Œ<EFBFBD>œÿƒ3t
r
p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json.bin  ôŹŽƒ3 z
p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json.bin  Œ<EFBFBD>œÿƒ3 z
x
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/metadata_generation_command.txt  ôŹŽƒ3
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/metadata_generation_command.txt  Œ<EFBFBD>œÿƒ3
Ø …òòÀ÷2m
k
i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/prefab_config.json  ôŹŽƒ3  ( …òòÀ÷2r
i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/prefab_config.json  Œ<EFBFBD>œÿƒ3  ( …òòÀ÷2r
p
n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/symbol_folder_index.txt  ôŹŽƒ3  e …òòÀ÷2c
n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/symbol_folder_index.txt  Œ<EFBFBD>œÿƒ3  e …òòÀ÷2c
a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ôŹŽƒ3 ¤ òÑÞ€á2
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  Œ<EFBFBD>œÿƒ3 ¤ òÑÞ€á2

24
android/app/.cxx/Debug/4y161to1/x86_64/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Logz
x
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ýŹŽƒ3  •ôòÀ÷2w
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  –<EFBFBD>œÿƒ3  •ôòÀ÷2w
u
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build.json  ýŹŽƒ3ú •ôòÀ÷2|
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build.json  –<EFBFBD>œÿƒ3ú •ôòÀ÷2|
z
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build_mini.json  ýŹŽƒ3ý –ôòÀ÷2i
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build_mini.json  –<EFBFBD>œÿƒ3ý –ôòÀ÷2i
g
e/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja  ýŹŽƒ3ØÌ <20>ôòÀ÷2m
e/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja  –<EFBFBD>œÿƒ3ØÌ <20>ôòÀ÷2m
k
i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja.txt  ýŹŽƒ3r
i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja.txt  –<EFBFBD>œÿƒ3r
p
n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build_file_index.txt  ýŹŽƒ3 _ –ôòÀ÷2s
n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build_file_index.txt  –<EFBFBD>œÿƒ3 _ –ôòÀ÷2s
q
o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json  ýŹŽƒ3w
o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json  –<EFBFBD>œÿƒ3w
u
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json.bin  ýŹŽƒ3 }
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json.bin  –<EFBFBD>œÿƒ3 }
{
y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/metadata_generation_command.txt  ýŹŽƒ3
y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/metadata_generation_command.txt  –<EFBFBD>œÿƒ3
ç –ôòÀ÷2p
n
l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/prefab_config.json  ýŹŽƒ3  ( –ôòÀ÷2u
l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/prefab_config.json  –<EFBFBD>œÿƒ3  ( –ôòÀ÷2u
s
q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/symbol_folder_index.txt  ýŹŽƒ3  h –ôòÀ÷2c
q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/symbol_folder_index.txt  –<EFBFBD>œÿƒ3  h –ôòÀ÷2c
a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ýŹŽƒ3 ¤ òÑÞ€á2
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  –<EFBFBD>œÿƒ3 ¤ òÑÞ€á2

BIN
assets/icons/uae_numbers/ShareDark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 429 B

BIN
assets/icons/uae_numbers/ShareLight.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 559 B

BIN
assets/user_guide/aboutfcscdark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 235 KiB

BIN
assets/user_guide/aboutfcsclight.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 236 KiB

2
lib/infrastructure/services/img_asset_paths/icons/uae_numbers_asset_path.dart
View File

@ -6,6 +6,8 @@ abstract class UaeNumbersAssetPath {
// static const bookmarksSelectedUae = '$_basePath/bookmarksSelectedUae.png';
// static const shareUae = '$_basePath/share.png';
static const share = '$_basePath/share.svg';
static const shareDark = '$_basePath/ShareDark.png';
static const shareLight = '$_basePath/ShareLight.png';
static const filterUae = '$_basePath/filters.png';
static const filterCharts = '$_basePath/Filter.svg';
}

110
lib/presentation/Screens/Bottom Navigation Pages/Country_Profile/country_profile.dart
View File

@ -3,7 +3,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
@ -194,68 +193,7 @@ class ListCountriesRoute extends HookConsumerWidget {
country.nameAR.toLowerCase().contains(query);
}).toList();
final List<Map<String, String>> _allCountries = [
{"name": "Afghanistan", "flag": "🇦🇫"},
{"name": "Albania", "flag": "🇦🇱"},
{"name": "Algeria", "flag": "🇩🇿"},
{"name": "American Samoa", "flag": "🇦🇸"},
{"name": "Andorra", "flag": "🇦🇩"},
{"name": "Angola", "flag": "🇦🇴"},
{"name": "Anguilla", "flag": "🇦🇮"},
{"name": "Antigua And Barbuda", "flag": "🇦🇬"},
{"name": "Argentina", "flag": "🇦🇷"},
{"name": "Armenia", "flag": "🇦🇲"},
{"name": "Aruba", "flag": "🇦🇼"},
{"name": "Australia", "flag": "🇦🇺"},
{"name": "Austria", "flag": "🇦🇹"},
{"name": "Azerbaijan", "flag": "🇦🇿"},
{"name": "Bahamas", "flag": "🇧🇸"},
{"name": "Bahrain", "flag": "🇧🇭"},
{"name": "Bangladesh", "flag": "🇧🇩"},
];
String _searchTerm = '';
void filterData(String value) {
setState(() => _searchTerm = value);
}
@override
void initState() {
super.initState();
final currentTheme = ref.read(themeProvider); // should return ThemeMode
print(currentTheme); // ThemeMode.dark, ThemeMode.light, etc.
}
@override
Widget build(BuildContext context) {
final locale = AppLocalizations.of(context)!;
final filtered = _allCountries
.where((c) => c['name']!.toLowerCase().contains(_searchTerm.toLowerCase()))
.toList();
double myheight = MediaQuery.of(context).size.height;
double mywidth = MediaQuery.of(context).size.width;
return PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, result) {
if (didPop) return;
context.go('/myhomepage');
},
child: BaseScaffold(
title: Text(
context.translate(
'Country Profile',
'ملف الدولة',
),
style: TextStyle(
fontFamily: context.translate(
'Roboto',
'NotoKufi',
)
),
),
final body = BaseScaffold(
body: Column(
children: [
Padding(
@ -266,52 +204,6 @@ class ListCountriesRoute extends HookConsumerWidget {
borderRadius: BorderRadius.circular(30.0),
border: Border.all(width: 1, color: Color(0xFFAA8E83)),
),
child: TextField(
controller: _searchController,
onChanged: (value) {
filterData(value);
},
decoration: InputDecoration(
hintText: AppLocalizations.of(context)!.searchCountry,
hintStyle: TextStyle(
color: Color(0xFFAA8E83),
fontFamily: context.translate('Roboto', 'NotoKufi'),
fontSize: 14,
height: 1.8,
),
prefixIconConstraints: BoxConstraints(
maxWidth: 42,
maxHeight: 42,
),
prefixIcon: Container(
padding: EdgeInsets.only(right: 5, left: 5),
alignment: Alignment.center,
child: SvgPicture.asset(
MiscIconAssetPath.Search,
semanticsLabel: 'Search',
colorFilter: ColorFilter.mode(Color(0xFFAA8E83), BlendMode.srcIn),
height: 18,
width: 18,
),
),
suffixIcon: _searchController.text.isNotEmpty
? IconButton(
icon: Icon(
Icons.clear,
color: Color(0xFFAA8E83),
size: 18,
),
onPressed: () {
_searchController.clear();
filterData('');
},
)
: null,
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(vertical: 9, horizontal: 18.0),
),
),
),
child: SearchBar(
constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width*0.9,

114
lib/presentation/Screens/charts/screens/chart_screen.dart
View File

@ -23,15 +23,14 @@ import 'package:uae_stat/presentation/Screens/charts/widgets/chart_widget.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/components/my_toggle.dart';
// import 'package:uae_stat/l10n/app_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:uae_stat/presentation/Screens/app_tour/Target_content.dart';
import '../filters/search_filter_helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:share_plus/share_plus.dart';
import 'package:path_provider/path_provider.dart';
import 'dart:io';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class ChartScreen1 extends ConsumerStatefulWidget {
final String dataSets;
@ -334,7 +333,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
10.0), // Adjust the radius as needed
),
side: BorderSide(
color: Color(0xFFAA8E83), // Set the outline color
color: Color(0xFFB68A34), // Set the outline color
// color: Color(0xFFAA8E83), // Set the outline color
width: 1, // Set the border width
),
),
@ -345,7 +345,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'Roboto',
'NotoKufi',
),
color: Color(0xFFAA8E83),
// color: Color(0xFFAA8E83),
color: Color(0xFFB68A34),
fontSize: 16,
),
),
@ -359,7 +360,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
removeBookmark(); // Close dialog
},
style: TextButton.styleFrom(
backgroundColor: Color(0xFFAA8E83), // Set background color
// backgroundColor: Color(0xFFAA8E83), // Set background color
backgroundColor: Color(0xFFB68A34), // Set background color
foregroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius:
@ -442,7 +444,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
10.0), // Adjust the radius as needed
),
side: BorderSide(
color: Color(0xFFAA8E83), // Set the outline color
color: Color(0xFFB68A34), // Set the outline color
// color: Color(0xFFAA8E83), // Set the outline color
width: 1, // Set the border width
),
),
@ -453,7 +456,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'Roboto',
'NotoKufi',
),
color: Color(0xFFAA8E83),
color: Color(0xFFB68A34),
// color: Color(0xFFAA8E83),
fontSize: 16,
),
),
@ -467,7 +471,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
addBookmark(); // Close dialog
},
style: TextButton.styleFrom(
backgroundColor: Color(0xFFAA8E83), // Set background color
backgroundColor: Color(0xFFB68A34), // Set background color
// backgroundColor: Color(0xFFAA8E83), // Set background color
foregroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius:
@ -1519,8 +1524,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
print('locale2- $locale');
final isDark = currentTheme == ThemeMode.dark ||
(currentTheme == ThemeMode.system &&
final isDark = ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == ThemeMode.system &&
MediaQuery.of(context).platformBrightness == Brightness.dark);
final themeMode = (isDark ? 'dark' : 'light');
@ -1972,12 +1977,14 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
ref.watch(localeProvider)?.languageCode ?? 'en';
print('locale22- $locale');
final isDark = currentTheme == ThemeMode.dark ||
(currentTheme == ThemeMode.system &&
final isDark = ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == ThemeMode.system &&
MediaQuery.of(context).platformBrightness ==
Brightness.dark);
print('isDark filter');
print(isDark);
final themeMode = (isDark ? 'dark' : 'light');
print(themeMode);
fetchChartData(
widget.dataSets,
@ -2042,8 +2049,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'en';
print('locale22- $locale');
final isDark = currentTheme == ThemeMode.dark ||
(currentTheme == ThemeMode.system &&
final isDark = ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == ThemeMode.system &&
MediaQuery.of(context)
.platformBrightness ==
Brightness.dark);
@ -2495,7 +2502,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
//
final bodyColor = Color(
int.parse(
(chartScreenData['body_color'] ?? '#898C81').replaceFirst('#', '0xff'),
(chartScreenData['header_color'] ?? '#898C81').replaceFirst('#', '0xff'),
),
);
final chartHeader = chartScreenData['main_topic'] ?? '';
@ -2566,7 +2573,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
// .replaceFirst('#', '0xff'))),
child: Padding(
padding: EdgeInsets.only(
left: 30, right: 30, top: 8, bottom: 5),
left: 15, right: 15, top: 8, bottom: 5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -2652,8 +2659,14 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
child: Container(
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
// color: isBookmarked
// ? Colors.white.withAlpha(90)
// : null,
color: isBookmarked
? isDarkTheme
? Colors.white.withAlpha(90)
: Colors.grey.shade200
: null, // Background color
borderRadius: BorderRadius.circular(
8), // Curved corners
@ -2673,6 +2686,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'NotoKufi',
),
fontSize: 16,
fontWeight: FontWeight.w500,
color: isDarkTheme
? Colors.grey
: Color(0xFF416587),
@ -2696,6 +2710,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'NotoKufi',
),
fontSize: 16,
fontWeight: FontWeight.w500,
color: isDarkTheme
? Colors.grey
: Color(0xFF416587),
@ -2723,14 +2738,22 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
Icon(
size: 24,
Icons.bookmarks_rounded,
color: isBookmarked
? Color(int.parse(
(chartScreenData[
'body_color'] ??
'#898C81')
.replaceFirst(
'#', '0xff')))
: Colors.white,
? isDarkTheme
? Colors.grey
: Color(0xFF416587)
: isDarkTheme
? Colors.grey
: Color(0xFF416587),
// color: isBookmarked
// ? Color(int.parse(
// (chartScreenData[
// 'body_color'] ??
// '#898C81')
// .replaceFirst(
// '#', '0xff')))
// : Colors.white,
),
],
),
@ -2754,6 +2777,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'NotoKufi',
),
fontSize: 16,
fontWeight: FontWeight.w500,
// color: Colors.white,
color: isDarkTheme
? Colors.grey
@ -2771,8 +2795,17 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
strokeWidth: 2,
),
) // Show loading spinner
: isDarkTheme
? SvgPicture.asset(
UaeNumbersAssetPath
.shareDark,
semanticsLabel: 'share',
width: 24,
height: 24,
)
: SvgPicture.asset(
UaeNumbersAssetPath.share,
UaeNumbersAssetPath
.shareLight,
semanticsLabel: 'share',
width: 24,
height: 24,
@ -2804,6 +2837,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'NotoKufi',
),
fontSize: 16,
fontWeight: FontWeight.w500,
// color: Colors.white,
color: isDarkTheme
? Colors.grey
@ -2811,12 +2845,20 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
),
),
SizedBox(width: 10),
SvgPicture.asset(
UaeNumbersAssetPath.filterCharts,
semanticsLabel: 'Filter',
width: 24,
height: 24,
Icon(
size: 26,
Icons.filter_alt_outlined,
color: isDarkTheme
? Colors.grey
: Color(0xFF416587),
),
// SvgPicture.asset(
// UaeNumbersAssetPath.filterCharts,
// semanticsLabel: 'Filter',
// width: 24,
// height: 24,
// ),
],
),
)
@ -3113,7 +3155,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
color: onPressed == null
? Color(int.parse((chartScreenData['header_color'] ?? '#898C81')
.replaceFirst('#', '0xff')))
: Colors.grey[400],
: isDarkTheme
? Colors.grey[700]
: Colors.grey[200],
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(5.0),
// boxShadow: [
@ -3149,7 +3193,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
color: isActive
? Color(int.parse((chartScreenData['header_color'] ?? '#898C81')
.replaceFirst('#', '0xff')))
: Colors.grey[400],
: isDarkTheme
? Colors.black
: Color(0XFFDFE1DB),
borderRadius: BorderRadius.circular(5.0),
),
child: Text(
@ -3159,7 +3205,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'Roboto',
'NotoKufi',
),
color: isActive ? Colors.black : Colors.white,
// color: isActive ? Colors.black : Colors.white,
color: isDarkTheme ? Colors.white : Colors.black,
// color: Colors.white,
fontWeight: isActive ? FontWeight.w500 : FontWeight.w400,
fontSize: 13,
),

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

@ -353,9 +353,6 @@ class LoginRoute extends HookConsumerWidget {
// });
// }
final hasValidated = useState(false);
final locale = ref.watch(localeProvider);
final emailCtl = useTextEditingController();

5
lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart
View File

@ -539,9 +539,8 @@ class _EditProfileState extends ConsumerState<EditProfile> {
await _fetchUserData();
});
final themeMode = ref.read(themeProvider);
final isDarkTheme = themeMode == ThemeMode.dark ||
(themeMode == ThemeMode.system &&
final isDarkTheme = ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == ThemeMode.system &&
MediaQuery.of(context).platformBrightness == Brightness.dark);
return PopScope(

BIN
lib/presentation/routes/drawer_routes/Drawer Items/user_guide.zip Normal file
View File

Binary file not shown.

19
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/AboutFCSC.dart
View File

@ -8,7 +8,7 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
class aboutFCSC extends ConsumerStatefulWidget {
@ -133,7 +133,7 @@ class _aboutFCSCState extends ConsumerState<aboutFCSC> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
// fontWeight: FontWeight.normal,
fontWeight: FontWeight.w500,
),
@ -166,10 +166,17 @@ class _aboutFCSCState extends ConsumerState<aboutFCSC> {
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/AboutFCSC.png',
fit: BoxFit.contain,
),
child:
Image.asset(
isDarkTheme
? 'assets/user_guide/aboutfcscdark.png'
: 'assets/user_guide/aboutfcsclight.png',
)
// Image.asset(
// 'assets/user_guide/about fcsc dark.png',
// fit: BoxFit.contain,
// ),
),
SizedBox(
height: 5,

58
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/getStarted.dart
View File

@ -8,7 +8,7 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
class GetStarted extends ConsumerStatefulWidget {
@ -150,7 +150,8 @@ class _GetStartedState extends ConsumerState<GetStarted> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
// color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -166,7 +167,7 @@ class _GetStartedState extends ConsumerState<GetStarted> {
Align(
alignment: Alignment.topLeft,
child: Text(
context.translate('How to Get Started', 'كيفية البدء'),
context.translate('How to Get Started?', 'كيفية البدء؟'),
style: TextStyle(
fontFamily: context.translate(
'Roboto',
@ -174,18 +175,23 @@ class _GetStartedState extends ConsumerState<GetStarted> {
),
fontSize: 20,
color: isDarkTheme ? Colors.white : Color(0xFF414042),
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w500,
),
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/getStarted.png',
fit: BoxFit.contain,
),
),
SizedBox(height: 10),
// SizedBox(
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/getStarted.png',
// fit: BoxFit.contain,
// ),
// ),
Padding(padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.translate(
'1. Download the app from the App Store or Google Play Store.',
@ -198,12 +204,12 @@ class _GetStartedState extends ConsumerState<GetStarted> {
),
),
SizedBox(
height: 2,
height: 20,
),
Text(
context.translate(
'2. Log in to access advanced features',
'2 .قم بتسجيل الدخول لفتح الميزات المتقدمة.',
'2. Log in to unlock advanced features or continue as a guest.',
'2 .قم بتسجيل الدخول لفتح الميزات المتقدمة أو الاستمرار كضيف.',
),
textAlign: TextAlign.justify, // Align the text
softWrap: true,
@ -211,12 +217,28 @@ class _GetStartedState extends ConsumerState<GetStarted> {
color: isDarkTheme ? Colors.white : Colors.black54,
),
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.12,
),
SizedBox(
height: 20,
),
Text(
context.translate(
'3. Navigate through categories, explore metrics, and bookmark essential information.',
'3 .تنقل عبر الفئات، واستكشف المقاييس، وقم بإضافة إشارة مرجعية إلى المعلومات الأساسية.',
),
textAlign: TextAlign.justify, // Align the text
softWrap: true,
style: TextStyle(
color: isDarkTheme ? Colors.white : Colors.black54,
),
),
],
),)
// SizedBox(
// height: MediaQuery.of(context).size.height * 0.12,
// ),
// SizedBox(
// height: 20,
// ),
],
),
),

173
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/AppFeatures.dart
View File

@ -8,10 +8,12 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
import '../../../custom_drawer_routes.dart';
class AppFeatures extends ConsumerStatefulWidget {
const AppFeatures({super.key});
@ -145,7 +147,7 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -174,14 +176,19 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
),
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/appFeatures.png',
fit: BoxFit.contain,
),
),
SizedBox(height: 20,),
// SizedBox(
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/appFeatures.png',
// fit: BoxFit.contain,
// ),
// ),
Padding(padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.translate('1. Comprehensive Statistics:',
'1. رؤى مستندة إلى البيانات '),
@ -297,7 +304,7 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
],
),
),
SizedBox(height: 8),
SizedBox(height: 30),
Text(
context.translate(
'2. Drilldown Navigation:', '2. التنقل التفصيلي'),
@ -350,7 +357,7 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
],
),
),
SizedBox(height: 8),
SizedBox(height: 30),
Text(
context.translate('3. Interactive Visualizations:',
'3. التصورات التفاعلية:'),
@ -404,8 +411,150 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
),
),
SizedBox(
height: 20,
height: 30,
),
Text(
context.translate('4. Secure User Access:',
'4. الوصول الآمن للمستخدم:'),
style: TextStyle(
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
fontSize: 16,
color: isDarkTheme ? Colors.white : Color(0xFF414042),
fontWeight: FontWeight.w600,
),
),
SizedBox(height: 8),
Padding(
padding: const EdgeInsets.only(left: 7.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Icon(
Icons.brightness_1,
size: 5,
color: isDarkTheme
? Colors.white
: Color(0xFF414042),
),
), // Bullet point
SizedBox(width: 8),
Expanded(
child: Text(
context.translate(
'Available only to registered users whose accounts have been approved by an admin.',
'متاح فقط للمستخدمين المسجلين الذين تمت الموافقة على حساباتهم من قبل المسؤول.',
),
textAlign: TextAlign.justify, // Align the text
softWrap: true,
style: TextStyle(
color: isDarkTheme
? Colors.white
: Color(0xFF898C81),
),
),
), // Space between bullet and text
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Icon(
Icons.brightness_1,
size: 5,
color: isDarkTheme
? Colors.white
: Color(0xFF414042),
),
), // Bullet point
SizedBox(width: 8), // Space between bullet and text
Expanded(
child: Text(
context.translate(
'Login ensures secure access to sensitive statistical information.',
'يضمن تسجيل الدخول الوصول الآمن إلى المعلومات الإحصائية الحساسة.',
),
textAlign: TextAlign.justify, // Align the text
softWrap: true,
style: TextStyle(
color: isDarkTheme
? Colors.white
: Color(0xFF898C81),
),
),
),
],
),
],
),
),
SizedBox(
height: 30,
),
Text(
context.translate('5. Profile Customization:',
'5. تخصيص الملف الشخصي:'),
style: TextStyle(
fontFamily: context.translate(
'Roboto',
'NotoKufi',
),
fontSize: 16,
color: isDarkTheme ? Colors.white : Color(0xFF414042),
fontWeight: FontWeight.w600,
),
),
SizedBox(height: 8),
Padding(
padding: const EdgeInsets.only(left: 7.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Icon(
Icons.brightness_1,
size: 5,
color: isDarkTheme
? Colors.white
: Color(0xFF414042),
),
), // Bullet point
SizedBox(width: 8),
Expanded(
child: Text(
context.translate(
'Update your profile details, such as name, password, and region, to personalize your experience.',
'قم بتحديث تفاصيل ملفك الشخصي، مثل الاسم وكلمة المرور والمنطقة، لتخصيص تجربتك.',
),
textAlign: TextAlign.justify, // Align the text
softWrap: true,
style: TextStyle(
color: isDarkTheme
? Colors.white
: Color(0xFF898C81),
),
),
), // Space between bullet and text
],
),
],
),
),
],
),)
],
),
),

25
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/ChangeMyPassword.dart
View File

@ -9,6 +9,7 @@ import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
class ChangeMyPassword extends ConsumerStatefulWidget {
const ChangeMyPassword({super.key});
@ -150,7 +151,7 @@ class _ChangeMyPasswordState extends ConsumerState<ChangeMyPassword> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -182,13 +183,18 @@ class _ChangeMyPasswordState extends ConsumerState<ChangeMyPassword> {
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/changePassword.png',
fit: BoxFit.contain,
),
height: 20,
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/changePassword.png',
// fit: BoxFit.contain,
// ),
),
Padding(padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.translate(
'Changing your password helps keep your account secure. Follow these steps to update your password:',
@ -659,9 +665,8 @@ class _ChangeMyPasswordState extends ConsumerState<ChangeMyPassword> {
],
),
),
SizedBox(
height: 20,
),
],
),)
],
),
),

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

@ -8,7 +8,7 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
class EditMyProfile extends ConsumerStatefulWidget {
@ -151,7 +151,7 @@ class _EditMyProfileState extends ConsumerState<EditMyProfile> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -181,13 +181,18 @@ class _EditMyProfileState extends ConsumerState<EditMyProfile> {
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/editProfile.png',
fit: BoxFit.contain,
),
height: 10,
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/editProfile.png',
// fit: BoxFit.contain,
// ),
),
Padding(padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.translate(
'Editing your profile allows you to update specific information while ensuring that critical details remain secure. Follow the steps below to update your profile:',
@ -881,9 +886,9 @@ class _EditMyProfileState extends ConsumerState<EditMyProfile> {
],
),
),
SizedBox(
height: 20,
),
],
),)
],
),
),

30
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/howUseTheApp.dart
View File

@ -8,7 +8,8 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
class HowUseTheApp extends ConsumerStatefulWidget {
@ -152,7 +153,7 @@ class _HowUseTheAppState extends ConsumerState<HowUseTheApp> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -182,13 +183,19 @@ class _HowUseTheAppState extends ConsumerState<HowUseTheApp> {
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/howUse.png',
fit: BoxFit.contain,
),
height:10,
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/howUse.png',
// fit: BoxFit.contain,
// ),
),
Padding(
padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.translate(
'1. Registration and Approval:',
@ -352,7 +359,7 @@ class _HowUseTheAppState extends ConsumerState<HowUseTheApp> {
Expanded(
child: Text(
context.translate(
'Drill down into specific categories like "Economy" or "Environment" to view detailed KPIs and visual insights.',
'Save important statistics for easy reference.',
'احفظ الإحصائيات المهمة للرجوع إليها بسهولة.',
),
textAlign: TextAlign.justify, // Align the text
@ -364,9 +371,8 @@ class _HowUseTheAppState extends ConsumerState<HowUseTheApp> {
),
],
),
SizedBox(
height: 20,
),
],
),)
],
),
),

28
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/purpose.dart
View File

@ -8,8 +8,10 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class Purpose extends ConsumerStatefulWidget {
const Purpose({super.key});
@ -152,7 +154,7 @@ class _PurposeState extends ConsumerState<Purpose> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -181,14 +183,18 @@ class _PurposeState extends ConsumerState<Purpose> {
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/purpose.png',
fit: BoxFit.contain,
height: 10,
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/purpose.png',
// fit: BoxFit.contain,
// ),
),
),
SizedBox(height: 8),
Padding(padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -300,9 +306,9 @@ class _PurposeState extends ConsumerState<Purpose> {
),
],
),
SizedBox(
height: 20,
),
],
),)
],
),
),

44
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/stayUpdate.dart
View File

@ -7,9 +7,10 @@ import 'package:uae_stat/config/api_config.dart';
import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class StayUpdate extends ConsumerStatefulWidget {
const StayUpdate({super.key});
@ -150,7 +151,7 @@ class _StayUpdateState extends ConsumerState<StayUpdate> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -179,26 +180,28 @@ class _StayUpdateState extends ConsumerState<StayUpdate> {
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/stayUpdate.png',
fit: BoxFit.contain,
height: 10,
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/stayUpdate.png',
// fit: BoxFit.contain,
// ),
),
),
SizedBox(height: 8),
Row(
Padding(
padding: const EdgeInsets.all(30),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Icon(
Icons.brightness_1,
size: 5,
color: isDarkTheme ? Colors.white : Color(0xFF414042),
),
), // Bullet point
SizedBox(width: 8), // Space between bullet and text
// Padding(
// padding: const EdgeInsets.only(top: 8.0),
// child: Icon(
// Icons.brightness_1,
// size: 5,
// color: isDarkTheme ? Colors.white : Color(0xFF414042),
// ),
// ), // Bullet point
// SizedBox(width: 8), // Space between bullet and text
Expanded(
child: Text(
context.translate(
@ -214,9 +217,8 @@ class _StayUpdateState extends ConsumerState<StayUpdate> {
),
],
),
SizedBox(
height: 20,
),
],
),
),

34
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/useTheApp.dart
View File

@ -8,7 +8,9 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class WhoUseTheApp extends ConsumerStatefulWidget {
const WhoUseTheApp({super.key});
@ -150,7 +152,7 @@ class _WhoUseTheAppState extends ConsumerState<WhoUseTheApp> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -167,7 +169,7 @@ class _WhoUseTheAppState extends ConsumerState<WhoUseTheApp> {
alignment: Alignment.topLeft,
child: Text(
context.translate(
'Who can use the App?', 'من يمكنه استخدام التطبيق؟'),
'Who can use the App', 'من يمكنه استخدام التطبيق؟'),
style: TextStyle(
fontFamily: context.translate(
'Roboto',
@ -179,14 +181,20 @@ class _WhoUseTheAppState extends ConsumerState<WhoUseTheApp> {
),
),
),
SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height * 0.36,
child: Image.asset(
'assets/user_guide/whoUse.png',
fit: BoxFit.contain,
),
),
SizedBox(height: 10),
// SizedBox(
// width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height * 0.36,
// child: Image.asset(
// 'assets/user_guide/whoUse.png',
// fit: BoxFit.contain,
// ),
// ),
Padding(
padding: const EdgeInsets.all(30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.translate(
'This app is intended for:', 'يستهدف هذا التطبيق:'),
@ -282,9 +290,9 @@ class _WhoUseTheAppState extends ConsumerState<WhoUseTheApp> {
),
],
),
SizedBox(
height: 20,
),
],
),)
],
),
),

5
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/aboutApp.dart
View File

@ -9,7 +9,10 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class aboutTheApp extends ConsumerStatefulWidget {
const aboutTheApp({super.key});
@ -132,7 +135,7 @@ class _aboutTheAppState extends ConsumerState<aboutTheApp> {
'Roboto',
'NotoKufi',
),
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),

7
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/faq_page.dart
View File

@ -8,7 +8,10 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class FAQPage extends ConsumerStatefulWidget {
const FAQPage({super.key});
@ -130,7 +133,7 @@ class _FAQPageState extends ConsumerState<FAQPage> {
'NotoKufi',
),
fontSize: 22,
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black ,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),
@ -932,7 +935,7 @@ class _QuestionAnswerCardState extends State<QuestionAnswerCard> {
trailing: Icon(isExpanded
? Icons.keyboard_arrow_up
: Icons.keyboard_arrow_down),
iconColor: widget.isDarkTheme ? Colors.white : Color(0xFF414042),
iconColor: widget.isDarkTheme ? Colors.white : Color(0xFF898C81),
onTap: () {
setState(() {
isExpanded = !isExpanded;

5
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/features.dart
View File

@ -9,8 +9,9 @@ import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
class UsingFeatures extends ConsumerStatefulWidget {
@ -135,7 +136,7 @@ class _UsingFeaturesState extends ConsumerState<UsingFeatures> {
'Roboto',
'NotoKufi',
),
color: Color(0xFF7DAFBC),
color: isDarkTheme ? Colors.white : Colors.black,
fontWeight: FontWeight.w500,
// fontWeight: FontWeight.w500,
),

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

@ -4,11 +4,12 @@ import 'package:go_router/go_router.dart';
import 'package:uae_stat/config/theme/theme_provider.dart';
import 'package:uae_stat/config/toggle_lang_service.dart';
import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
// import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/Country_Profile/country_profile.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:iconify_design/iconify_design.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
// import 'package:flutter_gen/gen_l10n/app_localizations.dart';
// import 'package:uae_stat/l10n/app_localizations.dart';
class Userguide extends ConsumerStatefulWidget {
@ -108,7 +109,12 @@ class _UserguideState extends ConsumerState<Userguide> {
bottomColor: isDarkTheme ? Color(0xFF111111) : Colors.white,
dividerColor: isDarkTheme ? Color(0xFF111111) : Colors.grey[300],
appbarColor: isDarkTheme ? Color(0xFF111111) : Colors.white,
title: Text(AppLocalizations.of(context)!.guide_title,style: TextStyle(color: isDarkTheme ? Colors.white : Color(0xFF414042) ),),
title: Text(
AppLocalizations.of(context)!.guide_title,
style: TextStyle(
color: isDarkTheme ? Colors.white : Color(0xFF414042)
)
),
body: Container(
color: isDarkTheme ? Color(0xFF111111) : Colors.white,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20),
@ -176,6 +182,7 @@ class _HoverContainerState extends ConsumerState<HoverContainer> {
margin: EdgeInsets.all(1),
decoration: BoxDecoration(
color: isDarkTheme ? Color(0xFF111111) : Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: isHovered
? [
@ -187,7 +194,8 @@ class _HoverContainerState extends ConsumerState<HoverContainer> {
),
]
: [],
border: Border.all(color: Color(0xFF7DAFBC), width: 1.0),
// border: Border.all(color: Color(0xFF7DAFBC), width: 1.0),
border: Border.all(color: Color(0xFFB68A34), width: 1.0),
),
alignment: Alignment.center,
// duration: Duration(milliseconds: 200),
@ -200,7 +208,8 @@ class _HoverContainerState extends ConsumerState<HoverContainer> {
children: [
IconifyIcon(
icon: widget.iconName,
color: Color(0xFF7DAFBC),
// color: Color(0xFF7DAFBC),
color: Color(0xFFB68A34),
size: containerHeight * 0.45,
),
// buildDynamicWidget(data['icon'], Color(0xFF7DAFBC)),
@ -213,9 +222,9 @@ class _HoverContainerState extends ConsumerState<HoverContainer> {
padding: EdgeInsets.symmetric(horizontal: 4, vertical: 4),
margin: EdgeInsets.only(bottom: 3),
decoration: BoxDecoration(
color: Color(0xFF7DAFBC),
color: Color(0xFFB68A34),
borderRadius: BorderRadius.circular(5),
border: Border.all(color: Color(0xFF7DAFBC))),
border: Border.all(color: Color(0xFFB68A34))),
child: Text(
widget.title,
style: TextStyle(

28
lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
View File

@ -11,6 +11,7 @@ import 'package:go_router/go_router.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:pocketbase/pocketbase.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
import 'package:uae_stat/config/injector.dart';
@ -23,6 +24,7 @@ import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/bottom_bar_asset_icon_path.dart';
import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/drawer_asset_icon_path.dart';
// import 'package:uae_stat/l10n/app_localizations.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/components/my_toggle.dart';
@ -245,7 +247,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
child: IconButton(
icon: const Icon(
Icons.arrow_back,
color: Colors.white,
// color: Colors.white,
color: Colors.grey,
),
onPressed: () {
if (locale.languageCode == 'ar') {
@ -403,7 +406,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
child: IconButton(
icon: const Icon(
Icons.arrow_back,
color: Colors.white,
// color: Colors.white,
color: Colors.grey,
),
onPressed: () {
locale.languageCode == 'ar'
@ -569,7 +573,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
locale.languageCode == 'ar'
? Icons.arrow_forward
: Icons.arrow_back,
color: Colors.white,
// color: Colors.white,
color: Colors.grey,
),
onPressed: () {
tutorialCoachMark.previous();
@ -1056,14 +1061,14 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
padding: EdgeInsets.zero,
constraints: BoxConstraints(),
// color: widget.colorChange ? Colors.white : Colors.black,
color: isDarkTheme
? widget.colorChange
? Colors.black
: Colors.white
: widget.colorChange
? Colors.white
: Colors.black,
// color: isDarkTheme
// ? widget.colorChange
// ? Colors.black
// : Colors.white
// : widget.colorChange
// ? Colors.white
// : Colors.black,
color: Colors.grey,
icon: const Icon(Icons.arrow_back_ios_new, size: 24),
onPressed: () {
if (widget.navBackArrow is Text &&
@ -1418,7 +1423,6 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
),
onTap: () => context.go('/register'),
),
],
),
),

16
pubspec.lock
View File

@ -433,6 +433,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.1"
dotted_border:
dependency: "direct main"
description:
name: dotted_border
sha256: "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
equatable:
dependency: transitive
description:
@ -1156,6 +1164,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.1"
path_drawing:
dependency: transitive
description:
name: path_drawing
sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
url: "https://pub.dev"
source: hosted
version: "1.0.1"
path_parsing:
dependency: transitive
description:

3
pubspec.yaml
View File

@ -76,6 +76,7 @@ dependencies:
android_intent_plus: ^5.3.0
app_settings: ^6.1.1
appsflyer_sdk: ^6.16.2
dotted_border: ^2.1.0
dependency_overrides:
fading_edge_scrollview: ^4.1.1
@ -162,6 +163,8 @@ flutter:
- assets/country-profile/
- assets/country-profile/CategoryFile/
- assets/competitiveness/
- assets/icons/uae_numbers/ShareDark.png
- assets/icons/uae_numbers/ShareLight.png
fonts:
- family: Segoe