Merge pull request #356 from BrawlerXull/exit

Fixed double tap to exit app
CCExtractor · Jul 7, 2024 · 1c09780 · 1c09780
2 parents 86727d6 + 6e9f778
commit 1c09780
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/lib/app/modules/home/views/home_page_body.dart b/lib/app/modules/home/views/home_page_body.dart
@@ -21,7 +21,6 @@ class HomePageBody extends StatelessWidget {
     controller.showInAppTour(context);
     return DoubleBackToCloseApp(
       snackBar: const SnackBar(content: Text('Tap back again to exit')),
-      // ignore: avoid_unnecessary_containers
       child: Container(
         color: AppSettings.isDarkMode
             ? Palette.kToDark.shade200

diff --git a/lib/app/modules/home/views/home_view.dart b/lib/app/modules/home/views/home_view.dart
@@ -33,12 +33,6 @@ class HomeView extends GetView<HomeController> {
 
     controller.checkForSync(context);
 
-    // var taskData = controller.searchedTasks;
-
-    // var pendingFilter = controller.pendingFilter;
-    // var waitingFilter = controller.waitingFilter;
-    // var pendingTags = controller.pendingTags;
-
     return Obx(
       () => Scaffold(
         appBar: HomePageAppBar(

diff --git a/lib/app/modules/onboarding/views/onboarding_page_start_button.dart b/lib/app/modules/onboarding/views/onboarding_page_start_button.dart
@@ -16,11 +16,7 @@ class OnboardingPageStartButton extends StatelessWidget {
       child: ElevatedButton(
         onPressed: () {
           controller.markOnboardingAsCompleted();
-          // Navigator.of(context).pushAndRemoveUntil(
-          //   MaterialPageRoute(builder: (context) => const HomeView()),
-          //   (Route<dynamic> route) => false,
-          // );
-          Get.toNamed(Routes.HOME);
+          Get.offNamed(Routes.HOME);
         },
         style: ElevatedButton.styleFrom(
           backgroundColor: TaskWarriorColors.black,

diff --git a/lib/app/modules/splash/bindings/splash_binding.dart b/lib/app/modules/splash/bindings/splash_binding.dart
@@ -7,6 +7,7 @@ class SplashBinding extends Bindings {
   void dependencies() {
     Get.put<SplashController>(
       SplashController(),
+      permanent: true,
     );
   }
 }
diff --git a/lib/app/modules/splash/controllers/splash_controller.dart b/lib/app/modules/splash/controllers/splash_controller.dart
@@ -97,9 +97,9 @@ class SplashController extends GetxController {
   void sendToNextPage() async {
     await checkOnboardingStatus();
     if (hasCompletedOnboarding.value) {
-      Get.toNamed(Routes.HOME);
+      Get.offNamed(Routes.HOME);
     } else {
-      Get.toNamed(Routes.ONBOARDING);
+      Get.offNamed(Routes.ONBOARDING);
     }
   }
 }