diff --git a/lib/app/modules/reports/views/reports_view.dart b/lib/app/modules/reports/views/reports_view.dart index 5eb03f8a..609c2559 100644 --- a/lib/app/modules/reports/views/reports_view.dart +++ b/lib/app/modules/reports/views/reports_view.dart @@ -51,6 +51,9 @@ class ReportsView extends GetView { color: TaskWarriorColors.appBarUnSelectedIconsColorForReports), indicatorColor: tColors.purpleShade, labelColor: TaskWarriorColors.white, + onTap: (value) { + controller.selectedIndex.value = value; + }, tabs: [ Tab( key: controller.daily, @@ -130,8 +133,8 @@ class ReportsView extends GetView { ), ], ) - : TabBarView( - controller: controller.tabController, + : IndexedStack( + index: controller.selectedIndex.value, children: [ BurnDownDaily( reportsController: controller, diff --git a/lib/app/modules/reports/views/reports_view_replica.dart b/lib/app/modules/reports/views/reports_view_replica.dart index 0a66345b..83dc42c9 100644 --- a/lib/app/modules/reports/views/reports_view_replica.dart +++ b/lib/app/modules/reports/views/reports_view_replica.dart @@ -69,6 +69,9 @@ class ReportsHomeReplica extends StatelessWidget { unselectedLabelStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.light, ), + onTap: (value) { + reportsController.selectedIndex.value = value; + }, tabs: [ Tab( key: reportsController.daily, @@ -149,13 +152,15 @@ class ReportsHomeReplica extends StatelessWidget { ), ], ) - : TabBarView( - controller: reportsController.tabController, - children: [ - BurnDownDailyReplica(), - BurnDownWeeklyReplica(), - BurnDownMonthlyReplica(), - ], + : Obx( + () => IndexedStack( + index: reportsController.selectedIndex.value, + children: [ + BurnDownDailyReplica(), + BurnDownWeeklyReplica(), + BurnDownMonthlyReplica(), + ], + ), ), ); }, diff --git a/lib/app/modules/reports/views/reports_view_taskc.dart b/lib/app/modules/reports/views/reports_view_taskc.dart index e5f457c3..bdb77374 100644 --- a/lib/app/modules/reports/views/reports_view_taskc.dart +++ b/lib/app/modules/reports/views/reports_view_taskc.dart @@ -65,6 +65,9 @@ class ReportsHomeTaskc extends StatelessWidget { unselectedLabelStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.light, ), + onTap: (value) { + reportsController.selectedIndex.value = value; + }, tabs: [ Tab( key: reportsController.daily, @@ -145,13 +148,15 @@ class ReportsHomeTaskc extends StatelessWidget { ), ], ) - : TabBarView( - controller: reportsController.tabController, - children: [ - BurnDownDailyTaskc(), - BurnDownWeeklyTask(), - BurnDownMonthlyTaskc(), - ], + : Obx( + () => IndexedStack( + index: reportsController.selectedIndex.value, + children: [ + BurnDownDailyTaskc(), + BurnDownWeeklyTask(), + BurnDownMonthlyTaskc(), + ], + ), ), ); },