diff --git a/lib/core/routers/my_routes.dart b/lib/core/routers/my_routes.dart index 0a7c063..2b604c5 100644 --- a/lib/core/routers/my_routes.dart +++ b/lib/core/routers/my_routes.dart @@ -2,7 +2,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; import 'package:hadi_hoda_flutter/core/constants/my_constants.dart'; import 'package:hadi_hoda_flutter/core/middlewares/my_middlewares.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.dart'; +import 'package:hadi_hoda_flutter/core/utils/my_context.dart'; import 'package:hadi_hoda_flutter/features/download/presentation/bloc/download_bloc.dart'; import 'package:hadi_hoda_flutter/features/download/presentation/bloc/download_event.dart'; import 'package:hadi_hoda_flutter/features/download/presentation/ui/download_page.dart'; @@ -40,9 +40,11 @@ class Routes { static const String levelPage = '/level_page'; } -GoRouter get appPages => GoRouter( +final GoRouter appPages = _appPages(); + +GoRouter _appPages() => GoRouter( initialLocation: Routes.splashPage, - navigatorKey: ContextProvider.navigatorKey, + navigatorKey: MyContext.rootNavigatorKey, routes: [ GoRoute( name: Routes.introPage, @@ -131,4 +133,4 @@ GoRouter get appPages => GoRouter( ), ), ], -); +); \ No newline at end of file diff --git a/lib/core/utils/context_provider.dart b/lib/core/utils/context_provider.dart deleted file mode 100644 index f7d5724..0000000 --- a/lib/core/utils/context_provider.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:flutter/cupertino.dart'; - -class ContextProvider { - static const ContextProvider _i = ContextProvider._internal(); - const ContextProvider._internal(); - factory ContextProvider() => _i; - - static GlobalKey navigatorKey = GlobalKey(); - static BuildContext context = navigatorKey.currentContext!; -} diff --git a/lib/core/utils/my_context.dart b/lib/core/utils/my_context.dart new file mode 100644 index 0000000..a9e91b3 --- /dev/null +++ b/lib/core/utils/my_context.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class MyContext { + static const MyContext _i = MyContext._internal(); + const MyContext._internal(); + factory MyContext() => _i; + + static GlobalKey rootNavigatorKey = GlobalKey(); + static BuildContext get = rootNavigatorKey.currentContext!; +} diff --git a/lib/core/utils/screen_size.dart b/lib/core/utils/screen_size.dart index 9778668..689b620 100644 --- a/lib/core/utils/screen_size.dart +++ b/lib/core/utils/screen_size.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.dart'; +import 'package:hadi_hoda_flutter/core/utils/my_context.dart'; extension ScreenSize on BuildContext { double get widthScreen => MediaQuery.sizeOf(this).width; @@ -8,6 +8,6 @@ extension ScreenSize on BuildContext { extension AdaptiveSize on double { - double get w => ContextProvider.context.widthScreen * this; - double get h => ContextProvider.context.heightScreen * this; + double get w => MyContext.get.widthScreen * this; + double get h => MyContext.get.heightScreen * this; } diff --git a/lib/features/download/presentation/bloc/download_bloc.dart b/lib/features/download/presentation/bloc/download_bloc.dart index c62f8aa..74db337 100644 --- a/lib/features/download/presentation/bloc/download_bloc.dart +++ b/lib/features/download/presentation/bloc/download_bloc.dart @@ -6,8 +6,8 @@ import 'package:hadi_hoda_flutter/core/constants/my_constants.dart'; import 'package:hadi_hoda_flutter/core/params/no_params.dart'; 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/context_provider.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/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'; @@ -86,8 +86,8 @@ class DownloadBloc extends Bloc { value.fold( (data) async { await LocalStorage.saveData(key: MyConstants.firstDownload, value: 'true'); - if(ContextProvider.context.mounted){ - ContextProvider.context.goNamed(Routes.homePage); + if(MyContext.get.mounted){ + MyContext.get.goNamed(Routes.homePage); } }, (error) { diff --git a/lib/features/intro/presentation/bloc/intro_bloc.dart b/lib/features/intro/presentation/bloc/intro_bloc.dart index e976396..986da04 100644 --- a/lib/features/intro/presentation/bloc/intro_bloc.dart +++ b/lib/features/intro/presentation/bloc/intro_bloc.dart @@ -5,8 +5,8 @@ import 'package:flutter/cupertino.dart'; import 'package:go_router/go_router.dart'; import 'package:hadi_hoda_flutter/core/constants/my_constants.dart'; import 'package:hadi_hoda_flutter/core/routers/my_routes.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.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/features/intro/presentation/bloc/intro_event.dart'; import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_state.dart'; import 'package:hadi_hoda_flutter/features/intro/presentation/ui/screens/intro_1_screen.dart'; @@ -37,8 +37,8 @@ class IntroBloc extends Bloc { /// ------------Functions------------ Future goToLevelPage() async { await LocalStorage.saveData(key: MyConstants.firstIntro, value: 'true'); - if (ContextProvider.context.mounted) { - ContextProvider.context.goNamed(Routes.levelPage); + if (MyContext.get.mounted) { + MyContext.get.goNamed(Routes.levelPage); } } diff --git a/lib/features/language/presentation/bloc/language_bloc.dart b/lib/features/language/presentation/bloc/language_bloc.dart index 9dc85cb..c6a616f 100644 --- a/lib/features/language/presentation/bloc/language_bloc.dart +++ b/lib/features/language/presentation/bloc/language_bloc.dart @@ -6,8 +6,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hadi_hoda_flutter/core/constants/my_constants.dart'; import 'package:hadi_hoda_flutter/core/routers/my_routes.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.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/storage_path.dart'; import 'package:hadi_hoda_flutter/features/app/presentation/bloc/app_bloc.dart'; import 'package:hadi_hoda_flutter/features/app/presentation/bloc/app_event.dart'; @@ -60,16 +60,16 @@ class LanguageBloc extends Bloc { '${StoragePath.documentDir.path}/${state.selectedLang .code}/question_audio') .existsSync()) { - if (ContextProvider.context.mounted) { - ContextProvider.context.goNamed(Routes.homePage); + if (MyContext.get.mounted) { + MyContext.get.goNamed(Routes.homePage); } } else { await Future.wait([ LocalStorage.deleteData(key: MyConstants.downloadedAudio), LocalStorage.deleteData(key: MyConstants.extractedAudio), ]); - if (ContextProvider.context.mounted) { - ContextProvider.context.goNamed(Routes.downloadPage); + if (MyContext.get.mounted) { + MyContext.get.goNamed(Routes.downloadPage); } } } diff --git a/lib/features/level/presentation/bloc/level_bloc.dart b/lib/features/level/presentation/bloc/level_bloc.dart index 2b965f9..981cc3e 100644 --- a/lib/features/level/presentation/bloc/level_bloc.dart +++ b/lib/features/level/presentation/bloc/level_bloc.dart @@ -9,8 +9,8 @@ import 'package:hadi_hoda_flutter/core/params/level_params.dart'; import 'package:hadi_hoda_flutter/core/routers/my_routes.dart'; import 'package:hadi_hoda_flutter/core/services/audio_service.dart'; import 'package:hadi_hoda_flutter/core/status/base_status.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.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/screen_size.dart'; import 'package:hadi_hoda_flutter/core/utils/set_platform_size.dart'; import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart'; @@ -47,128 +47,128 @@ class LevelBloc extends Bloc { /// ------------Variables------------ final List locationList = [ LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: -0.03.h, tablet: -0.03.h), - left: setSize(context: ContextProvider.context, mobile: 0.1.w, tablet: 0.2.w), + bottom: setSize(context: MyContext.get, mobile: -0.03.h, tablet: -0.03.h), + left: setSize(context: MyContext.get, mobile: 0.1.w, tablet: 0.2.w), index: 0, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.03.h, tablet: 0.1.h), - left: setSize(context: ContextProvider.context, mobile: 0.28.w, tablet: 0.4.w), + bottom: setSize(context: MyContext.get, mobile: 0.03.h, tablet: 0.1.h), + left: setSize(context: MyContext.get, mobile: 0.28.w, tablet: 0.4.w), index: 1, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.1.h, tablet: 0.21.h), - left: setSize(context: ContextProvider.context, mobile: 0.14.w, tablet: 0.2.w), + bottom: setSize(context: MyContext.get, mobile: 0.1.h, tablet: 0.21.h), + left: setSize(context: MyContext.get, mobile: 0.14.w, tablet: 0.2.w), index: 2, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.2.h, tablet: 0.38.h), - left: setSize(context: ContextProvider.context, mobile: 0.3.w, tablet: 0.3.w), + bottom: setSize(context: MyContext.get, mobile: 0.2.h, tablet: 0.38.h), + left: setSize(context: MyContext.get, mobile: 0.3.w, tablet: 0.3.w), index: 3, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.24.h, tablet: 0.47.h), - left: setSize(context: ContextProvider.context, mobile: 0.5.w, tablet: 0.5.w), + bottom: setSize(context: MyContext.get, mobile: 0.24.h, tablet: 0.47.h), + left: setSize(context: MyContext.get, mobile: 0.5.w, tablet: 0.5.w), index: 4, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.33.h, tablet: 0.55.h), - left: setSize(context: ContextProvider.context, mobile: 0.65.w, tablet: 0.8.w), + bottom: setSize(context: MyContext.get, mobile: 0.33.h, tablet: 0.55.h), + left: setSize(context: MyContext.get, mobile: 0.65.w, tablet: 0.8.w), index: 5, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.45.h, tablet: 0.8.h), - left: setSize(context: ContextProvider.context, mobile: 0.57.w, tablet: 0.8.w), + bottom: setSize(context: MyContext.get, mobile: 0.45.h, tablet: 0.8.h), + left: setSize(context: MyContext.get, mobile: 0.57.w, tablet: 0.8.w), index: 6, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.55.h, tablet: 1.1.h), - left: setSize(context: ContextProvider.context, mobile: 0.57.w, tablet: 0.77.w), + bottom: setSize(context: MyContext.get, mobile: 0.55.h, tablet: 1.1.h), + left: setSize(context: MyContext.get, mobile: 0.57.w, tablet: 0.77.w), index: 7, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.6.h, tablet: 1.2.h), - left: setSize(context: ContextProvider.context, mobile: 0.4.w, tablet: 0.65.w), + bottom: setSize(context: MyContext.get, mobile: 0.6.h, tablet: 1.2.h), + left: setSize(context: MyContext.get, mobile: 0.4.w, tablet: 0.65.w), index: 8, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.63.h, tablet: 1.25.h), - left: setSize(context: ContextProvider.context, mobile: 0.2.w, tablet: 0.3.w), + bottom: setSize(context: MyContext.get, mobile: 0.63.h, tablet: 1.25.h), + left: setSize(context: MyContext.get, mobile: 0.2.w, tablet: 0.3.w), index: 9, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.7.h, tablet: 1.38.h), - left: setSize(context: ContextProvider.context, mobile: 0, tablet: 0.04.w), + bottom: setSize(context: MyContext.get, mobile: 0.7.h, tablet: 1.38.h), + left: setSize(context: MyContext.get, mobile: 0, tablet: 0.04.w), index: 10, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.75.h, tablet: 1.46.h), - left: setSize(context: ContextProvider.context, mobile: 0.15.w, tablet: 0.22.w), + bottom: setSize(context: MyContext.get, mobile: 0.75.h, tablet: 1.46.h), + left: setSize(context: MyContext.get, mobile: 0.15.w, tablet: 0.22.w), index: 11, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.78.h, tablet: 1.52.h), - left: setSize(context: ContextProvider.context, mobile: 0.4.w, tablet: 0.45.w), + bottom: setSize(context: MyContext.get, mobile: 0.78.h, tablet: 1.52.h), + left: setSize(context: MyContext.get, mobile: 0.4.w, tablet: 0.45.w), index: 12, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.85.h, tablet: 1.68.h), - left: setSize(context: ContextProvider.context, mobile: 0.5.w, tablet: 0.68.w), + bottom: setSize(context: MyContext.get, mobile: 0.85.h, tablet: 1.68.h), + left: setSize(context: MyContext.get, mobile: 0.5.w, tablet: 0.68.w), index: 13, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 0.94.h, tablet: 1.8.h), - left: setSize(context: ContextProvider.context, mobile: 0.45.w, tablet: 0.6.w), + bottom: setSize(context: MyContext.get, mobile: 0.94.h, tablet: 1.8.h), + left: setSize(context: MyContext.get, mobile: 0.45.w, tablet: 0.6.w), index: 14, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.02.h, tablet: 1.95.h), - left: setSize(context: ContextProvider.context, mobile: 0.45.w, tablet: 0.6.w), + bottom: setSize(context: MyContext.get, mobile: 1.02.h, tablet: 1.95.h), + left: setSize(context: MyContext.get, mobile: 0.45.w, tablet: 0.6.w), index: 15, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.02.h, tablet: 2.01.h), - left: setSize(context: ContextProvider.context, mobile: 0.2.w, tablet: 0.4.w), + bottom: setSize(context: MyContext.get, mobile: 1.02.h, tablet: 2.01.h), + left: setSize(context: MyContext.get, mobile: 0.2.w, tablet: 0.4.w), index: 16, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.02.h, tablet: 2.0.h), - left: setSize(context: ContextProvider.context, mobile: 0, tablet: 0.1.w), + bottom: setSize(context: MyContext.get, mobile: 1.02.h, tablet: 2.0.h), + left: setSize(context: MyContext.get, mobile: 0, tablet: 0.1.w), index: 17, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.1.h, tablet: 2.17.h), - left: setSize(context: ContextProvider.context, mobile: 0, tablet: 0.04.w), + bottom: setSize(context: MyContext.get, mobile: 1.1.h, tablet: 2.17.h), + left: setSize(context: MyContext.get, mobile: 0, tablet: 0.04.w), index: 18, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.2.h, tablet: 2.32.h), - left: setSize(context: ContextProvider.context, mobile: 0.05.w, tablet: 0.1.w), + bottom: setSize(context: MyContext.get, mobile: 1.2.h, tablet: 2.32.h), + left: setSize(context: MyContext.get, mobile: 0.05.w, tablet: 0.1.w), index: 19, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.23.h, tablet: 2.35.h), - left: setSize(context: ContextProvider.context, mobile: 0.23.w, tablet: 0.25.w), + bottom: setSize(context: MyContext.get, mobile: 1.23.h, tablet: 2.35.h), + left: setSize(context: MyContext.get, mobile: 0.23.w, tablet: 0.25.w), index: 20, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.31.h, tablet: 2.5.h), - left: setSize(context: ContextProvider.context, mobile: 0.2.w, tablet: 0.33.w), + bottom: setSize(context: MyContext.get, mobile: 1.31.h, tablet: 2.5.h), + left: setSize(context: MyContext.get, mobile: 0.2.w, tablet: 0.33.w), index: 21, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.37.h, tablet: 2.6.h), - left: setSize(context: ContextProvider.context, mobile: 0.1.w, tablet: 0.2.w), + bottom: setSize(context: MyContext.get, mobile: 1.37.h, tablet: 2.6.h), + left: setSize(context: MyContext.get, mobile: 0.1.w, tablet: 0.2.w), index: 22, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.45.h, tablet: 2.7.h), - left: setSize(context: ContextProvider.context, mobile: 0.1.w, tablet: 0.1.w), + bottom: setSize(context: MyContext.get, mobile: 1.45.h, tablet: 2.7.h), + left: setSize(context: MyContext.get, mobile: 0.1.w, tablet: 0.1.w), index: 23, ), LevelLocation( - bottom: setSize(context: ContextProvider.context, mobile: 1.5.h, tablet: 2.8.h), - left: setSize(context: ContextProvider.context, mobile: 0.2.w, tablet: 0.15.w), + bottom: setSize(context: MyContext.get, mobile: 1.5.h, tablet: 2.8.h), + left: setSize(context: MyContext.get, mobile: 0.2.w, tablet: 0.15.w), index: 24, ), ]; diff --git a/lib/features/question/presentation/bloc/question_bloc.dart b/lib/features/question/presentation/bloc/question_bloc.dart index 289dc8c..9c05cdb 100644 --- a/lib/features/question/presentation/bloc/question_bloc.dart +++ b/lib/features/question/presentation/bloc/question_bloc.dart @@ -10,8 +10,8 @@ import 'package:hadi_hoda_flutter/core/routers/hero_dialog_route.dart'; import 'package:hadi_hoda_flutter/core/routers/my_routes.dart'; import 'package:hadi_hoda_flutter/core/services/audio_service.dart'; import 'package:hadi_hoda_flutter/core/status/base_status.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.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/widgets/dialog/hadith_dialog.dart'; import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart'; import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart'; @@ -169,7 +169,7 @@ class QuestionBloc extends Bloc { ); }, (error) { - goToLevelPage(context: ContextProvider.context); + goToLevelPage(context: MyContext.get); }, ), ); @@ -213,7 +213,7 @@ class QuestionBloc extends Bloc { if (event.chooseCorrectAnswer) { playCorrectAudio(); - await Navigator.of(ContextProvider.context).push( + await Navigator.of(MyContext.get).push( HeroDialogRoute( builder: (dialogContext) { return AnswerScreen( diff --git a/lib/features/question/presentation/ui/screens/answer_screen.dart b/lib/features/question/presentation/ui/screens/answer_screen.dart index 6f036b2..721730e 100644 --- a/lib/features/question/presentation/ui/screens/answer_screen.dart +++ b/lib/features/question/presentation/ui/screens/answer_screen.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_animations.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/core/utils/context_provider.dart'; +import 'package:hadi_hoda_flutter/core/utils/my_context.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/answer_box/answer_box_show.dart'; @@ -35,8 +35,8 @@ class _AnswerScreenState extends State { Future back() async { if (widget.showConfetti) { await Future.delayed(Duration(seconds: 3), () { - if (ContextProvider.context.mounted) { - ContextProvider.context.pop(); + if (MyContext.get.mounted) { + MyContext.get.pop(); } }); }