diff --git a/lib/common/request/exception.dart b/lib/common/request/exception.dart index a23c76a..6798503 100644 --- a/lib/common/request/exception.dart +++ b/lib/common/request/exception.dart @@ -1,5 +1,4 @@ import 'package:dio/dio.dart'; - import 'api_response/api_response_entity.dart'; class ApiException implements Exception { diff --git a/lib/home/bloc/home_bloc.dart b/lib/pages/home/bloc/home_bloc.dart index d70e546..d70e546 100644 --- a/lib/home/bloc/home_bloc.dart +++ b/lib/pages/home/bloc/home_bloc.dart diff --git a/lib/home/bloc/home_event.dart b/lib/pages/home/bloc/home_event.dart index 33589ea..33589ea 100644 --- a/lib/home/bloc/home_event.dart +++ b/lib/pages/home/bloc/home_event.dart diff --git a/lib/home/bloc/home_state.dart b/lib/pages/home/bloc/home_state.dart index 423dfab..423dfab 100644 --- a/lib/home/bloc/home_state.dart +++ b/lib/pages/home/bloc/home_state.dart diff --git a/lib/home/home_page.dart b/lib/pages/home/home_page.dart index 5ed4328..8a9055e 100644 --- a/lib/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -3,11 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/home/bloc/home_bloc.dart'; -import 'package:wow_english/home/widgets/home_lesson_item_widget.dart'; -import 'package:wow_english/home/widgets/home_tab_header_widget.dart'; +import 'package:wow_english/pages/home/widgets/home_lesson_item_widget.dart'; +import 'package:wow_english/pages/home/widgets/home_tab_header_widget.dart'; import 'package:wow_english/route/route.dart'; +import 'bloc/home_bloc.dart'; + class HomePage extends StatelessWidget { const HomePage({super.key}); diff --git a/lib/home/widgets/home_lesson_item_widget.dart b/lib/pages/home/widgets/home_lesson_item_widget.dart index 9bf3a85..9bf3a85 100644 --- a/lib/home/widgets/home_lesson_item_widget.dart +++ b/lib/pages/home/widgets/home_lesson_item_widget.dart diff --git a/lib/home/widgets/home_tab_header_widget.dart b/lib/pages/home/widgets/home_tab_header_widget.dart index 53eaedf..53eaedf 100644 --- a/lib/home/widgets/home_tab_header_widget.dart +++ b/lib/pages/home/widgets/home_tab_header_widget.dart diff --git a/lib/lessons/bloc/lesson_bloc.dart b/lib/pages/lessons/bloc/lesson_bloc.dart index 91c603f..91c603f 100644 --- a/lib/lessons/bloc/lesson_bloc.dart +++ b/lib/pages/lessons/bloc/lesson_bloc.dart diff --git a/lib/lessons/bloc/lesson_event.dart b/lib/pages/lessons/bloc/lesson_event.dart index 13338d6..13338d6 100644 --- a/lib/lessons/bloc/lesson_event.dart +++ b/lib/pages/lessons/bloc/lesson_event.dart diff --git a/lib/lessons/bloc/lesson_state.dart b/lib/pages/lessons/bloc/lesson_state.dart index 5c21ecb..5c21ecb 100644 --- a/lib/lessons/bloc/lesson_state.dart +++ b/lib/pages/lessons/bloc/lesson_state.dart diff --git a/lib/lessons/lesson_page.dart b/lib/pages/lessons/lesson_page.dart index 73766dd..6b1d5e6 100644 --- a/lib/lessons/lesson_page.dart +++ b/lib/pages/lessons/lesson_page.dart @@ -4,8 +4,9 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/common/widgets/we_app_bar.dart'; -import 'package:wow_english/lessons/bloc/lesson_bloc.dart'; -import 'package:wow_english/lessons/widgets/lesson_item_widget.dart'; + +import 'bloc/lesson_bloc.dart'; +import 'widgets/lesson_item_widget.dart'; class LessonPage extends StatelessWidget { const LessonPage({super.key, this.starPageIndex}); diff --git a/lib/lessons/widgets/lesson_item_widget.dart b/lib/pages/lessons/widgets/lesson_item_widget.dart index f75319c..f75319c 100644 --- a/lib/lessons/widgets/lesson_item_widget.dart +++ b/lib/pages/lessons/widgets/lesson_item_widget.dart diff --git a/lib/listen/bloc/listen_bloc.dart b/lib/pages/listen/bloc/listen_bloc.dart index cf2c7b6..cf2c7b6 100644 --- a/lib/listen/bloc/listen_bloc.dart +++ b/lib/pages/listen/bloc/listen_bloc.dart diff --git a/lib/listen/bloc/listen_event.dart b/lib/pages/listen/bloc/listen_event.dart index 84f8d1c..84f8d1c 100644 --- a/lib/listen/bloc/listen_event.dart +++ b/lib/pages/listen/bloc/listen_event.dart diff --git a/lib/listen/bloc/listen_state.dart b/lib/pages/listen/bloc/listen_state.dart index dfb830f..dfb830f 100644 --- a/lib/listen/bloc/listen_state.dart +++ b/lib/pages/listen/bloc/listen_state.dart diff --git a/lib/listen/listen_page.dart b/lib/pages/listen/listen_page.dart index c23bc55..e57725b 100644 --- a/lib/listen/listen_page.dart +++ b/lib/pages/listen/listen_page.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/widgets/we_app_bar.dart'; -import 'package:wow_english/listen/bloc/listen_bloc.dart'; -import 'package:wow_english/listen/widgets/listen_item_widget.dart'; + +import 'bloc/listen_bloc.dart'; +import 'widgets/listen_item_widget.dart'; class ListenPage extends StatelessWidget { const ListenPage({super.key}); diff --git a/lib/listen/widgets/listen_item_widget.dart b/lib/pages/listen/widgets/listen_item_widget.dart index 3f73252..3f73252 100644 --- a/lib/listen/widgets/listen_item_widget.dart +++ b/lib/pages/listen/widgets/listen_item_widget.dart diff --git a/lib/login/forgetpwd/bloc/forget_pwd_home_bloc.dart b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart index 74999e1..74999e1 100644 --- a/lib/login/forgetpwd/bloc/forget_pwd_home_bloc.dart +++ b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart diff --git a/lib/login/forgetpwd/bloc/forget_pwd_home_event.dart b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_event.dart index 0be0181..0be0181 100644 --- a/lib/login/forgetpwd/bloc/forget_pwd_home_event.dart +++ b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_event.dart diff --git a/lib/login/forgetpwd/bloc/forget_pwd_home_state.dart b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_state.dart index cbe7bfa..cbe7bfa 100644 --- a/lib/login/forgetpwd/bloc/forget_pwd_home_state.dart +++ b/lib/pages/login/forgetpwd/bloc/forget_pwd_home_state.dart diff --git a/lib/login/forgetpwd/forget_password_home_page.dart b/lib/pages/login/forgetpwd/forget_password_home_page.dart index ebfe5a9..aede945 100644 --- a/lib/login/forgetpwd/forget_password_home_page.dart +++ b/lib/pages/login/forgetpwd/forget_password_home_page.dart @@ -3,10 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/common/widgets/textfield_customer_widget.dart'; -import 'package:wow_english/login/forgetpwd/bloc/forget_pwd_home_bloc.dart'; -import 'package:wow_english/login/loginpage/time_widget.dart'; +import 'package:wow_english/pages/login/loginpage/time_widget.dart'; import 'package:wow_english/route/route.dart'; +import 'bloc/forget_pwd_home_bloc.dart'; + class ForgetPasswordHomePage extends StatelessWidget { const ForgetPasswordHomePage({super.key}); diff --git a/lib/login/loginpage/bloc/login_bloc.dart b/lib/pages/login/loginpage/bloc/login_bloc.dart index 6f9fa63..87bc0fc 100644 --- a/lib/login/loginpage/bloc/login_bloc.dart +++ b/lib/pages/login/loginpage/bloc/login_bloc.dart @@ -2,11 +2,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; -import '../../../common/request/api_response/api_response_entity.dart'; -import '../../../common/request/apis.dart'; -import '../../../common/request/request.dart'; -import '../../../common/request/request_client.dart'; -import '../../../models/user_entity.dart'; +import '../../../../common/request/api_response/api_response_entity.dart'; +import '../../../../common/request/apis.dart'; +import '../../../../common/request/request.dart'; +import '../../../../common/request/request_client.dart'; +import '../../../../models/user_entity.dart'; part 'login_event.dart'; part 'login_state.dart'; diff --git a/lib/login/loginpage/bloc/login_event.dart b/lib/pages/login/loginpage/bloc/login_event.dart index c68ec2a..c68ec2a 100644 --- a/lib/login/loginpage/bloc/login_event.dart +++ b/lib/pages/login/loginpage/bloc/login_event.dart diff --git a/lib/login/loginpage/bloc/login_state.dart b/lib/pages/login/loginpage/bloc/login_state.dart index 191c310..191c310 100644 --- a/lib/login/loginpage/bloc/login_state.dart +++ b/lib/pages/login/loginpage/bloc/login_state.dart diff --git a/lib/login/loginpage/login_page.dart b/lib/pages/login/loginpage/login_page.dart index 2b59b64..23c7666 100644 --- a/lib/login/loginpage/login_page.dart +++ b/lib/pages/login/loginpage/login_page.dart @@ -4,10 +4,11 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/common/widgets/textfield_customer_widget.dart'; -import 'package:wow_english/login/loginpage/bloc/login_bloc.dart'; -import 'package:wow_english/login/loginpage/time_widget.dart'; +import 'package:wow_english/pages/login/loginpage/time_widget.dart'; import 'package:wow_english/route/route.dart'; +import 'bloc/login_bloc.dart'; + class LoginPage extends StatelessWidget { const LoginPage({super.key}); diff --git a/lib/login/loginpage/time_widget.dart b/lib/pages/login/loginpage/time_widget.dart index cbe5069..cbe5069 100644 --- a/lib/login/loginpage/time_widget.dart +++ b/lib/pages/login/loginpage/time_widget.dart diff --git a/lib/login/setpwd/bloc/set_pwd_bloc.dart b/lib/pages/login/setpwd/bloc/set_pwd_bloc.dart index 50747c3..50747c3 100644 --- a/lib/login/setpwd/bloc/set_pwd_bloc.dart +++ b/lib/pages/login/setpwd/bloc/set_pwd_bloc.dart diff --git a/lib/login/setpwd/bloc/set_pwd_event.dart b/lib/pages/login/setpwd/bloc/set_pwd_event.dart index 20e78f9..20e78f9 100644 --- a/lib/login/setpwd/bloc/set_pwd_event.dart +++ b/lib/pages/login/setpwd/bloc/set_pwd_event.dart diff --git a/lib/login/setpwd/bloc/set_pwd_state.dart b/lib/pages/login/setpwd/bloc/set_pwd_state.dart index a9f5c1e..a9f5c1e 100644 --- a/lib/login/setpwd/bloc/set_pwd_state.dart +++ b/lib/pages/login/setpwd/bloc/set_pwd_state.dart diff --git a/lib/login/setpwd/set_pwd_page.dart b/lib/pages/login/setpwd/set_pwd_page.dart index a250db7..c8ac59d 100644 --- a/lib/login/setpwd/set_pwd_page.dart +++ b/lib/pages/login/setpwd/set_pwd_page.dart @@ -2,10 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/login/setpwd/bloc/set_pwd_bloc.dart'; +import 'package:wow_english/common/widgets/textfield_customer_widget.dart'; import 'package:wow_english/route/route.dart'; -import '../../common/widgets/textfield_customer_widget.dart'; +import 'bloc/set_pwd_bloc.dart'; + class SetPassWordPage extends StatelessWidget { const SetPassWordPage({super.key, this.phoneNum}); diff --git a/lib/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart b/lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart index 1248801..1248801 100644 --- a/lib/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart +++ b/lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart diff --git a/lib/practice/chosetopic/topicpicture/bloc/topic_picture_event.dart b/lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_event.dart index 781f545..781f545 100644 --- a/lib/practice/chosetopic/topicpicture/bloc/topic_picture_event.dart +++ b/lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_event.dart diff --git a/lib/practice/chosetopic/topicpicture/bloc/topic_picture_state.dart b/lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_state.dart index af0e103..af0e103 100644 --- a/lib/practice/chosetopic/topicpicture/bloc/topic_picture_state.dart +++ b/lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_state.dart diff --git a/lib/practice/chosetopic/topicpicture/topic_picture_page.dart b/lib/pages/practice/chosetopic/topicpicture/topic_picture_page.dart index 6c5135b..995a5e8 100644 --- a/lib/practice/chosetopic/topicpicture/topic_picture_page.dart +++ b/lib/pages/practice/chosetopic/topicpicture/topic_picture_page.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart'; import '../../widgets/practice_header_widget.dart'; +import 'bloc/topic_picture_bloc.dart'; class TopicPicturePage extends StatelessWidget { const TopicPicturePage({super.key}); diff --git a/lib/practice/chosetopic/topicword/bloc/topic_word_bloc.dart b/lib/pages/practice/chosetopic/topicword/bloc/topic_word_bloc.dart index 3197025..3197025 100644 --- a/lib/practice/chosetopic/topicword/bloc/topic_word_bloc.dart +++ b/lib/pages/practice/chosetopic/topicword/bloc/topic_word_bloc.dart diff --git a/lib/practice/chosetopic/topicword/bloc/topic_word_event.dart b/lib/pages/practice/chosetopic/topicword/bloc/topic_word_event.dart index 3decdf5..3decdf5 100644 --- a/lib/practice/chosetopic/topicword/bloc/topic_word_event.dart +++ b/lib/pages/practice/chosetopic/topicword/bloc/topic_word_event.dart diff --git a/lib/practice/chosetopic/topicword/bloc/topic_word_state.dart b/lib/pages/practice/chosetopic/topicword/bloc/topic_word_state.dart index a27770f..a27770f 100644 --- a/lib/practice/chosetopic/topicword/bloc/topic_word_state.dart +++ b/lib/pages/practice/chosetopic/topicword/bloc/topic_word_state.dart diff --git a/lib/practice/chosetopic/topicword/topic_word_page.dart b/lib/pages/practice/chosetopic/topicword/topic_word_page.dart index b8f7c8c..d18dbc4 100644 --- a/lib/practice/chosetopic/topicword/topic_word_page.dart +++ b/lib/pages/practice/chosetopic/topicword/topic_word_page.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/practice/chosetopic/topicword/bloc/topic_word_bloc.dart'; -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart'; + +import 'bloc/topic_word_bloc.dart'; class TopicWordPage extends StatelessWidget { const TopicWordPage({super.key}); diff --git a/lib/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart b/lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart index 073782d..073782d 100644 --- a/lib/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart +++ b/lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart diff --git a/lib/practice/voicetopic/voicepicture/bloc/voice_pic_event.dart b/lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_event.dart index c60b951..c60b951 100644 --- a/lib/practice/voicetopic/voicepicture/bloc/voice_pic_event.dart +++ b/lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_event.dart diff --git a/lib/practice/voicetopic/voicepicture/bloc/voice_pic_state.dart b/lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_state.dart index cd05460..cd05460 100644 --- a/lib/practice/voicetopic/voicepicture/bloc/voice_pic_state.dart +++ b/lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_state.dart diff --git a/lib/practice/voicetopic/voicepicture/voice_pic_page.dart b/lib/pages/practice/voicetopic/voicepicture/voice_pic_page.dart index b62d285..d0ef1f9 100644 --- a/lib/practice/voicetopic/voicepicture/voice_pic_page.dart +++ b/lib/pages/practice/voicetopic/voicepicture/voice_pic_page.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart'; -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart'; + +import 'bloc/voice_pic_bloc.dart'; class VoicePicPage extends StatelessWidget { const VoicePicPage({super.key}); diff --git a/lib/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart b/lib/pages/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart index c768bd4..c768bd4 100644 --- a/lib/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart +++ b/lib/pages/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart diff --git a/lib/practice/voicetopic/voiceword/bloc/voice_word_event.dart b/lib/pages/practice/voicetopic/voiceword/bloc/voice_word_event.dart index 1d556a2..1d556a2 100644 --- a/lib/practice/voicetopic/voiceword/bloc/voice_word_event.dart +++ b/lib/pages/practice/voicetopic/voiceword/bloc/voice_word_event.dart diff --git a/lib/practice/voicetopic/voiceword/bloc/voice_word_state.dart b/lib/pages/practice/voicetopic/voiceword/bloc/voice_word_state.dart index 81993db..81993db 100644 --- a/lib/practice/voicetopic/voiceword/bloc/voice_word_state.dart +++ b/lib/pages/practice/voicetopic/voiceword/bloc/voice_word_state.dart diff --git a/lib/practice/voicetopic/voiceword/voice_word_page.dart b/lib/pages/practice/voicetopic/voiceword/voice_word_page.dart index 55bdbfc..144bd47 100644 --- a/lib/practice/voicetopic/voiceword/voice_word_page.dart +++ b/lib/pages/practice/voicetopic/voiceword/voice_word_page.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart'; -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart'; + +import 'bloc/voice_word_bloc.dart'; class VoiceWordPage extends StatelessWidget { const VoiceWordPage({super.key}); diff --git a/lib/practice/widgets/practice_header_widget.dart b/lib/pages/practice/widgets/practice_header_widget.dart index 456f314..456f314 100644 --- a/lib/practice/widgets/practice_header_widget.dart +++ b/lib/pages/practice/widgets/practice_header_widget.dart diff --git a/lib/repeatafter/bloc/repeat_after_bloc.dart b/lib/pages/repeatafter/bloc/repeat_after_bloc.dart index 1d42860..1d42860 100644 --- a/lib/repeatafter/bloc/repeat_after_bloc.dart +++ b/lib/pages/repeatafter/bloc/repeat_after_bloc.dart diff --git a/lib/repeatafter/bloc/repeat_after_event.dart b/lib/pages/repeatafter/bloc/repeat_after_event.dart index 3a46031..3a46031 100644 --- a/lib/repeatafter/bloc/repeat_after_event.dart +++ b/lib/pages/repeatafter/bloc/repeat_after_event.dart diff --git a/lib/repeatafter/bloc/repeat_after_state.dart b/lib/pages/repeatafter/bloc/repeat_after_state.dart index e8c710f..e8c710f 100644 --- a/lib/repeatafter/bloc/repeat_after_state.dart +++ b/lib/pages/repeatafter/bloc/repeat_after_state.dart diff --git a/lib/repeatafter/repeat_after_page.dart b/lib/pages/repeatafter/repeat_after_page.dart index 0dc36ca..818d290 100644 --- a/lib/repeatafter/repeat_after_page.dart +++ b/lib/pages/repeatafter/repeat_after_page.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:wow_english/common/widgets/we_app_bar.dart'; -import 'package:wow_english/repeatafter/widgets/repeat_after_item.dart'; +import 'package:wow_english/pages/repeatafter/widgets/repeat_after_item.dart'; import 'bloc/repeat_after_bloc.dart'; diff --git a/lib/repeatafter/widgets/repeat_after_item.dart b/lib/pages/repeatafter/widgets/repeat_after_item.dart index c898b48..c898b48 100644 --- a/lib/repeatafter/widgets/repeat_after_item.dart +++ b/lib/pages/repeatafter/widgets/repeat_after_item.dart diff --git a/lib/shop/exchane/bloc/exchange_lesson_bloc.dart b/lib/pages/shop/exchane/bloc/exchange_lesson_bloc.dart index 27dc483..27dc483 100644 --- a/lib/shop/exchane/bloc/exchange_lesson_bloc.dart +++ b/lib/pages/shop/exchane/bloc/exchange_lesson_bloc.dart diff --git a/lib/shop/exchane/bloc/exchange_lesson_event.dart b/lib/pages/shop/exchane/bloc/exchange_lesson_event.dart index 7a5d7d9..7a5d7d9 100644 --- a/lib/shop/exchane/bloc/exchange_lesson_event.dart +++ b/lib/pages/shop/exchane/bloc/exchange_lesson_event.dart diff --git a/lib/shop/exchane/bloc/exchange_lesson_state.dart b/lib/pages/shop/exchane/bloc/exchange_lesson_state.dart index 71ddfe1..71ddfe1 100644 --- a/lib/shop/exchane/bloc/exchange_lesson_state.dart +++ b/lib/pages/shop/exchane/bloc/exchange_lesson_state.dart diff --git a/lib/shop/exchane/exchange_lesson_page.dart b/lib/pages/shop/exchane/exchange_lesson_page.dart index e026b83..e026b83 100644 --- a/lib/shop/exchane/exchange_lesson_page.dart +++ b/lib/pages/shop/exchane/exchange_lesson_page.dart diff --git a/lib/shop/exchangelist/bloc/exchange_list_bloc.dart b/lib/pages/shop/exchangelist/bloc/exchange_list_bloc.dart index bccf206..bccf206 100644 --- a/lib/shop/exchangelist/bloc/exchange_list_bloc.dart +++ b/lib/pages/shop/exchangelist/bloc/exchange_list_bloc.dart diff --git a/lib/shop/exchangelist/bloc/exchange_list_event.dart b/lib/pages/shop/exchangelist/bloc/exchange_list_event.dart index ae28d88..ae28d88 100644 --- a/lib/shop/exchangelist/bloc/exchange_list_event.dart +++ b/lib/pages/shop/exchangelist/bloc/exchange_list_event.dart diff --git a/lib/shop/exchangelist/bloc/exchange_list_state.dart b/lib/pages/shop/exchangelist/bloc/exchange_list_state.dart index 80e9f94..80e9f94 100644 --- a/lib/shop/exchangelist/bloc/exchange_list_state.dart +++ b/lib/pages/shop/exchangelist/bloc/exchange_list_state.dart diff --git a/lib/shop/exchangelist/exchange_lesson_list_page.dart b/lib/pages/shop/exchangelist/exchange_lesson_list_page.dart index deb6035..c300421 100644 --- a/lib/shop/exchangelist/exchange_lesson_list_page.dart +++ b/lib/pages/shop/exchangelist/exchange_lesson_list_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:wow_english/common/widgets/we_app_bar.dart'; -import 'package:wow_english/shop/exchangelist/widgets/exchange_list_item.dart'; +import 'package:wow_english/pages/shop/exchangelist/widgets/exchange_list_item.dart'; import 'bloc/exchange_list_bloc.dart'; diff --git a/lib/shop/exchangelist/widgets/exchange_list_item.dart b/lib/pages/shop/exchangelist/widgets/exchange_list_item.dart index 5c78876..5c78876 100644 --- a/lib/shop/exchangelist/widgets/exchange_list_item.dart +++ b/lib/pages/shop/exchangelist/widgets/exchange_list_item.dart diff --git a/lib/shop/home/bloc/shop_home_bloc.dart b/lib/pages/shop/home/bloc/shop_home_bloc.dart index bd765c2..bd765c2 100644 --- a/lib/shop/home/bloc/shop_home_bloc.dart +++ b/lib/pages/shop/home/bloc/shop_home_bloc.dart diff --git a/lib/shop/home/bloc/shop_home_event.dart b/lib/pages/shop/home/bloc/shop_home_event.dart index f35f8fd..f35f8fd 100644 --- a/lib/shop/home/bloc/shop_home_event.dart +++ b/lib/pages/shop/home/bloc/shop_home_event.dart diff --git a/lib/shop/home/bloc/shop_home_state.dart b/lib/pages/shop/home/bloc/shop_home_state.dart index d0b3c17..d0b3c17 100644 --- a/lib/shop/home/bloc/shop_home_state.dart +++ b/lib/pages/shop/home/bloc/shop_home_state.dart diff --git a/lib/shop/home/shop_home_page.dart b/lib/pages/shop/home/shop_home_page.dart index 6a29df9..fb1d46e 100644 --- a/lib/shop/home/shop_home_page.dart +++ b/lib/pages/shop/home/shop_home_page.dart @@ -4,9 +4,10 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; import 'package:wow_english/common/widgets/we_app_bar.dart'; +import 'package:wow_english/pages/shop/home/widgets/lesson_card_item.dart'; import 'package:wow_english/route/route.dart'; -import 'package:wow_english/shop/home/bloc/shop_home_bloc.dart'; -import 'package:wow_english/shop/home/widgets/lesson_card_item.dart'; + +import 'bloc/shop_home_bloc.dart'; class ShopHomePage extends StatelessWidget { const ShopHomePage({super.key}); diff --git a/lib/shop/home/widgets/lesson_card_item.dart b/lib/pages/shop/home/widgets/lesson_card_item.dart index 8e42403..8e42403 100644 --- a/lib/shop/home/widgets/lesson_card_item.dart +++ b/lib/pages/shop/home/widgets/lesson_card_item.dart diff --git a/lib/tab/blocs/tab_bloc.dart b/lib/pages/tab/blocs/tab_bloc.dart index bbd9a3b..bbd9a3b 100644 --- a/lib/tab/blocs/tab_bloc.dart +++ b/lib/pages/tab/blocs/tab_bloc.dart diff --git a/lib/tab/blocs/tab_event.dart b/lib/pages/tab/blocs/tab_event.dart index de244c4..de244c4 100644 --- a/lib/tab/blocs/tab_event.dart +++ b/lib/pages/tab/blocs/tab_event.dart diff --git a/lib/tab/blocs/tab_state.dart b/lib/pages/tab/blocs/tab_state.dart index 28ac36d..28ac36d 100644 --- a/lib/tab/blocs/tab_state.dart +++ b/lib/pages/tab/blocs/tab_state.dart diff --git a/lib/tab/tab_page.dart b/lib/pages/tab/tab_page.dart index ea9035c..143d8f3 100644 --- a/lib/tab/tab_page.dart +++ b/lib/pages/tab/tab_page.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:wow_english/home/home_page.dart'; -import 'package:wow_english/lessons/lesson_page.dart'; -import 'package:wow_english/tab/blocs/tab_bloc.dart'; +import 'package:wow_english/pages/home/home_page.dart'; +import 'package:wow_english/pages/lessons/lesson_page.dart'; + +import 'blocs/tab_bloc.dart'; class TabPage extends StatelessWidget { const TabPage({super.key}); diff --git a/lib/user/bloc/user_bloc.dart b/lib/pages/user/bloc/user_bloc.dart index 377b2aa..377b2aa 100644 --- a/lib/user/bloc/user_bloc.dart +++ b/lib/pages/user/bloc/user_bloc.dart diff --git a/lib/user/bloc/user_event.dart b/lib/pages/user/bloc/user_event.dart index 3dd7c37..3dd7c37 100644 --- a/lib/user/bloc/user_event.dart +++ b/lib/pages/user/bloc/user_event.dart diff --git a/lib/user/bloc/user_state.dart b/lib/pages/user/bloc/user_state.dart index a2a6220..a2a6220 100644 --- a/lib/user/bloc/user_state.dart +++ b/lib/pages/user/bloc/user_state.dart diff --git a/lib/user/user_page.dart b/lib/pages/user/user_page.dart index 6d1e600..c29a825 100644 --- a/lib/user/user_page.dart +++ b/lib/pages/user/user_page.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:wow_english/common/widgets/we_app_bar.dart'; -import '../common/widgets/we_app_bar.dart'; class UserPage extends StatelessWidget { const UserPage({super.key}); @override Widget build(BuildContext context) { - return Scaffold( + return const Scaffold( backgroundColor: Colors.white, appBar: WEAppBar( titleText: '1', diff --git a/lib/video/lookvideo/bloc/look_video_bloc.dart b/lib/pages/video/lookvideo/bloc/look_video_bloc.dart index 9c10502..9c10502 100644 --- a/lib/video/lookvideo/bloc/look_video_bloc.dart +++ b/lib/pages/video/lookvideo/bloc/look_video_bloc.dart diff --git a/lib/video/lookvideo/bloc/look_video_event.dart b/lib/pages/video/lookvideo/bloc/look_video_event.dart index 95bd813..95bd813 100644 --- a/lib/video/lookvideo/bloc/look_video_event.dart +++ b/lib/pages/video/lookvideo/bloc/look_video_event.dart diff --git a/lib/video/lookvideo/bloc/look_video_state.dart b/lib/pages/video/lookvideo/bloc/look_video_state.dart index 9d7102f..9d7102f 100644 --- a/lib/video/lookvideo/bloc/look_video_state.dart +++ b/lib/pages/video/lookvideo/bloc/look_video_state.dart diff --git a/lib/video/lookvideo/look_video_page.dart b/lib/pages/video/lookvideo/look_video_page.dart index 9cba9a6..44fc455 100644 --- a/lib/video/lookvideo/look_video_page.dart +++ b/lib/pages/video/lookvideo/look_video_page.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:wow_english/video/lookvideo/bloc/look_video_bloc.dart'; -import 'package:wow_english/video/lookvideo/widgets/video_widget.dart'; +import 'package:wow_english/pages/video/lookvideo/widgets/video_widget.dart'; + +import 'bloc/look_video_bloc.dart'; class LookVideoPage extends StatefulWidget { const LookVideoPage({super.key}); diff --git a/lib/video/lookvideo/widgets/video_opera_widget.dart b/lib/pages/video/lookvideo/widgets/video_opera_widget.dart index af07ec4..af07ec4 100644 --- a/lib/video/lookvideo/widgets/video_opera_widget.dart +++ b/lib/pages/video/lookvideo/widgets/video_opera_widget.dart diff --git a/lib/video/lookvideo/widgets/video_widget.dart b/lib/pages/video/lookvideo/widgets/video_widget.dart index 1fa1642..8238703 100644 --- a/lib/video/lookvideo/widgets/video_widget.dart +++ b/lib/pages/video/lookvideo/widgets/video_widget.dart @@ -3,7 +3,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:video_player/video_player.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/video/lookvideo/widgets/video_opera_widget.dart'; + +import 'video_opera_widget.dart'; class VideoWidget extends StatefulWidget { const VideoWidget({super.key, this.videoUrl = ''}); diff --git a/lib/voiceanswer/bloc/voice_answer_bloc.dart b/lib/pages/voiceanswer/bloc/voice_answer_bloc.dart index 745bb16..745bb16 100644 --- a/lib/voiceanswer/bloc/voice_answer_bloc.dart +++ b/lib/pages/voiceanswer/bloc/voice_answer_bloc.dart diff --git a/lib/voiceanswer/bloc/voice_answer_event.dart b/lib/pages/voiceanswer/bloc/voice_answer_event.dart index e18461e..e18461e 100644 --- a/lib/voiceanswer/bloc/voice_answer_event.dart +++ b/lib/pages/voiceanswer/bloc/voice_answer_event.dart diff --git a/lib/voiceanswer/bloc/voice_answer_state.dart b/lib/pages/voiceanswer/bloc/voice_answer_state.dart index 07b6716..07b6716 100644 --- a/lib/voiceanswer/bloc/voice_answer_state.dart +++ b/lib/pages/voiceanswer/bloc/voice_answer_state.dart diff --git a/lib/voiceanswer/voice_answer_page.dart b/lib/pages/voiceanswer/voice_answer_page.dart index 246f3b3..d7b347f 100644 --- a/lib/voiceanswer/voice_answer_page.dart +++ b/lib/pages/voiceanswer/voice_answer_page.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; -import 'package:wow_english/voiceanswer/bloc/voice_answer_bloc.dart'; +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart'; + +import 'bloc/voice_answer_bloc.dart'; class VoiceAnswerPage extends StatelessWidget { const VoiceAnswerPage({super.key}); diff --git a/lib/route/route.dart b/lib/route/route.dart index 6fa7707..7033394 100644 --- a/lib/route/route.dart +++ b/lib/route/route.dart @@ -2,24 +2,25 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:wow_english/app/splash_page.dart'; import 'package:wow_english/common/pages/wow_web_page.dart'; -import 'package:wow_english/home/home_page.dart'; -import 'package:wow_english/lessons/lesson_page.dart'; -import 'package:wow_english/listen/listen_page.dart'; -import 'package:wow_english/login/forgetpwd/forget_password_home_page.dart'; -import 'package:wow_english/login/loginpage/login_page.dart'; -import 'package:wow_english/login/setpwd/set_pwd_page.dart'; -import 'package:wow_english/practice/chosetopic/topicpicture/topic_picture_page.dart'; -import 'package:wow_english/practice/chosetopic/topicword/topic_word_page.dart'; -import 'package:wow_english/practice/voicetopic/voicepicture/voice_pic_page.dart'; -import 'package:wow_english/practice/voicetopic/voiceword/voice_word_page.dart'; -import 'package:wow_english/repeatafter/repeat_after_page.dart'; -import 'package:wow_english/shop/exchane/exchange_lesson_page.dart'; -import 'package:wow_english/shop/exchangelist/exchange_lesson_list_page.dart'; -import 'package:wow_english/shop/home/shop_home_page.dart'; -import 'package:wow_english/tab/tab_page.dart'; -import 'package:wow_english/user/user_page.dart'; -import 'package:wow_english/video/lookvideo/look_video_page.dart'; -import 'package:wow_english/voiceanswer/voice_answer_page.dart'; +import 'package:wow_english/pages/home/home_page.dart'; +import 'package:wow_english/pages/lessons/lesson_page.dart'; +import 'package:wow_english/pages/listen/listen_page.dart'; +import 'package:wow_english/pages/login/forgetpwd/forget_password_home_page.dart'; +import 'package:wow_english/pages/login/loginpage/login_page.dart'; +import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart'; +import 'package:wow_english/pages/practice/chosetopic/topicpicture/topic_picture_page.dart'; +import 'package:wow_english/pages/practice/chosetopic/topicword/topic_word_page.dart'; +import 'package:wow_english/pages/practice/voicetopic/voicepicture/voice_pic_page.dart'; +import 'package:wow_english/pages/practice/voicetopic/voiceword/voice_word_page.dart'; +import 'package:wow_english/pages/repeatafter/repeat_after_page.dart'; +import 'package:wow_english/pages/shop/exchane/exchange_lesson_page.dart'; +import 'package:wow_english/pages/shop/exchangelist/exchange_lesson_list_page.dart'; +import 'package:wow_english/pages/shop/home/shop_home_page.dart'; +import 'package:wow_english/pages/tab/tab_page.dart'; +import 'package:wow_english/pages/user/user_page.dart'; +import 'package:wow_english/pages/video/lookvideo/look_video_page.dart'; +import 'package:wow_english/pages/voiceanswer/voice_answer_page.dart'; + class AppRouteName {