diff --git a/lib/presentation/Screens/charts/screens/chart_screen.dart b/lib/presentation/Screens/charts/screens/chart_screen.dart index 9c98a13f..ff181998 100644 --- a/lib/presentation/Screens/charts/screens/chart_screen.dart +++ b/lib/presentation/Screens/charts/screens/chart_screen.dart @@ -508,6 +508,7 @@ class _ChartScreen1State extends ConsumerState { final double screenHeight = MediaQuery.of(context).size.height; marriageTargets = [ TargetFocus( + enableTargetTab: false, identify: 'cardKey', keyTarget: cardKey, shape: ShapeLightFocus.RRect, @@ -671,6 +672,7 @@ class _ChartScreen1State extends ConsumerState { ], ), TargetFocus( + enableTargetTab: false, identify: 'BookMarkKey', keyTarget: bookMarkKey, shape: ShapeLightFocus.RRect, @@ -837,6 +839,7 @@ class _ChartScreen1State extends ConsumerState { final double screenHeight = MediaQuery.of(context).size.height; previousMarriageTargets = [ TargetFocus( + enableTargetTab: false, identify: 'BookMarkKey', keyTarget: bookMarkKey, shape: ShapeLightFocus.RRect, @@ -996,6 +999,7 @@ class _ChartScreen1State extends ConsumerState { ], ), TargetFocus( + enableTargetTab: false, identify: 'cardKey', keyTarget: cardKey, shape: ShapeLightFocus.RRect, diff --git a/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart b/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart index 68174edc..ea6106fe 100644 --- a/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart +++ b/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart @@ -410,10 +410,10 @@ class EconomyStatsState extends ConsumerState { debugPrint('Home Tutorial Finished'); locale.languageCode == 'ar' ? context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=null&title=المنشآت الفندقية', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home', ) : context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages', ); }, )..show(context: context); @@ -430,10 +430,10 @@ class EconomyStatsState extends ConsumerState { debugPrint('Previous Home Tutorial Finished'); locale.languageCode == 'ar' ? context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=null&title=المنشآت الفندقية', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home', ) : context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages', ); }, )..show(context: context); @@ -444,6 +444,7 @@ class EconomyStatsState extends ConsumerState { final double screenWidth = MediaQuery.of(context).size.width; homeTargets = [ TargetFocus( + enableTargetTab: false, identify: 'cardTopicKey', keyTarget: cardTopicKey, shape: ShapeLightFocus.RRect, @@ -564,6 +565,7 @@ class EconomyStatsState extends ConsumerState { ], ), TargetFocus( + enableTargetTab: false, identify: 'cardsKey', keyTarget: cardsKey, shape: ShapeLightFocus.RRect, @@ -737,6 +739,7 @@ class EconomyStatsState extends ConsumerState { final double screenWidth = MediaQuery.of(context).size.width; previousHomeTargets = [ TargetFocus( + enableTargetTab: false, identify: 'cardsKey', keyTarget: cardsKey, shape: ShapeLightFocus.RRect, @@ -834,10 +837,10 @@ class EconomyStatsState extends ConsumerState { .state = false; locale.languageCode == 'ar' ? context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=null&title=المنشآت الفندقية', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home', ) : context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=null&title=Marriages', ); } else { tutorialCoachMark.next(); @@ -877,7 +880,7 @@ class EconomyStatsState extends ConsumerState { chartsTourProvider.notifier) .state = false; 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 { ], ), TargetFocus( + enableTargetTab: false, identify: 'cardTopicKey', keyTarget: cardTopicKey, shape: ShapeLightFocus.RRect, diff --git a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart index 1bfaa193..c4b269d4 100644 --- a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart +++ b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart @@ -141,6 +141,7 @@ class _BaseScaffoldState extends ConsumerState { final double screenHeight = MediaQuery.of(context).size.height; appBarTargets = [ TargetFocus( + enableTargetTab: false, identify: 'bottomNav', keyTarget: bottomNavKey, shape: ShapeLightFocus.RRect, // Rounded rectangle highlight @@ -232,7 +233,7 @@ class _BaseScaffoldState extends ConsumerState { .notifier) .state = false; 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 { .notifier) .state = false; context.go( - '/chartScreen/hotels?bgColor=0xFF90B0D5&mainTopic=ECONOMY&title=Hotel+Establishments', + '/chartScreen/marriages?bgColor=0xFFAA8E83&mainTopic=اجتماعي&title=الزواج&key=home', ); } else { tutorialCoachMark.next(); @@ -287,6 +288,7 @@ class _BaseScaffoldState extends ConsumerState { ], ), TargetFocus( + enableTargetTab: false, identify: 'drawerKey', keyTarget: drawerKey, shape: ShapeLightFocus.RRect, @@ -450,6 +452,7 @@ class _BaseScaffoldState extends ConsumerState { ], ), TargetFocus( + enableTargetTab: false, identify: 'toggleKey', keyTarget: toggleKey, shape: ShapeLightFocus.RRect, @@ -986,7 +989,7 @@ class _BaseScaffoldState extends ConsumerState { ), ListTile( leading: Icon(Icons.mail_outlined), - title: const Text('Contact'), + title: Text(context.translate('Contact','اتصل'),), onTap: () => context.push('/contact'), ), if (userId != 'guest')