Merge pull request 'fix/bugs' (#54) from fix/bugs into develop

Reviewed-on: https://git.nwhco.ir/amirreza.chegini/hade_hoda_flutter/pulls/54

ios/Runner/Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSAllowsArbitraryLoads</key>
+      <true/>
+    </dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>

lib/core/utils/pre_cache_image.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
+import 'package:hadi_hoda_flutter/core/utils/my_context.dart';
+
+Future<void> preCacheImages() async {
+  await Future.wait(
+    MyAssets.images.map(
+      (assetPath) => precacheImage(AssetImage(assetPath), MyContext.get),
+    ),
+  );
+}

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

@@ -19,6 +19,7 @@ class AnswerPictureBox extends StatelessWidget {
     required this.correctAnswer,
     this.onTap,
     this.autostart = Autostart.no,
+    this.showIndex = true,
   });
 
   final bool selected;
@@ -27,6 +28,7 @@ class AnswerPictureBox extends StatelessWidget {
   final int correctAnswer;
   final VoidCallback? onTap;
   final Autostart autostart;
+  final bool showIndex;
 
   @override
   Widget build(BuildContext context) {
@@ -72,6 +74,7 @@ class AnswerPictureBox extends StatelessWidget {
                     ),
               ),
             ),
+            if (showIndex)
               PositionedDirectional(
                 top: 0,
                 child: Container(

lib/features/download/data/datasource/download_datasource.dart

@@ -90,11 +90,11 @@ class DownloadDatasourceImpl implements IDownloadDatasource {
           'lang': selectedLanguage,
         },
         onReceive: (count, total) {
-          streamController.add(DownloadEntity(
-            count: count / 1,
-            total: total / 1,
-            percent: (count / total) * 100,
-          ));
+          // streamController.add(DownloadEntity(
+          //   count: count / 1,
+          //   total: total / 1,
+          //   percent: (count / total) * 100,
+          // ));
         },
       ).then((value) async {
         await LocalStorage.saveData(

lib/features/download/presentation/bloc/download_bloc.dart

@@ -8,6 +8,7 @@ import 'package:hadi_hoda_flutter/core/routers/my_routes.dart';
 import 'package:hadi_hoda_flutter/core/status/base_status.dart';
 import 'package:hadi_hoda_flutter/core/utils/local_storage.dart';
 import 'package:hadi_hoda_flutter/core/utils/my_context.dart';
+import 'package:hadi_hoda_flutter/core/utils/pre_cache_image.dart';
 import 'package:hadi_hoda_flutter/features/download/domain/entities/download_entity.dart';
 import 'package:hadi_hoda_flutter/features/download/domain/usecases/get_audios_usecase.dart';
 import 'package:hadi_hoda_flutter/features/download/domain/usecases/get_images_usecase.dart';
@@ -25,6 +26,7 @@ class DownloadBloc extends Bloc<DownloadEvent, DownloadState> {
       this._saveLevelsUseCase,
       )
     : super(const DownloadState()) {
+    preCacheImages();
     on<GetImagesEvent>(_getImagesEvent);
     on<GetAudiosEvent>(_getAudiosEvent);
     on<SaveLevelsEvent>(_saveLevelsEvent);

lib/features/intro/presentation/bloc/intro_bloc.dart

@@ -14,11 +14,24 @@ import 'package:hadi_hoda_flutter/features/intro/presentation/ui/screens/intro_2
 import 'package:hadi_hoda_flutter/features/intro/presentation/ui/screens/intro_3_screen.dart';
 import 'package:hadi_hoda_flutter/features/intro/presentation/ui/screens/intro_4_screen.dart';
 import 'package:hadi_hoda_flutter/features/intro/presentation/ui/screens/intro_5_screen.dart';
+import 'package:pod_player/pod_player.dart';
 
 class IntroBloc extends Bloc<IntroEvent, IntroState> {
   /// ------------constructor------------
   IntroBloc() : super(const IntroState()) {
-    on<ChangeIntroEvent>(_changeIntroEvent);
+    initVideos();
+    on<InitVideosEvent>(_initVideosEvent);
+    on<ChangeVideosEvent>(_changeVideosEvent);
+  }
+
+  @override
+  Future<void> close() {
+    podController1.dispose();
+    podController2.dispose();
+    podController3.dispose();
+    podController4.dispose();
+    podController5.dispose();
+    return super.close();
   }
 
   /// ------------UseCases------------
@@ -33,6 +46,21 @@ class IntroBloc extends Bloc<IntroEvent, IntroState> {
   ];
 
   /// ------------Controllers------------
+  final PodPlayerController podController1 = PodPlayerController(
+    playVideoFrom: PlayVideoFrom.asset('assets/videos/intro_1.mp4'),
+  );
+  final PodPlayerController podController2 = PodPlayerController(
+    playVideoFrom: PlayVideoFrom.asset('assets/videos/intro_2.mp4'),
+  );
+  final PodPlayerController podController3 = PodPlayerController(
+    playVideoFrom: PlayVideoFrom.asset('assets/videos/intro_3.mp4'),
+  );
+  final PodPlayerController podController4 = PodPlayerController(
+    playVideoFrom: PlayVideoFrom.asset('assets/videos/intro_4.mp4'),
+  );
+  final PodPlayerController podController5 = PodPlayerController(
+    playVideoFrom: PlayVideoFrom.asset('assets/videos/intro_5.mp4'),
+  );
 
   /// ------------Functions------------
   Future<void> goToHomePage() async {
@@ -43,11 +71,46 @@ class IntroBloc extends Bloc<IntroEvent, IntroState> {
   }
 
   /// ------------Api Calls------------
-  FutureOr<void> _changeIntroEvent(ChangeIntroEvent event, Emitter emit) async {
-    if (state.currentIntro < intros.length - 1) {
-      emit(state.copyWith(currentIntro: state.currentIntro + 1));
-    } else {
+  FutureOr<void> _changeVideosEvent(ChangeVideosEvent event, Emitter emit) async {
+    switch (state.currentIntro) {
+      case 0:
+        podController2.play();
+        emit(state.copyWith(currentIntro: 1));
+        break;
+      case 1:
+        podController3.play();
+        emit(state.copyWith(currentIntro: 2));
+        break;
+      case 2:
+        podController4.play();
+        emit(state.copyWith(currentIntro: 3));
+        break;
+      case 3:
+        podController5.play();
+        emit(state.copyWith(currentIntro: 4));
+        break;
+      case 4:
         goToHomePage();
+        break;
+    }
   }
+
+  Future<void> initVideos() async {
+    await Future.wait([
+      podController1.initialise(),
+      podController2.initialise(),
+      podController3.initialise(),
+      podController4.initialise(),
+      podController5.initialise(),
+    ]);
+    podController1.play();
+    add(InitVideosEvent());
+  }
+
+  FutureOr<void> _initVideosEvent(
+    InitVideosEvent event,
+    Emitter<IntroState> emit,
+  ) async {
+    emit(state.copyWith(currentIntro: 0));
   }
 }

lib/features/intro/presentation/bloc/intro_event.dart

@@ -2,4 +2,6 @@ sealed class IntroEvent {
   const IntroEvent();
 }
 
-class ChangeIntroEvent extends IntroEvent {}
+class InitVideosEvent extends IntroEvent {}
+
+class ChangeVideosEvent extends IntroEvent {}

lib/features/intro/presentation/ui/intro_page.dart

@@ -16,7 +16,7 @@ class IntroPage extends StatelessWidget {
     return Scaffold(
       body: SizedBox.expand(
         child: GestureDetector(
-          onTap: () => context.read<IntroBloc>().add(ChangeIntroEvent()),
+          onTap: () => context.read<IntroBloc>().add(ChangeVideosEvent()),
           child: Stack(
             children: [
               _mainScreen(),

lib/features/intro/presentation/ui/screens/intro_1_screen.dart

@@ -1,54 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
-import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
+import 'package:flutter_bloc/flutter_bloc.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/slide_up_fade.dart';
-import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart';
-import 'package:hadi_hoda_flutter/features/intro/presentation/ui/widgets/bubble_chat_widget.dart';
+import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart';
+import 'package:pod_player/pod_player.dart';
 
 class Intro1Screen extends StatelessWidget {
   const Intro1Screen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Positioned.fill(
-          child: MyImage(image: MyAssets.intro_1, fit: BoxFit.cover),
+    return SizedBox.expand(
+      child: PodVideoPlayer(
+        controller: context.read<IntroBloc>().podController1,
+        overlayBuilder: (options) => SizedBox.shrink(),
+        alwaysShowProgressBar: false,
+        videoAspectRatio: context.widthScreen / context.heightScreen,
+        frameAspectRatio: context.widthScreen / context.heightScreen,
+        backgroundColor: Color(0XFF00154C),
+        onLoading: (context) => SizedBox.shrink(),
       ),
-        PositionedDirectional(
-          end: setSize<double>(
-            context: context,
-            mobile: MySpaces.s10,
-            tablet: 0.15.w,
-          ),
-          top: setSize<double>(
-            context: context,
-            mobile: 0.15.h,
-            tablet: 0.25.h,
-          ),
-          width: 290,
-          child: SlideUpFade(
-            delay: Duration(milliseconds: 300),
-            child: BubbleChatWidget(
-              text: context.translate.intro_1_1,
-              flip: true,
-            ),
-          ),
-        ),
-        PositionedDirectional(
-          start: setSize(context: context, mobile: MySpaces.s30, tablet: 0.2.w),
-          top: setSize(context: context, mobile: 0.3.h, tablet: 0.35.h),
-          width: 250,
-          child: SlideUpFade(
-            delay: Duration(milliseconds: 800),
-            child: BubbleChatWidget(text: context.translate.intro_1_2),
-          ),
-        ),
-      ],
     );
   }
 }

lib/features/intro/presentation/ui/screens/intro_2_screen.dart

@@ -1,37 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
-import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.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/slide_up_fade.dart';
-import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart';
-import 'package:hadi_hoda_flutter/features/intro/presentation/ui/widgets/bubble_chat_widget.dart';
+import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart';
+import 'package:pod_player/pod_player.dart';
 
 class Intro2Screen extends StatelessWidget {
   const Intro2Screen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Positioned.fill(
-          child: Transform.flip(
-            flipX: true,
-            child: MyImage(image: MyAssets.intro_2, fit: BoxFit.cover),
+    return SizedBox.expand(
+      child: PodVideoPlayer(
+        controller: context.read<IntroBloc>().podController2,
+        overlayBuilder: (options) => SizedBox.shrink(),
+        alwaysShowProgressBar: false,
+        videoAspectRatio: context.widthScreen / context.heightScreen,
+        frameAspectRatio: context.widthScreen / context.heightScreen,
+        backgroundColor: MyColors.transparent,
+        onLoading: (context) => SizedBox.shrink(),
       ),
-        ),
-        PositionedDirectional(
-          end: setSize(context: context, mobile: MySpaces.s40, tablet: 0.3.w),
-          top: setSize(context: context, mobile: 0.17.h, tablet: 0.23.h),
-          width: 250,
-          child: SlideUpFade(
-            delay: Duration(milliseconds: 300),
-            child: BubbleChatWidget(text: context.translate.intro_2),
-          ),
-        ),
-      ],
     );
   }
 }

lib/features/intro/presentation/ui/screens/intro_3_screen.dart

@@ -1,37 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
-import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.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/slide_up_fade.dart';
-import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart';
-import 'package:hadi_hoda_flutter/features/intro/presentation/ui/widgets/bubble_chat_widget.dart';
+import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart';
+import 'package:pod_player/pod_player.dart';
 
 class Intro3Screen extends StatelessWidget {
   const Intro3Screen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Positioned.fill(
-          child: MyImage(image: MyAssets.intro_3, fit: BoxFit.cover),
+    return SizedBox.expand(
+      child: PodVideoPlayer(
+        controller: context.read<IntroBloc>().podController3,
+        overlayBuilder: (options) => SizedBox.shrink(),
+        alwaysShowProgressBar: false,
+        videoAspectRatio: context.widthScreen / context.heightScreen,
+        frameAspectRatio: context.widthScreen / context.heightScreen,
+        backgroundColor: MyColors.transparent,
+        onLoading: (context) => SizedBox.shrink(),
       ),
-        PositionedDirectional(
-          start: setSize(context: context, mobile: MySpaces.s30),
-          top: setSize(context: context, mobile: 180, tablet: 0.25.h),
-          width: 270,
-          child: SlideUpFade(
-            delay: Duration(milliseconds: 300),
-            child: BubbleChatWidget(
-              text: context.translate.intro_3,
-              flip: true,
-            ),
-          ),
-        ),
-      ],
     );
   }
 }

lib/features/intro/presentation/ui/screens/intro_4_screen.dart

@@ -1,36 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
-import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.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/slide_up_fade.dart';
-import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart';
-import 'package:hadi_hoda_flutter/features/intro/presentation/ui/widgets/bubble_chat_widget.dart';
+import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart';
+import 'package:pod_player/pod_player.dart';
 
 class Intro4Screen extends StatelessWidget {
   const Intro4Screen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Positioned.fill(
-          child: MyImage(image: MyAssets.intro_4, fit: BoxFit.cover),
+    return SizedBox.expand(
+      child: PodVideoPlayer(
+        controller: context.read<IntroBloc>().podController4,
+        overlayBuilder: (options) => SizedBox.shrink(),
+        alwaysShowProgressBar: false,
+        videoAspectRatio: context.widthScreen / context.heightScreen,
+        frameAspectRatio: context.widthScreen / context.heightScreen,
+        backgroundColor: MyColors.transparent,
+        onLoading: (context) => SizedBox.shrink(),
       ),
-        PositionedDirectional(
-          start: setSize(context: context, mobile: MySpaces.s10, tablet: 0.2.w),
-          bottom: setSize(context: context, mobile: 0.4.h, tablet: 0.4.h),
-          width: 237,
-          child: SlideUpFade(
-            delay: Duration(milliseconds: 300),
-            child: BubbleChatWidget(
-              text: context.translate.intro_4,
-            ),
-          ),
-        ),
-      ],
     );
   }
 }

lib/features/intro/presentation/ui/screens/intro_5_screen.dart

@@ -1,34 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
-import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hadi_hoda_flutter/common_ui/resources/my_colors.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/slide_up_fade.dart';
-import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart';
-import 'package:hadi_hoda_flutter/features/intro/presentation/ui/widgets/bubble_chat_widget.dart';
+import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart';
+import 'package:pod_player/pod_player.dart';
 
 class Intro5Screen extends StatelessWidget {
   const Intro5Screen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Positioned.fill(
-          child: MyImage(image: MyAssets.intro_5, fit: BoxFit.cover),
+    return SizedBox.expand(
+      child: PodVideoPlayer(
+        controller: context.read<IntroBloc>().podController5,
+        overlayBuilder: (options) => SizedBox.shrink(),
+        alwaysShowProgressBar: false,
+        videoAspectRatio: context.widthScreen / context.heightScreen,
+        frameAspectRatio: context.widthScreen / context.heightScreen,
+        backgroundColor: MyColors.transparent,
+        onLoading: (context) => SizedBox.shrink(),
       ),
-        PositionedDirectional(
-          top: setSize(context: context, mobile: 0.37.h, tablet: 0.42.h),
-          width: 200,
-          child: SlideUpFade(
-            delay: Duration(milliseconds: 300),
-            child: BubbleChatWidget(
-              text: context.translate.intro_5,
-            ),
-          ),
-        ),
-      ],
     );
   }
 }

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

@@ -45,7 +45,6 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
     _backgroundAudioService.dispose();
     answerAnimationController.dispose();
     imageAnimationController.dispose();
-    titleController.dispose();
     return super.close();
   }
 
@@ -77,16 +76,20 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
   final AudioService _effectAudioService;
   late final AnimationController answerAnimationController;
   late final AnimationController imageAnimationController;
-  final ScrollController titleController = ScrollController();
 
   /// ------------Functions------------
-  void startScrollTitle({Duration? audioDuration}) {
-    if (audioDuration == null || audioDuration == Duration.zero) return;
-    titleController.animateTo(
-        titleController.position.maxScrollExtent,
-        duration: audioDuration,
-        curve: Curves.linear
-    );
+  // void startScrollTitle({Duration? audioDuration}) {
+  //   if (audioDuration == null || audioDuration == Duration.zero) return;
+  //   titleController.animateTo(
+  //       titleController.position.maxScrollExtent,
+  //       duration: audioDuration,
+  //       curve: Curves.linear
+  //   );
+  // }
+
+  Future<void> showImageWithDelayed() async {
+    await Future.delayed(const Duration(milliseconds: 500));
+    imageAnimationController.forward();
   }
 
   void showHadith({required BuildContext context}) {
@@ -136,11 +139,7 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
   }
 
   Future<void> playQuestionAudio() async {
-    if(titleController.hasClients){
-      titleController.jumpTo(0);
-    }
-    Duration? duration = await _mainAudioService.setAudio(filePath: state.currentQuestion?.audio);
-    startScrollTitle(audioDuration: duration);
+    await _mainAudioService.setAudio(filePath: state.currentQuestion?.audio);
     await _mainAudioService.play();
   }
 
@@ -262,7 +261,6 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
     emit(state.copyWith(correctAnswer: event.chooseCorrectAnswer));
 
     if (event.chooseCorrectAnswer) {
-      answerAnimationController.reverse();
       await showAnswerDialog(
         context: MyContext.get,
         correctAudio: state.currentQuestion?.correctAudio,
@@ -292,6 +290,7 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
           }
         } else {
           showingAnswerSequence(show: true);
+          answerAnimationController.reverse();
           imageAnimationController.forward();
           await playQuestionAudio();
           imageAnimationController.reverse();

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

@@ -76,8 +76,6 @@ class _QuestionScreenState extends State<QuestionScreen> with TickerProviderStat
     return Column(
       children: [
         _stepper(),
-        _titles(context),
-        MySpaces.s20.gapHeight,
         Expanded(
           child: Stack(
             children: [
@@ -95,11 +93,13 @@ class _QuestionScreenState extends State<QuestionScreen> with TickerProviderStat
     return Column(
       children: [
         Spacer(),
-        FadeAnimController(
+        BlocBuilder<QuestionBloc, QuestionState>(
+          builder: (context, state) => FadeAnimController(
+            key: Key('${state.currentQuestion?.image}'),
             controller: context.read<QuestionBloc>().imageAnimationController,
-          child: BlocBuilder<QuestionBloc, QuestionState>(
-            builder: (context, state) => AnswerPictureBox(
+            child: AnswerPictureBox(
               selected: false,
+              showIndex: false,
               correctAnswer: 0,
               index: 0,
               image: state.currentQuestion?.image ?? '',
@@ -129,14 +129,9 @@ class _QuestionScreenState extends State<QuestionScreen> with TickerProviderStat
     return BlocBuilder<QuestionBloc, QuestionState>(
       buildWhen: (previous, current) =>
           previous.currentQuestion?.id != current.currentQuestion?.id,
-      builder: (context, state) =>
-          FadeAnim(
-            child: SizedBox(
-              height: 100,
-              child: ListView(
-                controller: context.read<QuestionBloc>().titleController,
-                children: [
-                  Text(
+      builder: (context, state) => FadeAnimController(
+        controller: context.read<QuestionBloc>().answerAnimationController,
+        child: Text(
           state.currentQuestion?.title ?? '',
           textAlign: TextAlign.center,
           style: MYTextStyle.titr1.copyWith(
@@ -148,15 +143,16 @@ class _QuestionScreenState extends State<QuestionScreen> with TickerProviderStat
             ],
           ),
         ),
-                ],
-              ),
-            ),
       ),
     );
   }
 
   Widget _answers(BuildContext context) {
-    return BlocBuilder<QuestionBloc, QuestionState>(
+    return ListView(
+      children: [
+        _titles(context),
+        30.0.gapHeight,
+        BlocBuilder<QuestionBloc, QuestionState>(
           buildWhen: (previous, current) =>
           previous.currentQuestion?.id != current.currentQuestion?.id,
             builder: (context, state) => GridView.builder(
@@ -197,6 +193,8 @@ class _QuestionScreenState extends State<QuestionScreen> with TickerProviderStat
                     ),
                   ),
           ),
+        ),
+      ],
     );
   }
 

lib/features/splash/presentation/bloc/splash_bloc.dart

@@ -1,8 +1,8 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:go_router/go_router.dart';
-import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
 import 'package:hadi_hoda_flutter/core/routers/my_routes.dart';
+import 'package:hadi_hoda_flutter/core/utils/pre_cache_image.dart';
 import 'package:hadi_hoda_flutter/features/splash/presentation/bloc/splash_event.dart';
 import 'package:hadi_hoda_flutter/features/splash/presentation/bloc/splash_state.dart';
 
@@ -17,19 +17,9 @@ class SplashBloc extends Bloc<SplashEvent, SplashState> {
   /// ------------Controllers------------
 
   /// ------------Functions------------
-  Future<void> _precacheAllImages(BuildContext context) async {
-    await Future.wait(
-      MyAssets.images.map(
-        (assetPath) => precacheImage(AssetImage(assetPath), context),
-      ),
-    );
-  }
 
   Future<void> goToHomePage(BuildContext context) async {
-    if (context.mounted) {
-      await _precacheAllImages(context);
-    }
-
+    await preCacheImages();
     await Future.delayed(
       Duration(seconds: 2),
       () {

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hadi_hoda_flutter
 description: "A new Flutter project."
 publish_to: 'none'
-version: 0.2.0+1
+version: 0.2.1+1
 
 environment:
   sdk: ^3.9.2
@@ -51,6 +51,7 @@ flutter:
     - assets/images/
     - assets/animations/
     - assets/audios/
+    - assets/videos/
     - path: assets/svg/
       transformers:
         - package: vector_graphics_compiler