changes

lib/core/routers/hero_dialog_route.dart

@@ -16,7 +16,7 @@ class HeroDialogRoute<T> extends PageRoute<T> {
   bool get fullscreenDialog => false;
 
   @override
-  bool get barrierDismissible => true;
+  bool get barrierDismissible => false;
 
   @override
   Duration get transitionDuration => const Duration(seconds: 1); // Adjust as needed

lib/core/widgets/animations/fade_anim_controller.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+
+class FadeAnimController extends StatefulWidget {
+  const FadeAnimController({
+    super.key,
+    required this.child,
+    required this.controller,
+  });
+
+  final Widget child;
+  final AnimationController controller;
+
+  @override
+  State<FadeAnimController> createState() => _FadeAnimControllerState();
+}
+
+class _FadeAnimControllerState extends State<FadeAnimController>
+    with SingleTickerProviderStateMixin {
+  late Animation<double> _animation;
+
+  @override
+  void initState() {
+    super.initState();
+    _animation = Tween<double>(
+      begin: 0,
+      end: 1,
+    ).animate(CurvedAnimation(parent: widget.controller, curve: Curves.linear));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: widget.controller,
+      child: widget.child,
+      builder: (context, child) =>
+          FadeTransition(opacity: _animation, child: child),
+    );
+  }
+}

lib/core/widgets/answer_box/answer_box.dart

@@ -53,8 +53,7 @@ class _AnswerBoxState extends State<AnswerBox> {
                 }
               : null,
           child: Stack(
-            alignment: Alignment.center,
-            clipBehavior: Clip.none,
+            alignment: Alignment.topCenter,
             children: [
               AnswerPictureBox(
                 selected: selected,
@@ -68,7 +67,7 @@ class _AnswerBoxState extends State<AnswerBox> {
               Positioned(
                 left: 0,
                 right: 0,
-                bottom: -60,
+                bottom: 0,
                 child: AnswerTextBox(text: widget.answer.title ?? ''),
               ),
               PositionedDirectional(

lib/core/widgets/answer_box/answer_box_show.dart

@@ -26,7 +26,7 @@ class AnswerBoxShow extends StatelessWidget {
       child: Material(
         type: MaterialType.transparency,
         child: Stack(
-          alignment: Alignment.center,
+          alignment: Alignment.topCenter,
           clipBehavior: Clip.none,
           children: [
             AnswerPictureBox(
@@ -38,7 +38,7 @@ class AnswerBoxShow extends StatelessWidget {
             Positioned(
               left: 0,
               right: 0,
-              bottom: -MySpaces.s40,
+              bottom: -10,
               child: AnswerTextBox(text: answer.title ?? ''),
             ),
             PositionedDirectional(

lib/core/widgets/answer_box/styles/picture_box.dart

@@ -33,7 +33,9 @@ class AnswerPictureBox extends StatelessWidget {
         child: Stack(
           alignment: Alignment.center,
           children: [
-            AnimatedSwitcher(
+            AspectRatio(
+              aspectRatio: 1,
+              child: AnimatedSwitcher(
                 duration: Duration(milliseconds: 150),
                 reverseDuration: Duration(milliseconds: 150),
                 switchInCurve: Curves.linear,
@@ -57,6 +59,7 @@ class AnswerPictureBox extends StatelessWidget {
                       child: child,
                     ),
               ),
+            ),
             PositionedDirectional(
               top: 0,
               child: Container(

lib/features/question/domain/entity/question_entity.dart

@@ -63,6 +63,6 @@ class QuestionEntity extends HiveObject {
   }){
     audio = '${StoragePath.documentDir.path}/${LocalStorage.readData(key: MyConstants.selectLanguage)}/question_audio/${audioInfo?.filename}';
     correctAudio = '${StoragePath.documentDir.path}/${LocalStorage.readData(key: MyConstants.selectLanguage)}/correct_answer_audio/${correctAnswerAudioInfo?.filename}';
-    image = '${StoragePath.documentDir.path}/${LocalStorage.readData(key: MyConstants.selectLanguage)}/question_image/${imageInfo?.filename}';
+    image = '${StoragePath.documentDir.path}/question_image/${imageInfo?.filename}';
   }
 }

lib/features/question/presentation/bloc/question_bloc.dart

@@ -46,7 +46,8 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
       _mainAudioService.setVolume(volume: MyConstants.musicAudioVolume);
     }
     _backgroundAudioService.dispose();
-    animationController.dispose();
+    answerAnimationController.dispose();
+    imageAnimationController.dispose();
     return super.close();
   }
 
@@ -70,12 +71,14 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
   };
   late final Stream<double> volumeStream;
   late final Stream<bool> playingStream;
+  bool showAnswerSequence = true;
 
   /// ------------Controllers------------
   final AudioService _mainAudioService;
   final AudioService _backgroundAudioService = AudioService(volume: 0);
   final AudioService _effectAudioService;
-  late final AnimationController animationController;
+  late final AnimationController answerAnimationController;
+  late final AnimationController imageAnimationController;
 
   /// ------------Functions------------
   void registerShowCase() {
@@ -131,8 +134,8 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
   }
 
   Future<void> playDiamondAudio() async {
-    await _effectAudioService.setAudio(assetPath: MyAudios.diamondEnd);
-    await _effectAudioService.play();
+    await _mainAudioService.setAudio(assetPath: MyAudios.diamondEnd);
+    await _mainAudioService.play();
   }
 
   Future<void> initAudios() async {
@@ -174,23 +177,24 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
     ]);
   }
 
-  // Future<void> showQueueAnswer() async {
-  //   final List<AnswerEntity> answers = state.currentQuestion?.answers ?? [];
-  //   if (answers.isNotEmpty) {
-  //     answers.removeWhere((e) => e.imageId == null);
-  //   }
-  //   for (final answer in answers) {
-  //     await Future.delayed(const Duration(milliseconds: 500), () async {
-  //       if (MyContext.get.mounted) {
-  //         await showAnswerDialog(
-  //           context: MyContext.get,
-  //           answerEntity: answer,
-  //           autoClose: true,
-  //         );
-  //       }
-  //     });
-  //   }
-  // }
+  Future<void> showQueueAnswer() async {
+    if(!showAnswerSequence) return;
+    final List<AnswerEntity> answers = state.currentQuestion?.answers ?? [];
+    if (answers.isNotEmpty) {
+      answers.removeWhere((e) => e.imageId == null);
+    }
+    for (final answer in answers) {
+      await Future.delayed(const Duration(milliseconds: 500), () async {
+        if (MyContext.get.mounted) {
+          await showAnswerDialog(
+            context: MyContext.get,
+            answerEntity: answer,
+            autoClose: true,
+          );
+        }
+      });
+    }
+  }
 
   Future<void> showAnswerDialog({
     required BuildContext context,
@@ -228,6 +232,10 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
     );
   }
 
+  void showingAnswerSequence({required bool show}){
+    showAnswerSequence = show;
+  }
+
   /// ------------Event Calls------------
   FutureOr<void> _getLevelEvent(GetLevelEvent event, Emitter<QuestionState> emit) async {
     await _getLevelUseCase(QuestionParams(id: int.parse(event.id ?? '0'))).then(
@@ -247,16 +255,18 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
               getQuestionStatus: BaseComplete(''),
               levelEntity: level,
               currentQuestion: data.questions?.first,
-              showAnswers: true
             ));
             if(LocalStorage.readData(key: MyConstants.firstShowcase) != 'true'){
               await Future.delayed(Duration(milliseconds: 500));
-              animationController.forward().then((value) {
+              answerAnimationController.forward().then((value) {
                 startShowcase();
               });
             } else {
               await playQuestionAudio();
-              animationController.forward();
+              imageAnimationController.reverse();
+              answerAnimationController.forward().then((value) {
+               showQueueAnswer();
+              });
             }
           },
           (error) {
@@ -272,7 +282,7 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
     emit(state.copyWith(correctAnswer: event.chooseCorrectAnswer));
 
     if (event.chooseCorrectAnswer) {
-      animationController.reverse();
+      answerAnimationController.reverse();
       await showAnswerDialog(
         context: MyContext.get,
         correctAudio: state.currentQuestion?.correctAudio,
@@ -301,8 +311,13 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
             );
           }
         } else {
+          showingAnswerSequence(show: true);
+          imageAnimationController.forward();
           await playQuestionAudio();
-         animationController.forward();
+          imageAnimationController.reverse();
+          answerAnimationController.forward().then((value) {
+            showQueueAnswer();
+          });
         }
       });
     } else {

lib/features/question/presentation/ui/screens/answer_screen.dart

@@ -73,7 +73,6 @@ class _AnswerScreenState extends State<AnswerScreen> {
 
   @override
   void dispose() {
-    audioService.pause();
     super.dispose();
   }
 
@@ -106,8 +105,11 @@ class _AnswerScreenState extends State<AnswerScreen> {
         Positioned(
           bottom: setPlatform<double>(android: MySpaces.s30, iOS: MySpaces.s12),
           child: TextButton(
-            onPressed: () {
+            onPressed: () async {
+              await audioService.pause();
+              if (context.mounted) {
                 context.pop();
+              }
             },
             style: TextButton.styleFrom(
               foregroundColor: MyColors.white.withValues(alpha: 0.7),

lib/features/question/presentation/ui/screens/question_screen.dart

@@ -5,15 +5,19 @@ import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
 import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.dart';
 import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
 import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart';
+import 'package:hadi_hoda_flutter/core/constants/my_constants.dart';
 import 'package:hadi_hoda_flutter/core/utils/gap.dart';
+import 'package:hadi_hoda_flutter/core/utils/local_storage.dart';
 import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
 import 'package:hadi_hoda_flutter/core/utils/screen_size.dart';
 import 'package:hadi_hoda_flutter/core/utils/set_platform_size.dart';
 import 'package:hadi_hoda_flutter/core/widgets/animations/fade_anim.dart';
+import 'package:hadi_hoda_flutter/core/widgets/animations/fade_anim_controller.dart';
 import 'package:hadi_hoda_flutter/core/widgets/animations/globe_animation.dart';
 import 'package:hadi_hoda_flutter/core/widgets/animations/slide_anim.dart';
 import 'package:hadi_hoda_flutter/core/widgets/animations/slide_up_fade.dart';
 import 'package:hadi_hoda_flutter/core/widgets/answer_box/answer_box.dart';
+import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/picture_box.dart';
 import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart';
 import 'package:hadi_hoda_flutter/core/widgets/showcase/my_showcase_widget.dart';
 import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
@@ -30,16 +34,25 @@ class QuestionScreen extends StatefulWidget {
   State<QuestionScreen> createState() => _QuestionScreenState();
 }
 
-class _QuestionScreenState extends State<QuestionScreen> with SingleTickerProviderStateMixin {
+class _QuestionScreenState extends State<QuestionScreen> with TickerProviderStateMixin {
 
   @override
   void initState() {
     super.initState();
-    context.read<QuestionBloc>().animationController = AnimationController(
+    context.read<QuestionBloc>().answerAnimationController = AnimationController(
       vsync: this,
       duration: Duration(milliseconds: 500),
       reverseDuration: Duration(milliseconds: 500),
     );
+
+    context.read<QuestionBloc>().imageAnimationController = AnimationController(
+      vsync: this,
+      duration: Duration(milliseconds: 500),
+      reverseDuration: Duration(milliseconds: 500),
+    );
+    if(LocalStorage.readData(key: MyConstants.firstShowcase) == 'true') {
+      context.read<QuestionBloc>().imageAnimationController.forward();
+    }
   }
 
   @override
@@ -49,12 +62,39 @@ class _QuestionScreenState extends State<QuestionScreen> with SingleTickerProvid
         _stepper(),
         _titles(context),
         MySpaces.s20.gapHeight,
+        Expanded(
+          child: Stack(
+            children: [
+              _questionImage(context),
               _answers(context),
+            ],
+          ),
+        ),
         _bottom(context),
       ],
     );
   }
 
+  Widget _questionImage(BuildContext context) {
+    return Column(
+      children: [
+        Spacer(),
+        FadeAnimController(
+          controller: context.read<QuestionBloc>().imageAnimationController,
+          child: BlocBuilder<QuestionBloc, QuestionState>(
+            builder: (context, state) => AnswerPictureBox(
+              selected: false,
+              correctAnswer: 0,
+              index: 0,
+              image: state.currentQuestion?.image ?? '',
+            ),
+          ),
+        ),
+        Spacer(),
+      ],
+    );
+  }
+
   Widget _stepper() {
     return BlocBuilder<QuestionBloc, QuestionState>(
       buildWhen: (previous, current) =>
@@ -97,9 +137,8 @@ class _QuestionScreenState extends State<QuestionScreen> with SingleTickerProvid
     );
   }
 
-  Expanded _answers(BuildContext context) {
-    return Expanded(
-      child: BlocBuilder<QuestionBloc, QuestionState>(
+  Widget _answers(BuildContext context) {
+    return BlocBuilder<QuestionBloc, QuestionState>(
       buildWhen: (previous, current) =>
       previous.currentQuestion?.id != current.currentQuestion?.id,
         builder: (context, state) => GridView.builder(
@@ -112,14 +151,15 @@ class _QuestionScreenState extends State<QuestionScreen> with SingleTickerProvid
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
           crossAxisCount: 2,
           crossAxisSpacing: MySpaces.s20,
-            mainAxisSpacing: 80,
+          mainAxisSpacing: 20,
+          mainAxisExtent: 250
         ),
         itemBuilder: (context, index) =>
             state.currentQuestion?.answers?[index].imageId == null
             ? SizedBox.shrink()
             : SlideAnim(
               key: Key('${state.currentQuestion?.id}'),
-                controller: context.read<QuestionBloc>().animationController,
+              controller: context.read<QuestionBloc>().answerAnimationController,
               index: index,
                 child: MyShowcaseWidget(
                   globalKey: context.read<QuestionBloc>().showCaseKey['answer_key_$index']!,
@@ -145,7 +185,6 @@ class _QuestionScreenState extends State<QuestionScreen> with SingleTickerProvid
                 ),
               ),
       ),
-      ),
     );
   }
 
@@ -173,6 +212,27 @@ class _QuestionScreenState extends State<QuestionScreen> with SingleTickerProvid
                 ),
               ),
             ),
+            Positioned(
+              left: 120,
+              right: 120,
+              child: FadeAnimController(
+                controller: context.read<QuestionBloc>().imageAnimationController,
+                child: TextButton(
+                  onPressed: () async {
+                    context.read<QuestionBloc>().imageAnimationController.reverse();
+                    context.read<QuestionBloc>().answerAnimationController.forward();
+                    context.read<QuestionBloc>().showingAnswerSequence(show: false);
+                  },
+                  style: TextButton.styleFrom(
+                    foregroundColor: MyColors.white.withValues(alpha: 0.7),
+                  ),
+                  child: Text(
+                      context.translate.skip,
+                      style: MYTextStyle.button2
+                  ),
+                ),
+              ),
+            ),
             PositionedDirectional(
               end: 0,
               child: MyShowcaseWidget(

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hadi_hoda_flutter
 description: "A new Flutter project."
 publish_to: 'none'
-version: 0.1.7+1
+version: 0.1.8+1
 
 environment:
   sdk: ^3.9.2