liangchengyou / wow_english

Commit 4b358e2215a993d918d5c9b57b259ae67d913b5e

Authored by liangchengyou
1 parent 056970d8

feat:调整文件结构

Inline Side-by-side
Showing 85 changed files with 72 additions and 58 deletions
lib/common/request/exception.dart
  View file @4b358e2
1 import 'package:dio/dio.dart'; 1 import 'package:dio/dio.dart';
2 -  
3 import 'api_response/api_response_entity.dart'; 2 import 'api_response/api_response_entity.dart';
4 3
5 class ApiException implements Exception { 4 class ApiException implements Exception {
lib/home/bloc/home_bloc.dart renamed to lib/pages/home/bloc/home_bloc.dart
  View file @4b358e2
lib/home/bloc/home_event.dart renamed to lib/pages/home/bloc/home_event.dart
  View file @4b358e2
lib/home/bloc/home_state.dart renamed to lib/pages/home/bloc/home_state.dart
  View file @4b358e2
lib/home/home_page.dart renamed to lib/pages/home/home_page.dart
  View file @4b358e2
@@ -3,11 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; @@ -3,11 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_easyloading/flutter_easyloading.dart'; 3 import 'package:flutter_easyloading/flutter_easyloading.dart';
4 import 'package:flutter_screenutil/flutter_screenutil.dart'; 4 import 'package:flutter_screenutil/flutter_screenutil.dart';
5 import 'package:wow_english/common/extension/string_extension.dart'; 5 import 'package:wow_english/common/extension/string_extension.dart';
6 -import 'package:wow_english/home/bloc/home_bloc.dart';  
7 -import 'package:wow_english/home/widgets/home_lesson_item_widget.dart';  
8 -import 'package:wow_english/home/widgets/home_tab_header_widget.dart'; 6 +import 'package:wow_english/pages/home/widgets/home_lesson_item_widget.dart';
  7 +import 'package:wow_english/pages/home/widgets/home_tab_header_widget.dart';
9 import 'package:wow_english/route/route.dart'; 8 import 'package:wow_english/route/route.dart';
10 9
  10 +import 'bloc/home_bloc.dart';
  11 +
11 class HomePage extends StatelessWidget { 12 class HomePage extends StatelessWidget {
12 const HomePage({super.key}); 13 const HomePage({super.key});
13 14
lib/home/widgets/home_lesson_item_widget.dart renamed to lib/pages/home/widgets/home_lesson_item_widget.dart
  View file @4b358e2
lib/home/widgets/home_tab_header_widget.dart renamed to lib/pages/home/widgets/home_tab_header_widget.dart
  View file @4b358e2
lib/lessons/bloc/lesson_bloc.dart renamed to lib/pages/lessons/bloc/lesson_bloc.dart
  View file @4b358e2
lib/lessons/bloc/lesson_event.dart renamed to lib/pages/lessons/bloc/lesson_event.dart
  View file @4b358e2
lib/lessons/bloc/lesson_state.dart renamed to lib/pages/lessons/bloc/lesson_state.dart
  View file @4b358e2
lib/lessons/lesson_page.dart renamed to lib/pages/lessons/lesson_page.dart
  View file @4b358e2
@@ -4,8 +4,9 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; @@ -4,8 +4,9 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
4 import 'package:flutter_screenutil/flutter_screenutil.dart'; 4 import 'package:flutter_screenutil/flutter_screenutil.dart';
5 import 'package:wow_english/common/extension/string_extension.dart'; 5 import 'package:wow_english/common/extension/string_extension.dart';
6 import 'package:wow_english/common/widgets/we_app_bar.dart'; 6 import 'package:wow_english/common/widgets/we_app_bar.dart';
7 -import 'package:wow_english/lessons/bloc/lesson_bloc.dart';  
8 -import 'package:wow_english/lessons/widgets/lesson_item_widget.dart'; 7 +
  8 +import 'bloc/lesson_bloc.dart';
  9 +import 'widgets/lesson_item_widget.dart';
9 10
10 class LessonPage extends StatelessWidget { 11 class LessonPage extends StatelessWidget {
11 const LessonPage({super.key, this.starPageIndex}); 12 const LessonPage({super.key, this.starPageIndex});
lib/lessons/widgets/lesson_item_widget.dart renamed to lib/pages/lessons/widgets/lesson_item_widget.dart
  View file @4b358e2
lib/listen/bloc/listen_bloc.dart renamed to lib/pages/listen/bloc/listen_bloc.dart
  View file @4b358e2
lib/listen/bloc/listen_event.dart renamed to lib/pages/listen/bloc/listen_event.dart
  View file @4b358e2
lib/listen/bloc/listen_state.dart renamed to lib/pages/listen/bloc/listen_state.dart
  View file @4b358e2
lib/listen/listen_page.dart renamed to lib/pages/listen/listen_page.dart
  View file @4b358e2
@@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; @@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/widgets/we_app_bar.dart'; 4 import 'package:wow_english/common/widgets/we_app_bar.dart';
5 -import 'package:wow_english/listen/bloc/listen_bloc.dart';  
6 -import 'package:wow_english/listen/widgets/listen_item_widget.dart'; 5 +
  6 +import 'bloc/listen_bloc.dart';
  7 +import 'widgets/listen_item_widget.dart';
7 8
8 class ListenPage extends StatelessWidget { 9 class ListenPage extends StatelessWidget {
9 const ListenPage({super.key}); 10 const ListenPage({super.key});
lib/listen/widgets/listen_item_widget.dart renamed to lib/pages/listen/widgets/listen_item_widget.dart
  View file @4b358e2
lib/login/forgetpwd/bloc/forget_pwd_home_bloc.dart renamed to lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart
  View file @4b358e2
lib/login/forgetpwd/bloc/forget_pwd_home_event.dart renamed to lib/pages/login/forgetpwd/bloc/forget_pwd_home_event.dart
  View file @4b358e2
lib/login/forgetpwd/bloc/forget_pwd_home_state.dart renamed to lib/pages/login/forgetpwd/bloc/forget_pwd_home_state.dart
  View file @4b358e2
lib/login/forgetpwd/forget_password_home_page.dart renamed to lib/pages/login/forgetpwd/forget_password_home_page.dart
  View file @4b358e2
@@ -3,10 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart'; @@ -3,10 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 import 'package:wow_english/common/widgets/textfield_customer_widget.dart'; 5 import 'package:wow_english/common/widgets/textfield_customer_widget.dart';
6 -import 'package:wow_english/login/forgetpwd/bloc/forget_pwd_home_bloc.dart';  
7 -import 'package:wow_english/login/loginpage/time_widget.dart'; 6 +import 'package:wow_english/pages/login/loginpage/time_widget.dart';
8 import 'package:wow_english/route/route.dart'; 7 import 'package:wow_english/route/route.dart';
9 8
  9 +import 'bloc/forget_pwd_home_bloc.dart';
  10 +
10 class ForgetPasswordHomePage extends StatelessWidget { 11 class ForgetPasswordHomePage extends StatelessWidget {
11 const ForgetPasswordHomePage({super.key}); 12 const ForgetPasswordHomePage({super.key});
12 13
lib/login/loginpage/bloc/login_bloc.dart renamed to lib/pages/login/loginpage/bloc/login_bloc.dart
  View file @4b358e2
@@ -2,11 +2,11 @@ import 'package:flutter/cupertino.dart'; @@ -2,11 +2,11 @@ import 'package:flutter/cupertino.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_easyloading/flutter_easyloading.dart'; 3 import 'package:flutter_easyloading/flutter_easyloading.dart';
4 4
5 -import '../../../common/request/api_response/api_response_entity.dart';  
6 -import '../../../common/request/apis.dart';  
7 -import '../../../common/request/request.dart';  
8 -import '../../../common/request/request_client.dart';  
9 -import '../../../models/user_entity.dart'; 5 +import '../../../../common/request/api_response/api_response_entity.dart';
  6 +import '../../../../common/request/apis.dart';
  7 +import '../../../../common/request/request.dart';
  8 +import '../../../../common/request/request_client.dart';
  9 +import '../../../../models/user_entity.dart';
10 10
11 part 'login_event.dart'; 11 part 'login_event.dart';
12 part 'login_state.dart'; 12 part 'login_state.dart';
lib/login/loginpage/bloc/login_event.dart renamed to lib/pages/login/loginpage/bloc/login_event.dart
  View file @4b358e2
lib/login/loginpage/bloc/login_state.dart renamed to lib/pages/login/loginpage/bloc/login_state.dart
  View file @4b358e2
lib/login/loginpage/login_page.dart renamed to lib/pages/login/loginpage/login_page.dart
  View file @4b358e2
@@ -4,10 +4,11 @@ import 'package:flutter_bloc/flutter_bloc.dart'; @@ -4,10 +4,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
4 import 'package:flutter_screenutil/flutter_screenutil.dart'; 4 import 'package:flutter_screenutil/flutter_screenutil.dart';
5 import 'package:wow_english/common/extension/string_extension.dart'; 5 import 'package:wow_english/common/extension/string_extension.dart';
6 import 'package:wow_english/common/widgets/textfield_customer_widget.dart'; 6 import 'package:wow_english/common/widgets/textfield_customer_widget.dart';
7 -import 'package:wow_english/login/loginpage/bloc/login_bloc.dart';  
8 -import 'package:wow_english/login/loginpage/time_widget.dart'; 7 +import 'package:wow_english/pages/login/loginpage/time_widget.dart';
9 import 'package:wow_english/route/route.dart'; 8 import 'package:wow_english/route/route.dart';
10 9
  10 +import 'bloc/login_bloc.dart';
  11 +
11 class LoginPage extends StatelessWidget { 12 class LoginPage extends StatelessWidget {
12 const LoginPage({super.key}); 13 const LoginPage({super.key});
13 14
lib/login/loginpage/time_widget.dart renamed to lib/pages/login/loginpage/time_widget.dart
  View file @4b358e2
lib/login/setpwd/bloc/set_pwd_bloc.dart renamed to lib/pages/login/setpwd/bloc/set_pwd_bloc.dart
  View file @4b358e2
lib/login/setpwd/bloc/set_pwd_event.dart renamed to lib/pages/login/setpwd/bloc/set_pwd_event.dart
  View file @4b358e2
lib/login/setpwd/bloc/set_pwd_state.dart renamed to lib/pages/login/setpwd/bloc/set_pwd_state.dart
  View file @4b358e2
lib/login/setpwd/set_pwd_page.dart renamed to lib/pages/login/setpwd/set_pwd_page.dart
  View file @4b358e2
@@ -2,10 +2,11 @@ import 'package:flutter/material.dart'; @@ -2,10 +2,11 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 -import 'package:wow_english/login/setpwd/bloc/set_pwd_bloc.dart'; 5 +import 'package:wow_english/common/widgets/textfield_customer_widget.dart';
6 import 'package:wow_english/route/route.dart'; 6 import 'package:wow_english/route/route.dart';
7 7
8 -import '../../common/widgets/textfield_customer_widget.dart'; 8 +import 'bloc/set_pwd_bloc.dart';
  9 +
9 10
10 class SetPassWordPage extends StatelessWidget { 11 class SetPassWordPage extends StatelessWidget {
11 const SetPassWordPage({super.key, this.phoneNum}); 12 const SetPassWordPage({super.key, this.phoneNum});
lib/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart renamed to lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart
  View file @4b358e2
lib/practice/chosetopic/topicpicture/bloc/topic_picture_event.dart renamed to lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_event.dart
  View file @4b358e2
lib/practice/chosetopic/topicpicture/bloc/topic_picture_state.dart renamed to lib/pages/practice/chosetopic/topicpicture/bloc/topic_picture_state.dart
  View file @4b358e2
lib/practice/chosetopic/topicpicture/topic_picture_page.dart renamed to lib/pages/practice/chosetopic/topicpicture/topic_picture_page.dart
  View file @4b358e2
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; @@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 -import 'package:wow_english/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart';  
6 5
7 import '../../widgets/practice_header_widget.dart'; 6 import '../../widgets/practice_header_widget.dart';
  7 +import 'bloc/topic_picture_bloc.dart';
8 8
9 class TopicPicturePage extends StatelessWidget { 9 class TopicPicturePage extends StatelessWidget {
10 const TopicPicturePage({super.key}); 10 const TopicPicturePage({super.key});
lib/practice/chosetopic/topicword/bloc/topic_word_bloc.dart renamed to lib/pages/practice/chosetopic/topicword/bloc/topic_word_bloc.dart
  View file @4b358e2
lib/practice/chosetopic/topicword/bloc/topic_word_event.dart renamed to lib/pages/practice/chosetopic/topicword/bloc/topic_word_event.dart
  View file @4b358e2
lib/practice/chosetopic/topicword/bloc/topic_word_state.dart renamed to lib/pages/practice/chosetopic/topicword/bloc/topic_word_state.dart
  View file @4b358e2
lib/practice/chosetopic/topicword/topic_word_page.dart renamed to lib/pages/practice/chosetopic/topicword/topic_word_page.dart
  View file @4b358e2
@@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; @@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 -import 'package:wow_english/practice/chosetopic/topicword/bloc/topic_word_bloc.dart';  
6 -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; 5 +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
  6 +
  7 +import 'bloc/topic_word_bloc.dart';
7 8
8 class TopicWordPage extends StatelessWidget { 9 class TopicWordPage extends StatelessWidget {
9 const TopicWordPage({super.key}); 10 const TopicWordPage({super.key});
lib/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart renamed to lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart
  View file @4b358e2
lib/practice/voicetopic/voicepicture/bloc/voice_pic_event.dart renamed to lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_event.dart
  View file @4b358e2
lib/practice/voicetopic/voicepicture/bloc/voice_pic_state.dart renamed to lib/pages/practice/voicetopic/voicepicture/bloc/voice_pic_state.dart
  View file @4b358e2
lib/practice/voicetopic/voicepicture/voice_pic_page.dart renamed to lib/pages/practice/voicetopic/voicepicture/voice_pic_page.dart
  View file @4b358e2
@@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; @@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 -import 'package:wow_english/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart';  
6 -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; 5 +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
  6 +
  7 +import 'bloc/voice_pic_bloc.dart';
7 8
8 class VoicePicPage extends StatelessWidget { 9 class VoicePicPage extends StatelessWidget {
9 const VoicePicPage({super.key}); 10 const VoicePicPage({super.key});
lib/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart renamed to lib/pages/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart
  View file @4b358e2
lib/practice/voicetopic/voiceword/bloc/voice_word_event.dart renamed to lib/pages/practice/voicetopic/voiceword/bloc/voice_word_event.dart
  View file @4b358e2
lib/practice/voicetopic/voiceword/bloc/voice_word_state.dart renamed to lib/pages/practice/voicetopic/voiceword/bloc/voice_word_state.dart
  View file @4b358e2
lib/practice/voicetopic/voiceword/voice_word_page.dart renamed to lib/pages/practice/voicetopic/voiceword/voice_word_page.dart
  View file @4b358e2
@@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; @@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 -import 'package:wow_english/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart';  
6 -import 'package:wow_english/practice/widgets/practice_header_widget.dart'; 5 +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
  6 +
  7 +import 'bloc/voice_word_bloc.dart';
7 8
8 class VoiceWordPage extends StatelessWidget { 9 class VoiceWordPage extends StatelessWidget {
9 const VoiceWordPage({super.key}); 10 const VoiceWordPage({super.key});
lib/practice/widgets/practice_header_widget.dart renamed to lib/pages/practice/widgets/practice_header_widget.dart
  View file @4b358e2
lib/repeatafter/bloc/repeat_after_bloc.dart renamed to lib/pages/repeatafter/bloc/repeat_after_bloc.dart
  View file @4b358e2
lib/repeatafter/bloc/repeat_after_event.dart renamed to lib/pages/repeatafter/bloc/repeat_after_event.dart
  View file @4b358e2
lib/repeatafter/bloc/repeat_after_state.dart renamed to lib/pages/repeatafter/bloc/repeat_after_state.dart
  View file @4b358e2
lib/repeatafter/repeat_after_page.dart renamed to lib/pages/repeatafter/repeat_after_page.dart
  View file @4b358e2
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; @@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
4 import 'package:flutter_bloc/flutter_bloc.dart'; 4 import 'package:flutter_bloc/flutter_bloc.dart';
5 import 'package:flutter_easyloading/flutter_easyloading.dart'; 5 import 'package:flutter_easyloading/flutter_easyloading.dart';
6 import 'package:wow_english/common/widgets/we_app_bar.dart'; 6 import 'package:wow_english/common/widgets/we_app_bar.dart';
7 -import 'package:wow_english/repeatafter/widgets/repeat_after_item.dart'; 7 +import 'package:wow_english/pages/repeatafter/widgets/repeat_after_item.dart';
8 8
9 import 'bloc/repeat_after_bloc.dart'; 9 import 'bloc/repeat_after_bloc.dart';
10 10
lib/repeatafter/widgets/repeat_after_item.dart renamed to lib/pages/repeatafter/widgets/repeat_after_item.dart
  View file @4b358e2
lib/shop/exchane/bloc/exchange_lesson_bloc.dart renamed to lib/pages/shop/exchane/bloc/exchange_lesson_bloc.dart
  View file @4b358e2
lib/shop/exchane/bloc/exchange_lesson_event.dart renamed to lib/pages/shop/exchane/bloc/exchange_lesson_event.dart
  View file @4b358e2
lib/shop/exchane/bloc/exchange_lesson_state.dart renamed to lib/pages/shop/exchane/bloc/exchange_lesson_state.dart
  View file @4b358e2
lib/shop/exchane/exchange_lesson_page.dart renamed to lib/pages/shop/exchane/exchange_lesson_page.dart
  View file @4b358e2
lib/shop/exchangelist/bloc/exchange_list_bloc.dart renamed to lib/pages/shop/exchangelist/bloc/exchange_list_bloc.dart
  View file @4b358e2
lib/shop/exchangelist/bloc/exchange_list_event.dart renamed to lib/pages/shop/exchangelist/bloc/exchange_list_event.dart
  View file @4b358e2
lib/shop/exchangelist/bloc/exchange_list_state.dart renamed to lib/pages/shop/exchangelist/bloc/exchange_list_state.dart
  View file @4b358e2
lib/shop/exchangelist/exchange_lesson_list_page.dart renamed to lib/pages/shop/exchangelist/exchange_lesson_list_page.dart
  View file @4b358e2
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:wow_english/common/widgets/we_app_bar.dart'; 3 import 'package:wow_english/common/widgets/we_app_bar.dart';
4 -import 'package:wow_english/shop/exchangelist/widgets/exchange_list_item.dart'; 4 +import 'package:wow_english/pages/shop/exchangelist/widgets/exchange_list_item.dart';
5 5
6 import 'bloc/exchange_list_bloc.dart'; 6 import 'bloc/exchange_list_bloc.dart';
7 7
lib/shop/exchangelist/widgets/exchange_list_item.dart renamed to lib/pages/shop/exchangelist/widgets/exchange_list_item.dart
  View file @4b358e2
lib/shop/home/bloc/shop_home_bloc.dart renamed to lib/pages/shop/home/bloc/shop_home_bloc.dart
  View file @4b358e2
lib/shop/home/bloc/shop_home_event.dart renamed to lib/pages/shop/home/bloc/shop_home_event.dart
  View file @4b358e2
lib/shop/home/bloc/shop_home_state.dart renamed to lib/pages/shop/home/bloc/shop_home_state.dart
  View file @4b358e2
lib/shop/home/shop_home_page.dart renamed to lib/pages/shop/home/shop_home_page.dart
  View file @4b358e2
@@ -4,9 +4,10 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; @@ -4,9 +4,10 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
4 import 'package:flutter_screenutil/flutter_screenutil.dart'; 4 import 'package:flutter_screenutil/flutter_screenutil.dart';
5 import 'package:wow_english/common/extension/string_extension.dart'; 5 import 'package:wow_english/common/extension/string_extension.dart';
6 import 'package:wow_english/common/widgets/we_app_bar.dart'; 6 import 'package:wow_english/common/widgets/we_app_bar.dart';
  7 +import 'package:wow_english/pages/shop/home/widgets/lesson_card_item.dart';
7 import 'package:wow_english/route/route.dart'; 8 import 'package:wow_english/route/route.dart';
8 -import 'package:wow_english/shop/home/bloc/shop_home_bloc.dart';  
9 -import 'package:wow_english/shop/home/widgets/lesson_card_item.dart'; 9 +
  10 +import 'bloc/shop_home_bloc.dart';
10 11
11 class ShopHomePage extends StatelessWidget { 12 class ShopHomePage extends StatelessWidget {
12 const ShopHomePage({super.key}); 13 const ShopHomePage({super.key});
lib/shop/home/widgets/lesson_card_item.dart renamed to lib/pages/shop/home/widgets/lesson_card_item.dart
  View file @4b358e2
lib/tab/blocs/tab_bloc.dart renamed to lib/pages/tab/blocs/tab_bloc.dart
  View file @4b358e2
lib/tab/blocs/tab_event.dart renamed to lib/pages/tab/blocs/tab_event.dart
  View file @4b358e2
lib/tab/blocs/tab_state.dart renamed to lib/pages/tab/blocs/tab_state.dart
  View file @4b358e2
lib/tab/tab_page.dart renamed to lib/pages/tab/tab_page.dart
  View file @4b358e2
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 -import 'package:wow_english/home/home_page.dart';  
4 -import 'package:wow_english/lessons/lesson_page.dart';  
5 -import 'package:wow_english/tab/blocs/tab_bloc.dart'; 3 +import 'package:wow_english/pages/home/home_page.dart';
  4 +import 'package:wow_english/pages/lessons/lesson_page.dart';
  5 +
  6 +import 'blocs/tab_bloc.dart';
6 7
7 class TabPage extends StatelessWidget { 8 class TabPage extends StatelessWidget {
8 const TabPage({super.key}); 9 const TabPage({super.key});
lib/user/bloc/user_bloc.dart renamed to lib/pages/user/bloc/user_bloc.dart
  View file @4b358e2
lib/user/bloc/user_event.dart renamed to lib/pages/user/bloc/user_event.dart
  View file @4b358e2
lib/user/bloc/user_state.dart renamed to lib/pages/user/bloc/user_state.dart
  View file @4b358e2
lib/user/user_page.dart renamed to lib/pages/user/user_page.dart
  View file @4b358e2
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
  2 +import 'package:wow_english/common/widgets/we_app_bar.dart';
2 3
3 -import '../common/widgets/we_app_bar.dart';  
4 4
5 class UserPage extends StatelessWidget { 5 class UserPage extends StatelessWidget {
6 const UserPage({super.key}); 6 const UserPage({super.key});
7 7
8 @override 8 @override
9 Widget build(BuildContext context) { 9 Widget build(BuildContext context) {
10 - return Scaffold( 10 + return const Scaffold(
11 backgroundColor: Colors.white, 11 backgroundColor: Colors.white,
12 appBar: WEAppBar( 12 appBar: WEAppBar(
13 titleText: '1', 13 titleText: '1',
lib/video/lookvideo/bloc/look_video_bloc.dart renamed to lib/pages/video/lookvideo/bloc/look_video_bloc.dart
  View file @4b358e2
lib/video/lookvideo/bloc/look_video_event.dart renamed to lib/pages/video/lookvideo/bloc/look_video_event.dart
  View file @4b358e2
lib/video/lookvideo/bloc/look_video_state.dart renamed to lib/pages/video/lookvideo/bloc/look_video_state.dart
  View file @4b358e2
lib/video/lookvideo/look_video_page.dart renamed to lib/pages/video/lookvideo/look_video_page.dart
  View file @4b358e2
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 -import 'package:wow_english/video/lookvideo/bloc/look_video_bloc.dart';  
4 -import 'package:wow_english/video/lookvideo/widgets/video_widget.dart'; 3 +import 'package:wow_english/pages/video/lookvideo/widgets/video_widget.dart';
  4 +
  5 +import 'bloc/look_video_bloc.dart';
5 6
6 class LookVideoPage extends StatefulWidget { 7 class LookVideoPage extends StatefulWidget {
7 const LookVideoPage({super.key}); 8 const LookVideoPage({super.key});
lib/video/lookvideo/widgets/video_opera_widget.dart renamed to lib/pages/video/lookvideo/widgets/video_opera_widget.dart
  View file @4b358e2
lib/video/lookvideo/widgets/video_widget.dart renamed to lib/pages/video/lookvideo/widgets/video_widget.dart
  View file @4b358e2
@@ -3,7 +3,8 @@ import 'package:flutter/foundation.dart'; @@ -3,7 +3,8 @@ import 'package:flutter/foundation.dart';
3 import 'package:flutter/material.dart'; 3 import 'package:flutter/material.dart';
4 import 'package:video_player/video_player.dart'; 4 import 'package:video_player/video_player.dart';
5 import 'package:wow_english/common/extension/string_extension.dart'; 5 import 'package:wow_english/common/extension/string_extension.dart';
6 -import 'package:wow_english/video/lookvideo/widgets/video_opera_widget.dart'; 6 +
  7 +import 'video_opera_widget.dart';
7 8
8 class VideoWidget extends StatefulWidget { 9 class VideoWidget extends StatefulWidget {
9 const VideoWidget({super.key, this.videoUrl = ''}); 10 const VideoWidget({super.key, this.videoUrl = ''});
lib/voiceanswer/bloc/voice_answer_bloc.dart renamed to lib/pages/voiceanswer/bloc/voice_answer_bloc.dart
  View file @4b358e2
lib/voiceanswer/bloc/voice_answer_event.dart renamed to lib/pages/voiceanswer/bloc/voice_answer_event.dart
  View file @4b358e2
lib/voiceanswer/bloc/voice_answer_state.dart renamed to lib/pages/voiceanswer/bloc/voice_answer_state.dart
  View file @4b358e2
lib/voiceanswer/voice_answer_page.dart renamed to lib/pages/voiceanswer/voice_answer_page.dart
  View file @4b358e2
@@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; @@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_bloc/flutter_bloc.dart'; 2 import 'package:flutter_bloc/flutter_bloc.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:wow_english/common/extension/string_extension.dart'; 4 import 'package:wow_english/common/extension/string_extension.dart';
5 -import 'package:wow_english/practice/widgets/practice_header_widget.dart';  
6 -import 'package:wow_english/voiceanswer/bloc/voice_answer_bloc.dart'; 5 +import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
  6 +
  7 +import 'bloc/voice_answer_bloc.dart';
7 8
8 class VoiceAnswerPage extends StatelessWidget { 9 class VoiceAnswerPage extends StatelessWidget {
9 const VoiceAnswerPage({super.key}); 10 const VoiceAnswerPage({super.key});
lib/route/route.dart
  View file @4b358e2
@@ -2,24 +2,25 @@ import 'package:flutter/cupertino.dart'; @@ -2,24 +2,25 @@ import 'package:flutter/cupertino.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
3 import 'package:wow_english/app/splash_page.dart'; 3 import 'package:wow_english/app/splash_page.dart';
4 import 'package:wow_english/common/pages/wow_web_page.dart'; 4 import 'package:wow_english/common/pages/wow_web_page.dart';
5 -import 'package:wow_english/home/home_page.dart';  
6 -import 'package:wow_english/lessons/lesson_page.dart';  
7 -import 'package:wow_english/listen/listen_page.dart';  
8 -import 'package:wow_english/login/forgetpwd/forget_password_home_page.dart';  
9 -import 'package:wow_english/login/loginpage/login_page.dart';  
10 -import 'package:wow_english/login/setpwd/set_pwd_page.dart';  
11 -import 'package:wow_english/practice/chosetopic/topicpicture/topic_picture_page.dart';  
12 -import 'package:wow_english/practice/chosetopic/topicword/topic_word_page.dart';  
13 -import 'package:wow_english/practice/voicetopic/voicepicture/voice_pic_page.dart';  
14 -import 'package:wow_english/practice/voicetopic/voiceword/voice_word_page.dart';  
15 -import 'package:wow_english/repeatafter/repeat_after_page.dart';  
16 -import 'package:wow_english/shop/exchane/exchange_lesson_page.dart';  
17 -import 'package:wow_english/shop/exchangelist/exchange_lesson_list_page.dart';  
18 -import 'package:wow_english/shop/home/shop_home_page.dart';  
19 -import 'package:wow_english/tab/tab_page.dart';  
20 -import 'package:wow_english/user/user_page.dart';  
21 -import 'package:wow_english/video/lookvideo/look_video_page.dart';  
22 -import 'package:wow_english/voiceanswer/voice_answer_page.dart'; 5 +import 'package:wow_english/pages/home/home_page.dart';
  6 +import 'package:wow_english/pages/lessons/lesson_page.dart';
  7 +import 'package:wow_english/pages/listen/listen_page.dart';
  8 +import 'package:wow_english/pages/login/forgetpwd/forget_password_home_page.dart';
  9 +import 'package:wow_english/pages/login/loginpage/login_page.dart';
  10 +import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart';
  11 +import 'package:wow_english/pages/practice/chosetopic/topicpicture/topic_picture_page.dart';
  12 +import 'package:wow_english/pages/practice/chosetopic/topicword/topic_word_page.dart';
  13 +import 'package:wow_english/pages/practice/voicetopic/voicepicture/voice_pic_page.dart';
  14 +import 'package:wow_english/pages/practice/voicetopic/voiceword/voice_word_page.dart';
  15 +import 'package:wow_english/pages/repeatafter/repeat_after_page.dart';
  16 +import 'package:wow_english/pages/shop/exchane/exchange_lesson_page.dart';
  17 +import 'package:wow_english/pages/shop/exchangelist/exchange_lesson_list_page.dart';
  18 +import 'package:wow_english/pages/shop/home/shop_home_page.dart';
  19 +import 'package:wow_english/pages/tab/tab_page.dart';
  20 +import 'package:wow_english/pages/user/user_page.dart';
  21 +import 'package:wow_english/pages/video/lookvideo/look_video_page.dart';
  22 +import 'package:wow_english/pages/voiceanswer/voice_answer_page.dart';
  23 +
23 24
24 25
25 class AppRouteName { 26 class AppRouteName {