From b9c940ef4fa67f9cab71ed007ea77e300562e456 Mon Sep 17 00:00:00 2001 From: Kalonkarthik Date: Thu, 13 Mar 2025 15:01:19 +0530 Subject: [PATCH 1/2] app tour bug fixed --- .../Screens/charts/screens/chart_screen.dart | 4 ++++ .../tab_routes/home_route.dart | 18 +++++++++++------- .../drawer_routes/custom_drawer_routes.dart | 7 +++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/presentation/Screens/charts/screens/chart_screen.dart b/lib/presentation/Screens/charts/screens/chart_screen.dart index f1dc1490..9f3fdef8 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 42d611d6..5ba91f12 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 @@ -403,10 +403,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); @@ -423,10 +423,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); @@ -437,6 +437,7 @@ class EconomyStatsState extends ConsumerState { final double screenWidth = MediaQuery.of(context).size.width; homeTargets = [ TargetFocus( + enableTargetTab: false, identify: 'cardTopicKey', keyTarget: cardTopicKey, shape: ShapeLightFocus.RRect, @@ -557,6 +558,7 @@ class EconomyStatsState extends ConsumerState { ], ), TargetFocus( + enableTargetTab: false, identify: 'cardsKey', keyTarget: cardsKey, shape: ShapeLightFocus.RRect, @@ -730,6 +732,7 @@ class EconomyStatsState extends ConsumerState { final double screenWidth = MediaQuery.of(context).size.width; previousHomeTargets = [ TargetFocus( + enableTargetTab: false, identify: 'cardsKey', keyTarget: cardsKey, shape: ShapeLightFocus.RRect, @@ -827,10 +830,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(); @@ -870,7 +873,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'); } }, ), @@ -911,6 +914,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 ebf6158a..2f73fc8e 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, From fdf2cb70c44bd7d229577134eac76f0fea2b19eb Mon Sep 17 00:00:00 2001 From: Kalonkarthik Date: Fri, 14 Mar 2025 12:37:59 +0530 Subject: [PATCH 2/2] contact arabic in drawer --- lib/presentation/routes/drawer_routes/custom_drawer_routes.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart index 2f73fc8e..7ea9e261 100644 --- a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart +++ b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart @@ -989,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')