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

Merge branch 'dev' of github.com:VinistanSS/FCSC into dev

Browse Source
This commit is contained in:
venbaittech 2025-03-15 17:32:35 +05:30
commit 9d79a117ca
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,6 +508,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
final double screenHeight = MediaQuery.of(context).size.height; final double screenHeight = MediaQuery.of(context).size.height;
marriageTargets = [ marriageTargets = [
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'cardKey', identify: 'cardKey',
keyTarget: cardKey, keyTarget: cardKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -671,6 +672,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
], ],
), ),
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'BookMarkKey', identify: 'BookMarkKey',
keyTarget: bookMarkKey, keyTarget: bookMarkKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -837,6 +839,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
final double screenHeight = MediaQuery.of(context).size.height; final double screenHeight = MediaQuery.of(context).size.height;
previousMarriageTargets = [ previousMarriageTargets = [
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'BookMarkKey', identify: 'BookMarkKey',
keyTarget: bookMarkKey, keyTarget: bookMarkKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -996,6 +999,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
], ],
), ),
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'cardKey', identify: 'cardKey',
keyTarget: cardKey, keyTarget: cardKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,

18
lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart
View File

@ -410,10 +410,10 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
debugPrint('Home Tutorial Finished'); debugPrint('Home Tutorial Finished');
locale.languageCode == 'ar' locale.languageCode == 'ar'
? context.go( ? context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=null&title=المنشآت الفندقية', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home',
) )
: context.go( : context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages',
); );
}, },
)..show(context: context); )..show(context: context);
@ -430,10 +430,10 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
debugPrint('Previous Home Tutorial Finished'); debugPrint('Previous Home Tutorial Finished');
locale.languageCode == 'ar' locale.languageCode == 'ar'
? context.go( ? context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=null&title=المنشآت الفندقية', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home',
) )
: context.go( : context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages',
); );
}, },
)..show(context: context); )..show(context: context);
@ -444,6 +444,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
final double screenWidth = MediaQuery.of(context).size.width; final double screenWidth = MediaQuery.of(context).size.width;
homeTargets = [ homeTargets = [
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'cardTopicKey', identify: 'cardTopicKey',
keyTarget: cardTopicKey, keyTarget: cardTopicKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -564,6 +565,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
], ],
), ),
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'cardsKey', identify: 'cardsKey',
keyTarget: cardsKey, keyTarget: cardsKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -737,6 +739,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
final double screenWidth = MediaQuery.of(context).size.width; final double screenWidth = MediaQuery.of(context).size.width;
previousHomeTargets = [ previousHomeTargets = [
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'cardsKey', identify: 'cardsKey',
keyTarget: cardsKey, keyTarget: cardsKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -834,10 +837,10 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
.state = false; .state = false;
locale.languageCode == 'ar' locale.languageCode == 'ar'
? context.go( ? context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=null&title=المنشآت الفندقية', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home',
) )
: context.go( : context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages',
); );
} else { } else {
tutorialCoachMark.next(); tutorialCoachMark.next();
@ -877,7 +880,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
chartsTourProvider.notifier) chartsTourProvider.notifier)
.state = false; .state = false;
context.go( context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments'); '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages');
} }
}, },
), ),
@ -918,6 +921,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
], ],
), ),
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'cardTopicKey', identify: 'cardTopicKey',
keyTarget: cardTopicKey, keyTarget: cardTopicKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,

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

@ -141,6 +141,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
final double screenHeight = MediaQuery.of(context).size.height; final double screenHeight = MediaQuery.of(context).size.height;
appBarTargets = [ appBarTargets = [
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'bottomNav', identify: 'bottomNav',
keyTarget: bottomNavKey, keyTarget: bottomNavKey,
shape: ShapeLightFocus.RRect, // Rounded rectangle highlight shape: ShapeLightFocus.RRect, // Rounded rectangle highlight
@ -232,7 +233,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
.notifier) .notifier)
.state = false; .state = false;
context.go( context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages',
); );
} }
}, },
@ -265,7 +266,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
.notifier) .notifier)
.state = false; .state = false;
context.go( context.go(
'/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home',
); );
} else { } else {
tutorialCoachMark.next(); tutorialCoachMark.next();
@ -287,6 +288,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
], ],
), ),
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'drawerKey', identify: 'drawerKey',
keyTarget: drawerKey, keyTarget: drawerKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -450,6 +452,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
], ],
), ),
TargetFocus( TargetFocus(
enableTargetTab: false,
identify: 'toggleKey', identify: 'toggleKey',
keyTarget: toggleKey, keyTarget: toggleKey,
shape: ShapeLightFocus.RRect, shape: ShapeLightFocus.RRect,
@ -986,7 +989,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
), ),
ListTile( ListTile(
leading: Icon(Icons.mail_outlined), leading: Icon(Icons.mail_outlined),
title: const Text('Contact'), title: Text(context.translate('Contact','اتصل'),),
onTap: () => context.push('/contact'), onTap: () => context.push('/contact'),
), ),
if (userId != 'guest') if (userId != 'guest')