diff --git a/assets/images/bubble_chat_left.svg b/assets/svg/bubble_chat_left.svg similarity index 100% rename from assets/images/bubble_chat_left.svg rename to assets/svg/bubble_chat_left.svg diff --git a/assets/images/bubble_chat_right.svg b/assets/svg/bubble_chat_right.svg similarity index 100% rename from assets/images/bubble_chat_right.svg rename to assets/svg/bubble_chat_right.svg diff --git a/assets/images/button.svg b/assets/svg/button.svg similarity index 100% rename from assets/images/button.svg rename to assets/svg/button.svg diff --git a/assets/images/button_2.svg b/assets/svg/button_2.svg similarity index 100% rename from assets/images/button_2.svg rename to assets/svg/button_2.svg diff --git a/assets/images/button_3.svg b/assets/svg/button_3.svg similarity index 100% rename from assets/images/button_3.svg rename to assets/svg/button_3.svg diff --git a/assets/images/close_btn.svg b/assets/svg/close_btn.svg similarity index 100% rename from assets/images/close_btn.svg rename to assets/svg/close_btn.svg diff --git a/assets/images/correct.svg b/assets/svg/correct.svg similarity index 100% rename from assets/images/correct.svg rename to assets/svg/correct.svg diff --git a/assets/images/done.svg b/assets/svg/done.svg similarity index 100% rename from assets/images/done.svg rename to assets/svg/done.svg diff --git a/assets/images/done_rounded.svg b/assets/svg/done_rounded.svg similarity index 100% rename from assets/images/done_rounded.svg rename to assets/svg/done_rounded.svg diff --git a/assets/images/facebook.svg b/assets/svg/facebook.svg similarity index 100% rename from assets/images/facebook.svg rename to assets/svg/facebook.svg diff --git a/assets/images/hand_point.svg b/assets/svg/hand_point.svg similarity index 100% rename from assets/images/hand_point.svg rename to assets/svg/hand_point.svg diff --git a/assets/images/home.svg b/assets/svg/home.svg similarity index 100% rename from assets/images/home.svg rename to assets/svg/home.svg diff --git a/assets/images/instagram.svg b/assets/svg/instagram.svg similarity index 100% rename from assets/images/instagram.svg rename to assets/svg/instagram.svg diff --git a/assets/images/lang.svg b/assets/svg/lang.svg similarity index 100% rename from assets/images/lang.svg rename to assets/svg/lang.svg diff --git a/assets/images/language.svg b/assets/svg/language.svg similarity index 100% rename from assets/images/language.svg rename to assets/svg/language.svg diff --git a/assets/images/location.svg b/assets/svg/location.svg similarity index 100% rename from assets/images/location.svg rename to assets/svg/location.svg diff --git a/assets/images/music.svg b/assets/svg/music.svg similarity index 100% rename from assets/images/music.svg rename to assets/svg/music.svg diff --git a/assets/images/music_off.svg b/assets/svg/music_off.svg similarity index 100% rename from assets/images/music_off.svg rename to assets/svg/music_off.svg diff --git a/assets/images/music_on.svg b/assets/svg/music_on.svg similarity index 100% rename from assets/images/music_on.svg rename to assets/svg/music_on.svg diff --git a/assets/images/new_horizon.svg b/assets/svg/new_horizon.svg similarity index 100% rename from assets/images/new_horizon.svg rename to assets/svg/new_horizon.svg diff --git a/assets/images/play.svg b/assets/svg/play.svg similarity index 100% rename from assets/images/play.svg rename to assets/svg/play.svg diff --git a/assets/images/theme.svg b/assets/svg/theme.svg similarity index 100% rename from assets/images/theme.svg rename to assets/svg/theme.svg diff --git a/assets/images/unmusic.svg b/assets/svg/unmusic.svg similarity index 100% rename from assets/images/unmusic.svg rename to assets/svg/unmusic.svg diff --git a/assets/images/whatsapp.svg b/assets/svg/whatsapp.svg similarity index 100% rename from assets/images/whatsapp.svg rename to assets/svg/whatsapp.svg diff --git a/assets/images/wrong.svg b/assets/svg/wrong.svg similarity index 100% rename from assets/images/wrong.svg rename to assets/svg/wrong.svg diff --git a/assets/images/youtube.svg b/assets/svg/youtube.svg similarity index 100% rename from assets/images/youtube.svg rename to assets/svg/youtube.svg diff --git a/lib/common_ui/resources/my_assets.dart b/lib/common_ui/resources/my_assets.dart index 9b046a6..7fbb1e5 100644 --- a/lib/common_ui/resources/my_assets.dart +++ b/lib/common_ui/resources/my_assets.dart @@ -24,32 +24,32 @@ class MyAssets { static const String loading = 'assets/images/loading.png'; /// SVG - static const String closeBtn = 'assets/images/close_btn.svg'; - static const String musicOff = 'assets/images/music_off.svg'; - static const String musicOn = 'assets/images/music_on.svg'; - static const String button = 'assets/images/button.svg'; - static const String button2 = 'assets/images/button_2.svg'; - static const String button3 = 'assets/images/button_3.svg'; - static const String theme = 'assets/images/theme.svg'; - static const String facebook = 'assets/images/facebook.svg'; - static const String whatsapp = 'assets/images/whatsapp.svg'; - static const String youtube = 'assets/images/youtube.svg'; - static const String instagram = 'assets/images/instagram.svg'; - static const String language = 'assets/images/language.svg'; - static const String newHorizon = 'assets/images/new_horizon.svg'; - static const String home = 'assets/images/home.svg'; - static const String music = 'assets/images/music.svg'; - static const String bubbleChatLeft = 'assets/images/bubble_chat_left.svg'; - static const String bubbleChatRight = 'assets/images/bubble_chat_right.svg'; - static const String done = 'assets/images/done.svg'; - static const String correct = 'assets/images/correct.svg'; - static const String wrong = 'assets/images/wrong.svg'; - static const String handPoint = 'assets/images/hand_point.svg'; - static const String location = 'assets/images/location.svg'; - static const String play = 'assets/images/play.svg'; - static const String doneRounded = 'assets/images/done_rounded.svg'; - static const String lang = 'assets/images/lang.svg'; - static const String unMusic = 'assets/images/unmusic.svg'; + static const String closeBtn = 'assets/svg/close_btn.svg'; + static const String musicOff = 'assets/svg/music_off.svg'; + static const String musicOn = 'assets/svg/music_on.svg'; + static const String button = 'assets/svg/button.svg'; + static const String button2 = 'assets/svg/button_2.svg'; + static const String button3 = 'assets/svg/button_3.svg'; + static const String theme = 'assets/svg/theme.svg'; + static const String facebook = 'assets/svg/facebook.svg'; + static const String whatsapp = 'assets/svg/whatsapp.svg'; + static const String youtube = 'assets/svg/youtube.svg'; + static const String instagram = 'assets/svg/instagram.svg'; + static const String language = 'assets/svg/language.svg'; + static const String newHorizon = 'assets/svg/new_horizon.svg'; + static const String home = 'assets/svg/home.svg'; + static const String music = 'assets/svg/music.svg'; + static const String bubbleChatLeft = 'assets/svg/bubble_chat_left.svg'; + static const String bubbleChatRight = 'assets/svg/bubble_chat_right.svg'; + static const String done = 'assets/svg/done.svg'; + static const String correct = 'assets/svg/correct.svg'; + static const String wrong = 'assets/svg/wrong.svg'; + static const String handPoint = 'assets/svg/hand_point.svg'; + static const String location = 'assets/svg/location.svg'; + static const String play = 'assets/svg/play.svg'; + static const String doneRounded = 'assets/svg/done_rounded.svg'; + static const String lang = 'assets/svg/lang.svg'; + static const String unMusic = 'assets/svg/unmusic.svg'; static final List images = [ diff --git a/lib/core/widgets/about_us_dialog/about_us_dialog.dart b/lib/core/widgets/about_us_dialog/about_us_dialog.dart index ec274f3..5b44a9b 100644 --- a/lib/core/widgets/about_us_dialog/about_us_dialog.dart +++ b/lib/core/widgets/about_us_dialog/about_us_dialog.dart @@ -6,9 +6,9 @@ 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_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/check_platform.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/widgets/about_us_dialog/styles/background.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; Future showAboutUsDialog({required BuildContext context}) async { await showDialog( diff --git a/lib/core/widgets/answer_box/styles/picture_box.dart b/lib/core/widgets/answer_box/styles/picture_box.dart index 64550c0..b1b1976 100644 --- a/lib/core/widgets/answer_box/styles/picture_box.dart +++ b/lib/core/widgets/answer_box/styles/picture_box.dart @@ -7,7 +7,7 @@ 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/utils/my_image.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/question/presentation/ui/widgets/black_white_effect.dart'; class AnswerPictureBox extends StatefulWidget { diff --git a/lib/core/widgets/button/my_button.dart b/lib/core/widgets/button/my_button.dart index a0b48fd..a399435 100644 --- a/lib/core/widgets/button/my_button.dart +++ b/lib/core/widgets/button/my_button.dart @@ -3,8 +3,8 @@ 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/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/widgets/button/enum/button_type.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; class MyButton extends StatelessWidget { const MyButton({ diff --git a/lib/core/widgets/error/error_state.dart b/lib/core/widgets/error/error_state.dart index d39e965..e23542d 100644 --- a/lib/core/widgets/error/error_state.dart +++ b/lib/core/widgets/error/error_state.dart @@ -4,8 +4,8 @@ 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/utils/gap.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; class ErrorState extends StatelessWidget { const ErrorState({super.key, this.onTap}); diff --git a/lib/core/widgets/hadith_dialog/hadith_dialog.dart b/lib/core/widgets/hadith_dialog/hadith_dialog.dart index ff5d098..eaa2227 100644 --- a/lib/core/widgets/hadith_dialog/hadith_dialog.dart +++ b/lib/core/widgets/hadith_dialog/hadith_dialog.dart @@ -7,8 +7,8 @@ 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/utils/check_platform.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/widgets/about_us_dialog/styles/background.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; Future showHadithDialog({required BuildContext context}) async { await showDialog( diff --git a/lib/core/utils/my_image.dart b/lib/core/widgets/images/my_image.dart similarity index 85% rename from lib/core/utils/my_image.dart rename to lib/core/widgets/images/my_image.dart index bf977e3..b3b8cd8 100644 --- a/lib/core/utils/my_image.dart +++ b/lib/core/widgets/images/my_image.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/flutter_svg.dart'; +import 'package:vector_graphics/vector_graphics.dart'; class MyImage extends StatelessWidget { const MyImage({ @@ -25,8 +25,8 @@ class MyImage extends StatelessWidget { height: size, ); } else { - return SvgPicture.asset( - image, + return VectorGraphic( + loader: AssetBytesLoader(image), fit: fit ?? BoxFit.contain, width: size, height: size, diff --git a/lib/core/widgets/showcase/question_showcase.dart b/lib/core/widgets/showcase/question_showcase.dart index 79c4f5b..03be7c0 100644 --- a/lib/core/widgets/showcase/question_showcase.dart +++ b/lib/core/widgets/showcase/question_showcase.dart @@ -2,8 +2,8 @@ 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_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:showcaseview/showcaseview.dart'; class QuestionShowcase extends StatelessWidget { diff --git a/lib/features/download/presentation/ui/download_page.dart b/lib/features/download/presentation/ui/download_page.dart index c289fb6..4d6d1ba 100644 --- a/lib/features/download/presentation/ui/download_page.dart +++ b/lib/features/download/presentation/ui/download_page.dart @@ -6,10 +6,10 @@ 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/status/base_status.dart'; import 'package:hadi_hoda_flutter/core/utils/convert_size.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.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/widgets/error/error_state.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/download/domain/entities/download_entity.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'; diff --git a/lib/features/home/presentation/ui/home_page.dart b/lib/features/home/presentation/ui/home_page.dart index 2905c4f..9b6490d 100644 --- a/lib/features/home/presentation/ui/home_page.dart +++ b/lib/features/home/presentation/ui/home_page.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.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_image.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/widgets/button/enum/button_type.dart'; import 'package:hadi_hoda_flutter/core/widgets/button/my_button.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/home/presentation/bloc/home_bloc.dart'; class HomePage extends StatelessWidget { diff --git a/lib/features/intro/presentation/bloc/intro_bloc.dart b/lib/features/intro/presentation/bloc/intro_bloc.dart index 2de2b84..8ec0092 100644 --- a/lib/features/intro/presentation/bloc/intro_bloc.dart +++ b/lib/features/intro/presentation/bloc/intro_bloc.dart @@ -30,9 +30,14 @@ class IntroBloc extends Bloc { await _precacheAllImages(context); } - if (context.mounted) { - context.goNamed(Routes.homePage); - } + await Future.delayed( + Duration(seconds: 2), + () { + if (context.mounted) { + context.goNamed(Routes.homePage); + } + }, + ); } /// ------------Api Calls------------ diff --git a/lib/features/intro/presentation/ui/intro_page.dart b/lib/features/intro/presentation/ui/intro_page.dart index 3bed0a4..fd3cdcf 100644 --- a/lib/features/intro/presentation/ui/intro_page.dart +++ b/lib/features/intro/presentation/ui/intro_page.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.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_image.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; import 'package:hadi_hoda_flutter/core/widgets/animations/rotation_anim.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart'; class IntroPage extends StatefulWidget { diff --git a/lib/features/language/presentation/ui/language_page.dart b/lib/features/language/presentation/ui/language_page.dart index cd5af65..957f1bc 100644 --- a/lib/features/language/presentation/ui/language_page.dart +++ b/lib/features/language/presentation/ui/language_page.dart @@ -4,10 +4,10 @@ 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/utils/my_image.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/widgets/button/my_button.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/language/presentation/bloc/language_bloc.dart'; import 'package:hadi_hoda_flutter/features/language/presentation/bloc/language_event.dart'; import 'package:hadi_hoda_flutter/features/language/presentation/bloc/language_state.dart'; diff --git a/lib/features/level/presentation/ui/level_page.dart b/lib/features/level/presentation/ui/level_page.dart index c9b774e..92f7c14 100644 --- a/lib/features/level/presentation/ui/level_page.dart +++ b/lib/features/level/presentation/ui/level_page.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.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_image.dart'; import 'package:hadi_hoda_flutter/core/utils/screen_size.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart'; import 'package:hadi_hoda_flutter/features/level/presentation/bloc/level_bloc.dart'; import 'package:hadi_hoda_flutter/features/level/presentation/bloc/level_state.dart'; diff --git a/lib/features/level/presentation/ui/widgets/hint_level_widget.dart b/lib/features/level/presentation/ui/widgets/hint_level_widget.dart index c5a95bd..4c0c474 100644 --- a/lib/features/level/presentation/ui/widgets/hint_level_widget.dart +++ b/lib/features/level/presentation/ui/widgets/hint_level_widget.dart @@ -2,10 +2,10 @@ 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/common_ui/resources/my_text_style.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.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/widgets/answer_box/styles/text_box.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart'; class HintLevelWidget extends StatelessWidget { diff --git a/lib/features/level/presentation/ui/widgets/level_widget.dart b/lib/features/level/presentation/ui/widgets/level_widget.dart index fea8e5a..2850a82 100644 --- a/lib/features/level/presentation/ui/widgets/level_widget.dart +++ b/lib/features/level/presentation/ui/widgets/level_widget.dart @@ -2,7 +2,7 @@ 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_colors.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart'; enum LevelType { diff --git a/lib/features/question/presentation/ui/screens/diamond_screen.dart b/lib/features/question/presentation/ui/screens/diamond_screen.dart index 4cd796c..dc66891 100644 --- a/lib/features/question/presentation/ui/screens/diamond_screen.dart +++ b/lib/features/question/presentation/ui/screens/diamond_screen.dart @@ -6,11 +6,11 @@ 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_text_style.dart'; import 'package:hadi_hoda_flutter/core/utils/gap.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.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/widgets/button/enum/button_type.dart'; import 'package:hadi_hoda_flutter/core/widgets/button/my_button.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_bloc.dart'; import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_event.dart'; diff --git a/lib/features/question/presentation/ui/screens/question_screen.dart b/lib/features/question/presentation/ui/screens/question_screen.dart index c4ec545..6d92073 100644 --- a/lib/features/question/presentation/ui/screens/question_screen.dart +++ b/lib/features/question/presentation/ui/screens/question_screen.dart @@ -5,9 +5,9 @@ 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/utils/gap.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; import 'package:hadi_hoda_flutter/core/widgets/answer_box/answer_box.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; import 'package:hadi_hoda_flutter/core/widgets/showcase/question_showcase.dart'; import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart'; import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_bloc.dart'; diff --git a/lib/features/question/presentation/ui/widgets/glassy_button.dart b/lib/features/question/presentation/ui/widgets/glassy_button.dart index b3beb7b..211b00b 100644 --- a/lib/features/question/presentation/ui/widgets/glassy_button.dart +++ b/lib/features/question/presentation/ui/widgets/glassy_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; class GlassyButton extends StatelessWidget { const GlassyButton({super.key, required this.image, this.onTap}); diff --git a/lib/features/question/presentation/ui/widgets/left_blob.dart b/lib/features/question/presentation/ui/widgets/left_blob.dart index f09256b..3f53a61 100644 --- a/lib/features/question/presentation/ui/widgets/left_blob.dart +++ b/lib/features/question/presentation/ui/widgets/left_blob.dart @@ -1,8 +1,8 @@ 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_text_style.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; class LeftBlob extends StatelessWidget { const LeftBlob({super.key}); diff --git a/lib/features/question/presentation/ui/widgets/question_stepper.dart b/lib/features/question/presentation/ui/widgets/question_stepper.dart index bcb4a39..d7408b4 100644 --- a/lib/features/question/presentation/ui/widgets/question_stepper.dart +++ b/lib/features/question/presentation/ui/widgets/question_stepper.dart @@ -1,7 +1,7 @@ import 'package:easy_stepper/easy_stepper.dart'; import 'package:flutter/material.dart'; import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; class QuestionStepper extends StatelessWidget { const QuestionStepper({super.key, required this.length ,required this.currentStep}); diff --git a/lib/features/question/presentation/ui/widgets/right_blob.dart b/lib/features/question/presentation/ui/widgets/right_blob.dart index 03f4268..168395b 100644 --- a/lib/features/question/presentation/ui/widgets/right_blob.dart +++ b/lib/features/question/presentation/ui/widgets/right_blob.dart @@ -1,8 +1,8 @@ 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_text_style.dart'; -import 'package:hadi_hoda_flutter/core/utils/my_image.dart'; import 'package:hadi_hoda_flutter/core/utils/my_localization.dart'; +import 'package:hadi_hoda_flutter/core/widgets/images/my_image.dart'; class RightBlob extends StatelessWidget { const RightBlob({super.key}); diff --git a/pubspec.lock b/pubspec.lock index 1b61d45..f8bbe92 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -299,14 +299,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_svg: - dependency: "direct main" - description: - name: flutter_svg - sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678 - url: "https://pub.dev" - source: hosted - version: "2.2.1" flutter_test: dependency: "direct dev" description: flutter @@ -899,7 +891,7 @@ packages: source: hosted version: "4.5.1" vector_graphics: - dependency: transitive + dependency: "direct main" description: name: vector_graphics sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6 @@ -915,7 +907,7 @@ packages: source: hosted version: "1.1.13" vector_graphics_compiler: - dependency: transitive + dependency: "direct dev" description: name: vector_graphics_compiler sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc diff --git a/pubspec.yaml b/pubspec.yaml index 84f89c0..52ef959 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,6 @@ dependencies: flutter_bloc: ^9.1.1 flutter_localizations: sdk: flutter - flutter_svg: ^2.2.1 get_it: ^8.2.0 go_router: ^16.1.0 hive: ^2.2.3 @@ -29,6 +28,7 @@ dependencies: pretty_dio_logger: ^1.4.0 shared_preferences: ^2.5.3 showcaseview: ^4.0.1 + vector_graphics: ^1.1.19 dev_dependencies: flutter_test: @@ -36,6 +36,7 @@ dev_dependencies: flutter_lints: ^5.0.0 hive_generator: ^2.0.1 build_runner: ^2.4.13 + vector_graphics_compiler: ^1.1.19 flutter: uses-material-design: true @@ -44,6 +45,9 @@ flutter: assets: - assets/fonts/ - assets/images/ + - path: assets/svg/ + transformers: + - package: vector_graphics_compiler fonts: