Dev

lib/domain/controllers/dnd_controller.dart

@@ -13,7 +13,9 @@ abstract class DndController {
 
   void init();
 
-  Future<void> enableDnd();
+  Future<void> enable();
 
   Future<bool> isDnd();
+
+  Future<void> disable();
 }

lib/infrastructure/dnd_repository.dart

@@ -5,7 +5,7 @@ class _DndRepository extends DndController {
   void init() => supported = Platform.isAndroid;
 
   @override
-  Future<void> enableDnd() async {
+  Future<void> enable() async {
     if (!supported) {
       return;
     }
@@ -21,6 +21,20 @@ class _DndRepository extends DndController {
     }
   }
 
+  @override
+  Future<void> disable() async {
+    if (!supported) {
+      return;
+    }
+
+    if (await PermissionsController.instance
+        .isNotificationPolicyAccessGranted()) {
+      await FlutterDnd.setInterruptionFilter(
+        FlutterDnd.INTERRUPTION_FILTER_ALL,
+      );
+    }
+  }
+
   @override
   Future<bool> isDnd() async {
     if (!supported) {

lib/presentation/organisms/ready_for_session_organism.dart

@@ -5,13 +5,15 @@ import 'package:infinite_horizons/domain/objects/work_type_abstract.dart';
 import 'package:infinite_horizons/presentation/atoms/atoms.dart';
 
 class ReadyForSessionOrganism extends StatefulWidget {
-  const ReadyForSessionOrganism(
-    this.onComplete, {
+  const ReadyForSessionOrganism({
+    required this.onComplete,
+    this.onNextPressed,
     this.response,
   });
 
   final VoidCallback onComplete;
   final String? response;
+  final VoidCallback? onNextPressed;
 
   @override
   State<ReadyForSessionOrganism> createState() =>
@@ -24,6 +26,7 @@ class _ReadyForSessionOrganismState extends State<ReadyForSessionOrganism> {
   bool confettiGotPlayed = false;
 
   void onPressed() {
+    widget.onNextPressed?.call();
     setState(() {
       nextPressed = true;
     });

lib/presentation/organisms/timer_organism.dart

@@ -161,6 +161,12 @@ class TimerOrganismState extends State<TimerOrganism> {
   TimerState state = TimerStateManager.state;
   bool renderSizedBox = false;
 
+  void onComplete() {
+    TimerStateManager.incrementState();
+    TimerStateManager.iterateOverTimerStates();
+    setCurrentState();
+  }
+
   @override
   void initState() {
     super.initState();
@@ -219,11 +225,9 @@ class TimerOrganismState extends State<TimerOrganism> {
           initialValue: timePassed,
         );
       case TimerState.readyToStart:
-        return ReadyForSessionOrganism(() {
-          TimerStateManager.incrementState();
-          TimerStateManager.iterateOverTimerStates();
-          setCurrentState();
-        });
+        return ReadyForSessionOrganism(
+          onComplete: onComplete,
+        );
     }
   }
 

lib/presentation/organisms/tips_organism.dart

@@ -120,8 +120,12 @@ class _TipsOrganismState extends State<TipsOrganism> {
                                           Icons.do_not_disturb_off_outlined,
                                       onIcon: Icons.do_not_disturb_on_outlined,
                                       onChange: (value) {
-                                        confettiController.play();
-                                        DndController.instance.enableDnd();
+                                        if (value) {
+                                          confettiController.play();
+                                          DndController.instance.enable();
+                                          return;
+                                        }
+                                        DndController.instance.disable();
                                       },
                                       initialValue: isDnd!,
                                       trailing: IconButton(
@@ -134,7 +138,6 @@ class _TipsOrganismState extends State<TipsOrganism> {
                                         ),
                                         icon: const Icon(Icons.arrow_forward),
                                       ),
-                                      lockOnToggleOn: true,
                                     ),
                                   ],
                                 ),

lib/presentation/pages/activity_page.dart

@@ -193,6 +193,7 @@ class _ActivityPageState extends State<ActivityPage>
   Widget build(BuildContext context) {
     return PopScope(
       onPopInvokedWithResult: onWillPop,
+      canPop: false,
       child: Scaffold(
         body: PageView(
           onPageChanged: (index) {

lib/presentation/pages/intro_page.dart

@@ -22,10 +22,19 @@ class _IntroPageState extends State<IntroPage> {
   final GlobalKey<IntroductionScreenState> _introKey =
       GlobalKey<IntroductionScreenState>();
 
+  bool showBackButton = true;
   bool showNextButton = true;
+  bool isFinish = false;
   IntroState state = IntroState.tips;
   final Duration selectionTransitionDelay = const Duration(milliseconds: 200);
 
+  void onNextPressed() {
+    isFinish = true;
+    setState(() {
+      showBackButton = false;
+    });
+  }
+
   void onIntroPageChange(int n) {
     state = IntroState.getStateByPageNumber(n);
     bool showNextButtonTemp = true;
@@ -42,10 +51,15 @@ class _IntroPageState extends State<IntroPage> {
 
   void nextPage() => _introKey.currentState?.next();
 
-  void onDone(BuildContext context) => Navigator.of(context)
+  void onDone() => Navigator.of(context)
       .push(MaterialPageRoute(builder: (context) => ActivityPage()));
 
-  void previousPage() => _introKey.currentState?.previous();
+  void previousPage() {
+    if (isFinish) {
+      return;
+    }
+    _introKey.currentState?.previous();
+  }
 
   void onHorizontalDrag(DragEndDetails details) {
     if (details.primaryVelocity == 0) {
@@ -120,10 +134,13 @@ class _IntroPageState extends State<IntroPage> {
                 }),
               ),
               customPageViewModel(
-                bodyWidget: ReadyForSessionPage(() => onDone(context)),
+                bodyWidget: ReadyForSessionPage(
+                  onDone: onDone,
+                  onNextPressed: onNextPressed,
+                ),
               ),
             ],
-            showBackButton: true,
+            showBackButton: showBackButton,
             back: const Icon(Icons.arrow_back),
             next: const Icon(Icons.arrow_forward),
             scrollPhysics: const NeverScrollableScrollPhysics(),

lib/presentation/pages/ready_for_session_page.dart

@@ -6,13 +6,17 @@ import 'package:infinite_horizons/presentation/molecules/molecules.dart';
 import 'package:infinite_horizons/presentation/organisms/organisms.dart';
 
 class ReadyForSessionPage extends StatelessWidget {
-  const ReadyForSessionPage(this.callback);
+  const ReadyForSessionPage({
+    required this.onDone,
+    required this.onNextPressed,
+  });
 
-  final VoidCallback callback;
+  final VoidCallback onNextPressed;
+  final VoidCallback onDone;
 
   void handleCallback() {
     VibrationController.instance.vibrate(VibrationType.light);
-    callback();
+    onDone();
   }
 
   @override
@@ -41,7 +45,8 @@ class ReadyForSessionPage extends StatelessWidget {
       scaffold: false,
       title: 'start_session',
       child: ReadyForSessionOrganism(
-        handleCallback,
+        onComplete: handleCallback,
+        onNextPressed: onNextPressed,
         response: text,
       ),
     );