project structure cganged

lib/routes/route_generator.dart

@@ -1,28 +1,28 @@
-import 'package:didvan/pages/authentication/authentication.dart';
-import 'package:didvan/pages/authentication/authentication_state.dart';
-import 'package:didvan/pages/home/comments/comments.dart';
-import 'package:didvan/pages/home/comments/comments_state.dart';
-import 'package:didvan/pages/home/direct/direct.dart';
-import 'package:didvan/pages/home/direct/direct_state.dart';
-import 'package:didvan/pages/home/home.dart';
-import 'package:didvan/pages/home/home_state.dart';
-import 'package:didvan/pages/home/news/news_details/news_details.dart';
-import 'package:didvan/pages/home/news/news_details/news_details_state.dart';
-import 'package:didvan/pages/home/news/news_state.dart';
-import 'package:didvan/pages/home/radar/radar_details/radar_details.dart';
-import 'package:didvan/pages/home/radar/radar_details/radar_details_state.dart';
-import 'package:didvan/pages/home/radar/radar_state.dart';
-import 'package:didvan/pages/home/settings/about_us/about_us.dart';
-import 'package:didvan/pages/home/settings/bookmarks/bookmarks.dart';
-import 'package:didvan/pages/home/settings/bookmarks/bookmark_state.dart';
-import 'package:didvan/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart';
-import 'package:didvan/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart';
-import 'package:didvan/pages/home/settings/direct_list/direct_list.dart';
-import 'package:didvan/pages/home/settings/direct_list/direct_list_state.dart';
-import 'package:didvan/pages/home/settings/general_settings/settings.dart';
-import 'package:didvan/pages/home/settings/general_settings/settings_state.dart';
-import 'package:didvan/pages/home/settings/profile/profile.dart';
-import 'package:didvan/pages/splash/splash.dart';
+import 'package:didvan/views/authentication/authentication.dart';
+import 'package:didvan/views/authentication/authentication_state.dart';
+import 'package:didvan/views/home/comments/comments.dart';
+import 'package:didvan/views/home/comments/comments_state.dart';
+import 'package:didvan/views/home/direct/direct.dart';
+import 'package:didvan/views/home/direct/direct_state.dart';
+import 'package:didvan/views/home/home.dart';
+import 'package:didvan/views/home/home_state.dart';
+import 'package:didvan/views/home/news/news_details/news_details.dart';
+import 'package:didvan/views/home/news/news_details/news_details_state.dart';
+import 'package:didvan/views/home/news/news_state.dart';
+import 'package:didvan/views/home/radar/radar_details/radar_details.dart';
+import 'package:didvan/views/home/radar/radar_details/radar_details_state.dart';
+import 'package:didvan/views/home/radar/radar_state.dart';
+import 'package:didvan/views/home/settings/about_us/about_us.dart';
+import 'package:didvan/views/home/settings/bookmarks/bookmarks.dart';
+import 'package:didvan/views/home/settings/bookmarks/bookmark_state.dart';
+import 'package:didvan/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart';
+import 'package:didvan/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart';
+import 'package:didvan/views/home/settings/direct_list/direct_list.dart';
+import 'package:didvan/views/home/settings/direct_list/direct_list_state.dart';
+import 'package:didvan/views/home/settings/general_settings/settings.dart';
+import 'package:didvan/views/home/settings/general_settings/settings_state.dart';
+import 'package:didvan/views/home/settings/profile/profile.dart';
+import 'package:didvan/views/splash/splash.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/utils/action_sheet.dart

@@ -7,8 +7,8 @@ import 'package:didvan/constants/assets.dart';
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/models/view/alert_data.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:rive/rive.dart';
 

lib/views/authentication/authentication.dart

@@ -1,9 +1,9 @@
 import 'package:didvan/config/design_config.dart';
-import 'package:didvan/pages/authentication/authentication_state.dart';
-import 'package:didvan/pages/authentication/screens/password.dart';
-import 'package:didvan/pages/authentication/screens/username.dart';
-import 'package:didvan/pages/authentication/screens/reset_password.dart';
-import 'package:didvan/pages/authentication/screens/verification.dart';
+import 'package:didvan/views/authentication/authentication_state.dart';
+import 'package:didvan/views/authentication/screens/password.dart';
+import 'package:didvan/views/authentication/screens/reset_password.dart';
+import 'package:didvan/views/authentication/screens/username.dart';
+import 'package:didvan/views/authentication/screens/verification.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/authentication/screens/password.dart

@@ -1,13 +1,13 @@
 import 'dart:developer';
 
-import 'package:didvan/pages/authentication/authentication_state.dart';
-import 'package:didvan/pages/authentication/widgets/authentication_layout.dart';
 import 'package:didvan/providers/server_data_provider.dart';
 import 'package:didvan/providers/user_provider.dart';
 import 'package:didvan/routes/routes.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/didvan/text_field.dart';
+import 'package:didvan/views/authentication/authentication_state.dart';
+import 'package:didvan/views/authentication/widgets/authentication_layout.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text_field.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/authentication/screens/reset_password.dart

@@ -1,6 +1,6 @@
-import 'package:didvan/pages/authentication/widgets/authentication_layout.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/text_field.dart';
+import 'package:didvan/views/authentication/widgets/authentication_layout.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/text_field.dart';
 import 'package:flutter/material.dart';
 
 class ResetPassword extends StatelessWidget {

lib/views/authentication/screens/username.dart

@@ -1,7 +1,7 @@
-import 'package:didvan/pages/authentication/authentication_state.dart';
-import 'package:didvan/pages/authentication/widgets/authentication_layout.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/text_field.dart';
+import 'package:didvan/views/authentication/authentication_state.dart';
+import 'package:didvan/views/authentication/widgets/authentication_layout.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/text_field.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/views/authentication/screens/verification.dart

@@ -1,9 +1,9 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/pages/authentication/authentication_state.dart';
-import 'package:didvan/pages/authentication/widgets/authentication_layout.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/authentication/authentication_state.dart';
+import 'package:didvan/views/authentication/widgets/authentication_layout.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
 import 'package:provider/provider.dart';

lib/views/authentication/widgets/authentication_app_bar.dart

@@ -1,8 +1,8 @@
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/pages/authentication/authentication_state.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/authentication/authentication_state.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/authentication/widgets/authentication_layout.dart

@@ -1,5 +1,5 @@
-import 'package:didvan/pages/authentication/widgets/authentication_app_bar.dart';
-import 'package:didvan/widgets/logos/didvan_horizontal_logo.dart';
+import 'package:didvan/views/authentication/widgets/authentication_app_bar.dart';
+import 'package:didvan/views/widgets/logos/didvan_horizontal_logo.dart';
 import 'package:flutter/material.dart';
 
 class AuthenticationLayout extends StatelessWidget {

lib/views/home/comments/comments.dart

@@ -2,14 +2,14 @@ import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/pages/home/comments/comments_state.dart';
-import 'package:didvan/pages/home/comments/widgets/comment_item.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/shimmer_placeholder.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/comments/comments_state.dart';
+import 'package:didvan/views/home/comments/widgets/comment_item.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/shimmer_placeholder.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/comments/widgets/comment_item.dart

@@ -2,13 +2,13 @@ import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/comment/comment.dart';
-import 'package:didvan/pages/home/comments/comments_state.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/ink_wrapper.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
+import 'package:didvan/views/home/comments/comments_state.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/ink_wrapper.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/direct/direct.dart

@@ -1,11 +1,11 @@
 import 'package:didvan/models/enums.dart';
-import 'package:didvan/pages/home/direct/direct_state.dart';
-import 'package:didvan/pages/home/direct/widgets/message.dart';
-import 'package:didvan/pages/home/direct/widgets/message_box.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
 import 'package:didvan/providers/server_data_provider.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/direct/direct_state.dart';
+import 'package:didvan/views/home/direct/widgets/message.dart';
+import 'package:didvan/views/home/direct/widgets/message_box.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:provider/provider.dart';

lib/views/home/direct/widgets/audio_widget.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:didvan/pages/home/widgets/audio_slider.dart';
-import 'package:didvan/pages/home/widgets/player_controller_button.dart';
 import 'package:didvan/services/media/media.dart';
+import 'package:didvan/views/home/widgets/audio_slider.dart';
+import 'package:didvan/views/home/widgets/player_controller_button.dart';
 import 'package:flutter/material.dart';
 
 class AudioWidget extends StatelessWidget {

lib/views/home/direct/widgets/message.dart

@@ -2,12 +2,12 @@ import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/message_data/message_data.dart';
-import 'package:didvan/pages/home/direct/direct_state.dart';
-import 'package:didvan/pages/home/direct/widgets/audio_widget.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
+import 'package:didvan/views/home/direct/direct_state.dart';
+import 'package:didvan/views/home/direct/widgets/audio_widget.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:persian_number_utility/persian_number_utility.dart';

lib/views/home/direct/widgets/message_box.dart

@@ -1,10 +1,10 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/pages/home/direct/direct_state.dart';
-import 'package:didvan/pages/home/direct/widgets/audio_widget.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/home/direct/direct_state.dart';
+import 'package:didvan/views/home/direct/widgets/audio_widget.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/hashtag/hashtag.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/models/tag.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
 import 'package:flutter/material.dart';
 
 class Hashtag extends StatefulWidget {

lib/views/home/home.dart

@@ -1,11 +1,11 @@
 import 'package:didvan/config/design_config.dart';
-import 'package:didvan/pages/home/home_state.dart';
-import 'package:didvan/pages/home/news/news.dart';
-import 'package:didvan/pages/home/radar/radar.dart';
-import 'package:didvan/pages/home/settings/settings.dart';
-import 'package:didvan/pages/home/statistics/statistics.dart';
-import 'package:didvan/pages/home/studio/studio.dart';
-import 'package:didvan/pages/home/widgets/bnb.dart';
+import 'package:didvan/views/home/home_state.dart';
+import 'package:didvan/views/home/news/news.dart';
+import 'package:didvan/views/home/radar/radar.dart';
+import 'package:didvan/views/home/settings/settings.dart';
+import 'package:didvan/views/home/statistics/statistics.dart';
+import 'package:didvan/views/home/studio/studio.dart';
+import 'package:didvan/views/home/widgets/bnb.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/news/news.dart

@@ -4,15 +4,15 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/models/requests/news.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
-import 'package:didvan/pages/home/news/news_state.dart';
-import 'package:didvan/pages/home/widgets/news_overview.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/pages/home/widgets/date_picker_button.dart';
-import 'package:didvan/widgets/item_title.dart';
-import 'package:didvan/pages/home/widgets/search_field.dart';
-import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
-import 'package:didvan/widgets/state_handlers/empty_result.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/news/news_state.dart';
+import 'package:didvan/views/home/widgets/date_picker_button.dart';
+import 'package:didvan/views/home/widgets/logo_app_bar.dart';
+import 'package:didvan/views/home/widgets/news_overview.dart';
+import 'package:didvan/views/home/widgets/search_field.dart';
+import 'package:didvan/views/widgets/item_title.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_result.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/news/news_details/news_details.dart

@@ -1,8 +1,8 @@
 import 'package:didvan/models/requests/news.dart';
-import 'package:didvan/pages/home/news/news_details/news_details_state.dart';
-import 'package:didvan/widgets/didvan/page_view.dart';
-import 'package:didvan/pages/home/widgets/floating_navigation_bar.dart';
-import 'package:didvan/widgets/state_handlers/state_handler.dart';
+import 'package:didvan/views/home/news/news_details/news_details_state.dart';
+import 'package:didvan/views/home/widgets/floating_navigation_bar.dart';
+import 'package:didvan/views/widgets/didvan/page_view.dart';
+import 'package:didvan/views/widgets/state_handlers/state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/radar/radar.dart

@@ -9,20 +9,20 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
-import 'package:didvan/pages/home/radar/radar_state.dart';
-import 'package:didvan/pages/home/radar/widgets/categories_gird.dart';
-import 'package:didvan/pages/home/radar/widgets/categories_list.dart';
-import 'package:didvan/pages/home/widgets/radar_overview.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/pages/home/widgets/search_field.dart';
-import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
+import 'package:didvan/views/home/radar/radar_state.dart';
+import 'package:didvan/views/home/radar/widgets/categories_gird.dart';
+import 'package:didvan/views/home/radar/widgets/categories_list.dart';
+import 'package:didvan/views/home/widgets/date_picker_button.dart';
+import 'package:didvan/views/home/widgets/logo_app_bar.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/pages/home/widgets/date_picker_button.dart';
-import 'package:didvan/widgets/didvan/checkbox.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/item_title.dart';
-import 'package:didvan/widgets/state_handlers/empty_result.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/widgets/radar_overview.dart';
+import 'package:didvan/views/home/widgets/search_field.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/checkbox.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/item_title.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_result.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/radar/radar_details/radar_details.dart

@@ -1,8 +1,8 @@
 import 'package:didvan/models/requests/radar.dart';
-import 'package:didvan/pages/home/radar/radar_details/radar_details_state.dart';
-import 'package:didvan/widgets/didvan/page_view.dart';
-import 'package:didvan/pages/home/widgets/floating_navigation_bar.dart';
-import 'package:didvan/widgets/state_handlers/state_handler.dart';
+import 'package:didvan/views/home/radar/radar_details/radar_details_state.dart';
+import 'package:didvan/views/home/widgets/floating_navigation_bar.dart';
+import 'package:didvan/views/widgets/didvan/page_view.dart';
+import 'package:didvan/views/widgets/state_handlers/state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/radar/widgets/categories_gird.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/config/design_config.dart';
-import 'package:didvan/pages/home/radar/radar_state.dart';
-import 'package:didvan/pages/home/radar/widgets/category_item.dart';
+import 'package:didvan/views/home/radar/radar_state.dart';
+import 'package:didvan/views/home/radar/widgets/category_item.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/radar/widgets/categories_list.dart

@@ -1,9 +1,9 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/models/view/radar_category.dart';
-import 'package:didvan/pages/home/radar/radar_state.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/home/radar/radar_state.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/radar/widgets/category_item.dart

@@ -1,9 +1,9 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/models/view/radar_category.dart';
-import 'package:didvan/pages/home/radar/radar_state.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/home/radar/radar_state.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

lib/views/home/settings/about_us/about_us.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class AboutUs extends StatelessWidget {

lib/views/home/settings/bookmarks/bookmarks.dart

@@ -3,19 +3,19 @@ import 'dart:async';
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/pages/home/settings/bookmarks/bookmark_state.dart';
-import 'package:didvan/pages/home/widgets/menu_item.dart';
 import 'package:didvan/routes/routes.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/pages/home/widgets/multitype_overview.dart';
-import 'package:didvan/pages/home/widgets/search_field.dart';
-import 'package:didvan/widgets/item_title.dart';
-import 'package:didvan/widgets/state_handlers/empty_list.dart';
-import 'package:didvan/widgets/state_handlers/empty_result.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/settings/bookmarks/bookmark_state.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
+import 'package:didvan/views/home/widgets/multitype_overview.dart';
+import 'package:didvan/views/home/widgets/search_field.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/item_title.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_list.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_result.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart

@@ -1,10 +1,10 @@
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart';
-import 'package:didvan/pages/home/widgets/news_overview.dart';
-import 'package:didvan/pages/home/widgets/radar_overview.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/state_handlers/empty_list.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart';
+import 'package:didvan/views/home/widgets/news_overview.dart';
+import 'package:didvan/views/home/widgets/radar_overview.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_list.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/settings/direct_list/direct_list.dart

@@ -1,13 +1,13 @@
 import 'package:didvan/constants/assets.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/pages/home/settings/direct_list/direct_list_state.dart';
-import 'package:didvan/pages/home/settings/direct_list/widgets/direct_item.dart';
-import 'package:didvan/widgets/didvan/badge.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/shimmer_placeholder.dart';
-import 'package:didvan/widgets/state_handlers/empty_state.dart';
-import 'package:didvan/widgets/state_handlers/sliver_state_handler.dart';
+import 'package:didvan/views/home/settings/direct_list/direct_list_state.dart';
+import 'package:didvan/views/home/settings/direct_list/widgets/direct_item.dart';
+import 'package:didvan/views/widgets/didvan/badge.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/shimmer_placeholder.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_state.dart';
+import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/settings/direct_list/widgets/direct_item.dart

@@ -3,9 +3,9 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/chat_room/chat_room.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/didvan/badge.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/badge.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class ChatRoomItem extends StatelessWidget {

lib/views/home/settings/general_settings/settings.dart

@@ -6,16 +6,16 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/constants/assets.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/pages/home/settings/general_settings/settings_state.dart';
-import 'package:didvan/pages/home/widgets/menu_item.dart';
 import 'package:didvan/providers/theme_provider.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/item_title.dart';
-import 'package:didvan/widgets/state_handlers/state_handler.dart';
+import 'package:didvan/views/home/settings/general_settings/settings_state.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/item_title.dart';
+import 'package:didvan/views/widgets/state_handlers/state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

lib/views/home/settings/profile/profile.dart

@@ -2,17 +2,17 @@ import 'dart:async';
 
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/pages/home/settings/profile/widgets/profile_photo.dart';
-import 'package:didvan/pages/home/widgets/menu_item.dart';
 import 'package:didvan/providers/user_provider.dart';
 import 'package:didvan/routes/routes.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/didvan/text_field.dart';
+import 'package:didvan/views/home/settings/profile/widgets/profile_photo.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/scaffold.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text_field.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/views/home/settings/profile/widgets/profile_photo.dart

@@ -5,13 +5,13 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/models/view/alert_data.dart';
-import 'package:didvan/pages/home/widgets/menu_item.dart';
 import 'package:didvan/providers/user_provider.dart';
 import 'package:didvan/services/media/media.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';

lib/views/home/settings/settings.dart

@@ -1,14 +1,14 @@
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/pages/home/widgets/menu_item.dart';
-import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
 import 'package:didvan/providers/theme_provider.dart';
 import 'package:didvan/providers/user_provider.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/services/storage/storage.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/item_title.dart';
+import 'package:didvan/views/home/widgets/logo_app_bar.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/item_title.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';

lib/views/home/statistics/statistics.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/assets.dart';
-import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
-import 'package:didvan/widgets/state_handlers/empty_state.dart';
+import 'package:didvan/views/home/widgets/logo_app_bar.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_state.dart';
 import 'package:flutter/material.dart';
 
 class Statictics extends StatelessWidget {

lib/views/home/studio/studio.dart

@@ -1,9 +1,9 @@
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/pages/home/studio/widgets/slider.dart';
-import 'package:didvan/pages/home/studio/widgets/tab_bar.dart';
-import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
-import 'package:didvan/pages/home/widgets/search_field.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/home/studio/widgets/slider.dart';
+import 'package:didvan/views/home/studio/widgets/tab_bar.dart';
+import 'package:didvan/views/home/widgets/logo_app_bar.dart';
+import 'package:didvan/views/home/widgets/search_field.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
 import 'package:flutter/material.dart';
 
 class Studio extends StatefulWidget {

lib/views/home/studio/widgets/tab_bar.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class StudioTabBar extends StatelessWidget {

lib/views/home/widgets/bnb.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class DidvanBNB extends StatelessWidget {

lib/views/home/widgets/bookmark_button.dart

@@ -1,8 +1,8 @@
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class BookmarkButton extends StatefulWidget {

lib/views/home/widgets/date_picker_button.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:persian_number_utility/persian_number_utility.dart';
 

lib/views/home/widgets/floating_navigation_bar.dart

@@ -3,15 +3,15 @@ import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/message_data/radar_attachment.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
-import 'package:didvan/pages/home/widgets/menu_item.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/pages/home/widgets/bookmark_button.dart';
-import 'package:didvan/widgets/didvan/chip.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/item_title.dart';
+import 'package:didvan/views/home/widgets/bookmark_button.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
+import 'package:didvan/views/widgets/didvan/chip.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/item_title.dart';
 import 'package:flutter/material.dart';
 
 class FloatingNavigationBar extends StatefulWidget {

lib/views/home/widgets/logo_app_bar.dart

@@ -1,4 +1,4 @@
-import 'package:didvan/widgets/logos/didvan_vertical_logo.dart';
+import 'package:didvan/views/widgets/logos/didvan_vertical_logo.dart';
 import 'package:flutter/material.dart';
 
 class LogoAppBar extends StatelessWidget {

lib/views/home/widgets/menu_item.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class MenuItem extends StatelessWidget {

lib/views/home/widgets/multitype_overview.dart

@@ -4,10 +4,10 @@ import 'package:didvan/models/overview_data.dart';
 import 'package:didvan/models/requests/news.dart';
 import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/routes/routes.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/shimmer_placeholder.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/shimmer_placeholder.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 import 'package:persian_number_utility/persian_number_utility.dart';
 

lib/views/home/widgets/news_overview.dart

@@ -2,12 +2,12 @@ import 'package:didvan/models/overview_data.dart';
 import 'package:didvan/models/requests/news.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/pages/home/widgets/bookmark_button.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/shimmer_placeholder.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
+import 'package:didvan/views/home/widgets/bookmark_button.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/shimmer_placeholder.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 
 class NewsOverview extends StatelessWidget {

lib/views/home/widgets/player_controller_button.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/services/media/media.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
 import 'package:flutter/material.dart';
 
 class AudioControllerButton extends StatelessWidget {

lib/views/home/widgets/radar_overview.dart

@@ -4,13 +4,13 @@ import 'package:didvan/models/overview_data.dart';
 import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/pages/home/widgets/bookmark_button.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/shimmer_placeholder.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
+import 'package:didvan/views/home/widgets/bookmark_button.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/shimmer_placeholder.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 
 class RadarOverview extends StatelessWidget {

lib/views/home/widgets/search_field.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
 import 'package:flutter/material.dart';
 
 class SearchField extends StatefulWidget {

lib/views/home/widgets/tag_item.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class TagItem extends StatelessWidget {

lib/views/splash/splash.dart

@@ -10,8 +10,8 @@ import 'package:didvan/services/app_initalizer.dart';
 import 'package:didvan/services/network/request.dart';
 import 'package:didvan/services/storage/storage.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/logos/didvan_horizontal_logo.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/logos/didvan_horizontal_logo.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

lib/views/widgets/didvan/app_bar.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class DidvanAppBar extends StatelessWidget {

lib/views/widgets/didvan/badge.dart

@@ -1,5 +1,5 @@
 import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class DidvanBadge extends StatelessWidget {

lib/views/widgets/didvan/button.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/models/enums.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class DidvanButton extends StatelessWidget {

lib/views/widgets/didvan/checkbox.dart

@@ -1,4 +1,4 @@
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class DidvanCheckbox extends StatefulWidget {

lib/views/widgets/didvan/chip.dart

@@ -1,7 +1,7 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/ink_wrapper.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/ink_wrapper.dart';
 import 'package:flutter/material.dart';
 
 class DidvanChip extends StatelessWidget {

lib/views/widgets/didvan/icon_button.dart

@@ -1,4 +1,4 @@
-import 'package:didvan/widgets/ink_wrapper.dart';
+import 'package:didvan/views/widgets/ink_wrapper.dart';
 import 'package:flutter/material.dart';
 
 class DidvanIconButton extends StatelessWidget {

lib/views/widgets/didvan/page_view.dart

@@ -2,17 +2,17 @@ import 'package:carousel_slider/carousel_slider.dart';
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/pages/home/widgets/multitype_overview.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/card.dart';
-import 'package:didvan/widgets/didvan/divider.dart';
-import 'package:didvan/widgets/didvan/icon_button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
-import 'package:didvan/widgets/ink_wrapper.dart';
-import 'package:didvan/widgets/item_title.dart';
-import 'package:didvan/widgets/skeleton_image.dart';
-import 'package:didvan/pages/home/widgets/tag_item.dart';
+import 'package:didvan/views/home/widgets/multitype_overview.dart';
+import 'package:didvan/views/home/widgets/tag_item.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/card.dart';
+import 'package:didvan/views/widgets/didvan/divider.dart';
+import 'package:didvan/views/widgets/didvan/icon_button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/ink_wrapper.dart';
+import 'package:didvan/views/widgets/item_title.dart';
+import 'package:didvan/views/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 

lib/views/widgets/didvan/scaffold.dart

@@ -1,5 +1,5 @@
 import 'package:didvan/models/view/app_bar_data.dart';
-import 'package:didvan/widgets/didvan/app_bar.dart';
+import 'package:didvan/views/widgets/didvan/app_bar.dart';
 import 'package:flutter/material.dart';
 
 class DidvanScaffold extends StatefulWidget {

lib/views/widgets/didvan/switch.dart

@@ -1,4 +1,4 @@
-import 'package:didvan/pages/home/widgets/menu_item.dart';
+import 'package:didvan/views/home/widgets/menu_item.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 

lib/views/widgets/didvan/text_field.dart

@@ -1,8 +1,8 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
-import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/animated_visibility.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:persian_number_utility/persian_number_utility.dart';

lib/views/widgets/item_title.dart

@@ -1,5 +1,5 @@
 import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 
 class ItemTitle extends StatelessWidget {

lib/views/widgets/skeleton_image.dart

@@ -1,8 +1,8 @@
-import 'package:didvan/widgets/shimmer_placeholder.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/services/network/request.dart';
 import 'package:didvan/services/network/request_helper.dart';
+import 'package:didvan/views/widgets/shimmer_placeholder.dart';
 import 'package:flutter/material.dart';
 import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart';
 

lib/views/widgets/state_handlers/empty_connection.dart

@@ -1,5 +1,5 @@
 import 'package:didvan/constants/assets.dart';
-import 'package:didvan/widgets/state_handlers/empty_state.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_state.dart';
 import 'package:flutter/material.dart';
 
 class EmptyConnection extends StatelessWidget {

lib/views/widgets/state_handlers/empty_list.dart

@@ -1,5 +1,5 @@
 import 'package:didvan/constants/assets.dart';
-import 'package:didvan/widgets/state_handlers/empty_state.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_state.dart';
 import 'package:flutter/material.dart';
 
 class EmptyList extends StatelessWidget {

lib/views/widgets/state_handlers/empty_result.dart

@@ -1,5 +1,5 @@
 import 'package:didvan/constants/assets.dart';
-import 'package:didvan/widgets/state_handlers/empty_state.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_state.dart';
 import 'package:flutter/material.dart';
 
 class EmptyResult extends StatelessWidget {

lib/views/widgets/state_handlers/empty_state.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/config/theme_data.dart';
-import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/views/widgets/didvan/button.dart';
+import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 

lib/views/widgets/state_handlers/sliver_state_handler.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/providers/core_provider.dart';
-import 'package:didvan/widgets/state_handlers/empty_connection.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_connection.dart';
 import 'package:flutter/material.dart';
 
 class SliverStateHandler<T extends CoreProvier> extends SliverList {

lib/views/widgets/state_handlers/state_handler.dart

@@ -1,6 +1,6 @@
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/providers/core_provider.dart';
-import 'package:didvan/widgets/state_handlers/empty_connection.dart';
+import 'package:didvan/views/widgets/state_handlers/empty_connection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';