diff --git a/lib/routes/route_generator.dart b/lib/routes/route_generator.dart index 2f32f32..dfb10c8 100644 --- a/lib/routes/route_generator.dart +++ b/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'; diff --git a/lib/utils/action_sheet.dart b/lib/utils/action_sheet.dart index 7d4a98e..0bdb571 100644 --- a/lib/utils/action_sheet.dart +++ b/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'; diff --git a/lib/pages/authentication/authentication.dart b/lib/views/authentication/authentication.dart similarity index 81% rename from lib/pages/authentication/authentication.dart rename to lib/views/authentication/authentication.dart index cd06164..9119411 100644 --- a/lib/pages/authentication/authentication.dart +++ b/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'; diff --git a/lib/pages/authentication/authentication_state.dart b/lib/views/authentication/authentication_state.dart similarity index 100% rename from lib/pages/authentication/authentication_state.dart rename to lib/views/authentication/authentication_state.dart diff --git a/lib/pages/authentication/screens/password.dart b/lib/views/authentication/screens/password.dart similarity index 88% rename from lib/pages/authentication/screens/password.dart rename to lib/views/authentication/screens/password.dart index 616f139..391556b 100644 --- a/lib/pages/authentication/screens/password.dart +++ b/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'; diff --git a/lib/pages/authentication/screens/reset_password.dart b/lib/views/authentication/screens/reset_password.dart similarity index 83% rename from lib/pages/authentication/screens/reset_password.dart rename to lib/views/authentication/screens/reset_password.dart index 328265b..212dd2d 100644 --- a/lib/pages/authentication/screens/reset_password.dart +++ b/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 { diff --git a/lib/pages/authentication/screens/username.dart b/lib/views/authentication/screens/username.dart similarity index 92% rename from lib/pages/authentication/screens/username.dart rename to lib/views/authentication/screens/username.dart index 395db9d..fcec2fd 100644 --- a/lib/pages/authentication/screens/username.dart +++ b/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'; diff --git a/lib/pages/authentication/screens/verification.dart b/lib/views/authentication/screens/verification.dart similarity index 90% rename from lib/pages/authentication/screens/verification.dart rename to lib/views/authentication/screens/verification.dart index e6f5d4f..80bfeef 100644 --- a/lib/pages/authentication/screens/verification.dart +++ b/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'; diff --git a/lib/pages/authentication/widgets/authentication_app_bar.dart b/lib/views/authentication/widgets/authentication_app_bar.dart similarity index 85% rename from lib/pages/authentication/widgets/authentication_app_bar.dart rename to lib/views/authentication/widgets/authentication_app_bar.dart index e9cb490..81e86f3 100644 --- a/lib/pages/authentication/widgets/authentication_app_bar.dart +++ b/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'; diff --git a/lib/pages/authentication/widgets/authentication_layout.dart b/lib/views/authentication/widgets/authentication_layout.dart similarity index 92% rename from lib/pages/authentication/widgets/authentication_layout.dart rename to lib/views/authentication/widgets/authentication_layout.dart index 4d063d4..e3fceca 100644 --- a/lib/pages/authentication/widgets/authentication_layout.dart +++ b/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 { diff --git a/lib/pages/home/comments/comments.dart b/lib/views/home/comments/comments.dart similarity index 93% rename from lib/pages/home/comments/comments.dart rename to lib/views/home/comments/comments.dart index ce45163..0bf0c72 100644 --- a/lib/pages/home/comments/comments.dart +++ b/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'; diff --git a/lib/pages/home/comments/comments_state.dart b/lib/views/home/comments/comments_state.dart similarity index 100% rename from lib/pages/home/comments/comments_state.dart rename to lib/views/home/comments/comments_state.dart diff --git a/lib/pages/home/comments/widgets/comment_item.dart b/lib/views/home/comments/widgets/comment_item.dart similarity index 96% rename from lib/pages/home/comments/widgets/comment_item.dart rename to lib/views/home/comments/widgets/comment_item.dart index 1230d14..62fc0a2 100644 --- a/lib/pages/home/comments/widgets/comment_item.dart +++ b/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'; diff --git a/lib/pages/home/direct/direct.dart b/lib/views/home/direct/direct.dart similarity index 90% rename from lib/pages/home/direct/direct.dart rename to lib/views/home/direct/direct.dart index 2cf46aa..e3cf43e 100644 --- a/lib/pages/home/direct/direct.dart +++ b/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'; diff --git a/lib/pages/home/direct/direct_state.dart b/lib/views/home/direct/direct_state.dart similarity index 100% rename from lib/pages/home/direct/direct_state.dart rename to lib/views/home/direct/direct_state.dart diff --git a/lib/pages/home/direct/widgets/audio_widget.dart b/lib/views/home/direct/widgets/audio_widget.dart similarity index 86% rename from lib/pages/home/direct/widgets/audio_widget.dart rename to lib/views/home/direct/widgets/audio_widget.dart index d974ba2..5bb7ba7 100644 --- a/lib/pages/home/direct/widgets/audio_widget.dart +++ b/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 { diff --git a/lib/pages/home/direct/widgets/message.dart b/lib/views/home/direct/widgets/message.dart similarity index 95% rename from lib/pages/home/direct/widgets/message.dart rename to lib/views/home/direct/widgets/message.dart index e0c811e..818b2ff 100644 --- a/lib/pages/home/direct/widgets/message.dart +++ b/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'; diff --git a/lib/pages/home/direct/widgets/message_box.dart b/lib/views/home/direct/widgets/message_box.dart similarity index 96% rename from lib/pages/home/direct/widgets/message_box.dart rename to lib/views/home/direct/widgets/message_box.dart index 582446c..090f409 100644 --- a/lib/pages/home/direct/widgets/message_box.dart +++ b/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'; diff --git a/lib/pages/home/hashtag/hashtag.dart b/lib/views/home/hashtag/hashtag.dart similarity index 89% rename from lib/pages/home/hashtag/hashtag.dart rename to lib/views/home/hashtag/hashtag.dart index acd93a2..91f42af 100644 --- a/lib/pages/home/hashtag/hashtag.dart +++ b/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 { diff --git a/lib/pages/home/hashtag/hashtag_state.dart b/lib/views/home/hashtag/hashtag_state.dart similarity index 100% rename from lib/pages/home/hashtag/hashtag_state.dart rename to lib/views/home/hashtag/hashtag_state.dart diff --git a/lib/pages/home/home.dart b/lib/views/home/home.dart similarity index 78% rename from lib/pages/home/home.dart rename to lib/views/home/home.dart index 880e84a..0e1d5a8 100644 --- a/lib/pages/home/home.dart +++ b/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'; diff --git a/lib/pages/home/home_state.dart b/lib/views/home/home_state.dart similarity index 100% rename from lib/pages/home/home_state.dart rename to lib/views/home/home_state.dart diff --git a/lib/pages/home/news/news.dart b/lib/views/home/news/news.dart similarity index 90% rename from lib/pages/home/news/news.dart rename to lib/views/home/news/news.dart index 8e8ffdc..df3950e 100644 --- a/lib/pages/home/news/news.dart +++ b/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'; diff --git a/lib/pages/home/news/news_details/news_details.dart b/lib/views/home/news/news_details/news_details.dart similarity index 91% rename from lib/pages/home/news/news_details/news_details.dart rename to lib/views/home/news/news_details/news_details.dart index 692ecc4..55d09d4 100644 --- a/lib/pages/home/news/news_details/news_details.dart +++ b/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'; diff --git a/lib/pages/home/news/news_details/news_details_state.dart b/lib/views/home/news/news_details/news_details_state.dart similarity index 100% rename from lib/pages/home/news/news_details/news_details_state.dart rename to lib/views/home/news/news_details/news_details_state.dart diff --git a/lib/pages/home/news/news_state.dart b/lib/views/home/news/news_state.dart similarity index 100% rename from lib/pages/home/news/news_state.dart rename to lib/views/home/news/news_state.dart diff --git a/lib/pages/home/radar/radar.dart b/lib/views/home/radar/radar.dart similarity index 92% rename from lib/pages/home/radar/radar.dart rename to lib/views/home/radar/radar.dart index c70cf5e..0c97ddb 100644 --- a/lib/pages/home/radar/radar.dart +++ b/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'; diff --git a/lib/pages/home/radar/radar_details/radar_details.dart b/lib/views/home/radar/radar_details/radar_details.dart similarity index 92% rename from lib/pages/home/radar/radar_details/radar_details.dart rename to lib/views/home/radar/radar_details/radar_details.dart index c4ac5f0..1c9eb11 100644 --- a/lib/pages/home/radar/radar_details/radar_details.dart +++ b/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'; diff --git a/lib/pages/home/radar/radar_details/radar_details_state.dart b/lib/views/home/radar/radar_details/radar_details_state.dart similarity index 100% rename from lib/pages/home/radar/radar_details/radar_details_state.dart rename to lib/views/home/radar/radar_details/radar_details_state.dart diff --git a/lib/pages/home/radar/radar_state.dart b/lib/views/home/radar/radar_state.dart similarity index 100% rename from lib/pages/home/radar/radar_state.dart rename to lib/views/home/radar/radar_state.dart diff --git a/lib/pages/home/radar/widgets/categories_gird.dart b/lib/views/home/radar/widgets/categories_gird.dart similarity index 94% rename from lib/pages/home/radar/widgets/categories_gird.dart rename to lib/views/home/radar/widgets/categories_gird.dart index 9818b02..abcc0e2 100644 --- a/lib/pages/home/radar/widgets/categories_gird.dart +++ b/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'; diff --git a/lib/pages/home/radar/widgets/categories_list.dart b/lib/views/home/radar/widgets/categories_list.dart similarity index 96% rename from lib/pages/home/radar/widgets/categories_list.dart rename to lib/views/home/radar/widgets/categories_list.dart index 1ea20d5..bca0187 100644 --- a/lib/pages/home/radar/widgets/categories_list.dart +++ b/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'; diff --git a/lib/pages/home/radar/widgets/category_item.dart b/lib/views/home/radar/widgets/category_item.dart similarity index 93% rename from lib/pages/home/radar/widgets/category_item.dart rename to lib/views/home/radar/widgets/category_item.dart index dc608f4..f8176a5 100644 --- a/lib/pages/home/radar/widgets/category_item.dart +++ b/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'; diff --git a/lib/pages/home/settings/about_us/about_us.dart b/lib/views/home/settings/about_us/about_us.dart similarity index 95% rename from lib/pages/home/settings/about_us/about_us.dart rename to lib/views/home/settings/about_us/about_us.dart index 037057d..6cc17f9 100644 --- a/lib/pages/home/settings/about_us/about_us.dart +++ b/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 { diff --git a/lib/pages/home/settings/bookmarks/bookmark_state.dart b/lib/views/home/settings/bookmarks/bookmark_state.dart similarity index 100% rename from lib/pages/home/settings/bookmarks/bookmark_state.dart rename to lib/views/home/settings/bookmarks/bookmark_state.dart diff --git a/lib/pages/home/settings/bookmarks/bookmarks.dart b/lib/views/home/settings/bookmarks/bookmarks.dart similarity index 84% rename from lib/pages/home/settings/bookmarks/bookmarks.dart rename to lib/views/home/settings/bookmarks/bookmarks.dart index 05a7e10..1cb736a 100644 --- a/lib/pages/home/settings/bookmarks/bookmarks.dart +++ b/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'; diff --git a/lib/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart b/lib/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart similarity index 85% rename from lib/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart rename to lib/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart index 1c9d760..f9a5454 100644 --- a/lib/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart +++ b/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'; diff --git a/lib/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart b/lib/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart similarity index 100% rename from lib/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart rename to lib/views/home/settings/bookmarks/filtered_bookmark/filtered_bookmarks_state.dart diff --git a/lib/pages/home/settings/direct_list/direct_list.dart b/lib/views/home/settings/direct_list/direct_list.dart similarity index 84% rename from lib/pages/home/settings/direct_list/direct_list.dart rename to lib/views/home/settings/direct_list/direct_list.dart index 03cc32e..7c8d264 100644 --- a/lib/pages/home/settings/direct_list/direct_list.dart +++ b/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'; diff --git a/lib/pages/home/settings/direct_list/direct_list_state.dart b/lib/views/home/settings/direct_list/direct_list_state.dart similarity index 100% rename from lib/pages/home/settings/direct_list/direct_list_state.dart rename to lib/views/home/settings/direct_list/direct_list_state.dart diff --git a/lib/pages/home/settings/direct_list/widgets/direct_item.dart b/lib/views/home/settings/direct_list/widgets/direct_item.dart similarity index 94% rename from lib/pages/home/settings/direct_list/widgets/direct_item.dart rename to lib/views/home/settings/direct_list/widgets/direct_item.dart index 088106e..6aa9a45 100644 --- a/lib/pages/home/settings/direct_list/widgets/direct_item.dart +++ b/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 { diff --git a/lib/pages/home/settings/general_settings/settings.dart b/lib/views/home/settings/general_settings/settings.dart similarity index 92% rename from lib/pages/home/settings/general_settings/settings.dart rename to lib/views/home/settings/general_settings/settings.dart index a02499b..c3cc3eb 100644 --- a/lib/pages/home/settings/general_settings/settings.dart +++ b/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'; diff --git a/lib/pages/home/settings/general_settings/settings_state.dart b/lib/views/home/settings/general_settings/settings_state.dart similarity index 100% rename from lib/pages/home/settings/general_settings/settings_state.dart rename to lib/views/home/settings/general_settings/settings_state.dart diff --git a/lib/pages/home/settings/profile/profile.dart b/lib/views/home/settings/profile/profile.dart similarity index 91% rename from lib/pages/home/settings/profile/profile.dart rename to lib/views/home/settings/profile/profile.dart index 0dfb2f3..071d6ac 100644 --- a/lib/pages/home/settings/profile/profile.dart +++ b/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'; diff --git a/lib/pages/home/settings/profile/widgets/profile_photo.dart b/lib/views/home/settings/profile/widgets/profile_photo.dart similarity index 96% rename from lib/pages/home/settings/profile/widgets/profile_photo.dart rename to lib/views/home/settings/profile/widgets/profile_photo.dart index 1791b94..62f1018 100644 --- a/lib/pages/home/settings/profile/widgets/profile_photo.dart +++ b/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'; diff --git a/lib/pages/home/settings/settings.dart b/lib/views/home/settings/settings.dart similarity index 92% rename from lib/pages/home/settings/settings.dart rename to lib/views/home/settings/settings.dart index 5a4a048..7753d26 100644 --- a/lib/pages/home/settings/settings.dart +++ b/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'; diff --git a/lib/pages/home/statistics/statistics.dart b/lib/views/home/statistics/statistics.dart similarity index 83% rename from lib/pages/home/statistics/statistics.dart rename to lib/views/home/statistics/statistics.dart index e727b5a..eef8150 100644 --- a/lib/pages/home/statistics/statistics.dart +++ b/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 { diff --git a/lib/pages/home/studio/studio.dart b/lib/views/home/studio/studio.dart similarity index 81% rename from lib/pages/home/studio/studio.dart rename to lib/views/home/studio/studio.dart index 2655767..a6f675a 100644 --- a/lib/pages/home/studio/studio.dart +++ b/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 { diff --git a/lib/pages/home/studio/studio_state.dart b/lib/views/home/studio/studio_state.dart similarity index 100% rename from lib/pages/home/studio/studio_state.dart rename to lib/views/home/studio/studio_state.dart diff --git a/lib/pages/home/studio/widgets/slider.dart b/lib/views/home/studio/widgets/slider.dart similarity index 100% rename from lib/pages/home/studio/widgets/slider.dart rename to lib/views/home/studio/widgets/slider.dart diff --git a/lib/pages/home/studio/widgets/tab_bar.dart b/lib/views/home/studio/widgets/tab_bar.dart similarity index 97% rename from lib/pages/home/studio/widgets/tab_bar.dart rename to lib/views/home/studio/widgets/tab_bar.dart index 61483bc..c5caacb 100644 --- a/lib/pages/home/studio/widgets/tab_bar.dart +++ b/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 { diff --git a/lib/pages/home/widgets/audio_slider.dart b/lib/views/home/widgets/audio_slider.dart similarity index 100% rename from lib/pages/home/widgets/audio_slider.dart rename to lib/views/home/widgets/audio_slider.dart diff --git a/lib/pages/home/widgets/audio_visualizer.dart b/lib/views/home/widgets/audio_visualizer.dart similarity index 100% rename from lib/pages/home/widgets/audio_visualizer.dart rename to lib/views/home/widgets/audio_visualizer.dart diff --git a/lib/pages/home/widgets/bnb.dart b/lib/views/home/widgets/bnb.dart similarity index 98% rename from lib/pages/home/widgets/bnb.dart rename to lib/views/home/widgets/bnb.dart index 01e2927..42d8ad9 100644 --- a/lib/pages/home/widgets/bnb.dart +++ b/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 { diff --git a/lib/pages/home/widgets/bookmark_button.dart b/lib/views/home/widgets/bookmark_button.dart similarity index 94% rename from lib/pages/home/widgets/bookmark_button.dart rename to lib/views/home/widgets/bookmark_button.dart index eb4aa46..4de2621 100644 --- a/lib/pages/home/widgets/bookmark_button.dart +++ b/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 { diff --git a/lib/pages/home/widgets/date_picker_button.dart b/lib/views/home/widgets/date_picker_button.dart similarity index 97% rename from lib/pages/home/widgets/date_picker_button.dart rename to lib/views/home/widgets/date_picker_button.dart index a2ac7f7..ac5164c 100644 --- a/lib/pages/home/widgets/date_picker_button.dart +++ b/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'; diff --git a/lib/pages/home/widgets/floating_navigation_bar.dart b/lib/views/home/widgets/floating_navigation_bar.dart similarity index 95% rename from lib/pages/home/widgets/floating_navigation_bar.dart rename to lib/views/home/widgets/floating_navigation_bar.dart index 6ed2f01..3cc0323 100644 --- a/lib/pages/home/widgets/floating_navigation_bar.dart +++ b/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 { diff --git a/lib/pages/home/widgets/logo_app_bar.dart b/lib/views/home/widgets/logo_app_bar.dart similarity index 91% rename from lib/pages/home/widgets/logo_app_bar.dart rename to lib/views/home/widgets/logo_app_bar.dart index 6aef13d..50f0bfc 100644 --- a/lib/pages/home/widgets/logo_app_bar.dart +++ b/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 { diff --git a/lib/pages/home/widgets/menu_item.dart b/lib/views/home/widgets/menu_item.dart similarity index 97% rename from lib/pages/home/widgets/menu_item.dart rename to lib/views/home/widgets/menu_item.dart index bd65501..d0612c7 100644 --- a/lib/pages/home/widgets/menu_item.dart +++ b/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 { diff --git a/lib/pages/home/widgets/multitype_overview.dart b/lib/views/home/widgets/multitype_overview.dart similarity index 94% rename from lib/pages/home/widgets/multitype_overview.dart rename to lib/views/home/widgets/multitype_overview.dart index f45ea16..0076a05 100644 --- a/lib/pages/home/widgets/multitype_overview.dart +++ b/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'; diff --git a/lib/pages/home/widgets/news_overview.dart b/lib/views/home/widgets/news_overview.dart similarity index 91% rename from lib/pages/home/widgets/news_overview.dart rename to lib/views/home/widgets/news_overview.dart index 03a19aa..e998acf 100644 --- a/lib/pages/home/widgets/news_overview.dart +++ b/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 { diff --git a/lib/pages/home/widgets/player_controller_button.dart b/lib/views/home/widgets/player_controller_button.dart similarity index 94% rename from lib/pages/home/widgets/player_controller_button.dart rename to lib/views/home/widgets/player_controller_button.dart index 029387d..7e2cc14 100644 --- a/lib/pages/home/widgets/player_controller_button.dart +++ b/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 { diff --git a/lib/pages/home/widgets/radar_overview.dart b/lib/views/home/widgets/radar_overview.dart similarity index 93% rename from lib/pages/home/widgets/radar_overview.dart rename to lib/views/home/widgets/radar_overview.dart index 64d462d..5616994 100644 --- a/lib/pages/home/widgets/radar_overview.dart +++ b/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 { diff --git a/lib/pages/home/widgets/search_field.dart b/lib/views/home/widgets/search_field.dart similarity index 98% rename from lib/pages/home/widgets/search_field.dart rename to lib/views/home/widgets/search_field.dart index 1dd684c..dea0aa1 100644 --- a/lib/pages/home/widgets/search_field.dart +++ b/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 { diff --git a/lib/pages/home/widgets/tag_item.dart b/lib/views/home/widgets/tag_item.dart similarity index 95% rename from lib/pages/home/widgets/tag_item.dart rename to lib/views/home/widgets/tag_item.dart index 24d9fa3..a447dc8 100644 --- a/lib/pages/home/widgets/tag_item.dart +++ b/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 { diff --git a/lib/pages/splash/splash.dart b/lib/views/splash/splash.dart similarity index 96% rename from lib/pages/splash/splash.dart rename to lib/views/splash/splash.dart index 7aaddf7..a66e8d1 100644 --- a/lib/pages/splash/splash.dart +++ b/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'; diff --git a/lib/widgets/animated_visibility.dart b/lib/views/widgets/animated_visibility.dart similarity index 100% rename from lib/widgets/animated_visibility.dart rename to lib/views/widgets/animated_visibility.dart diff --git a/lib/widgets/didvan/app_bar.dart b/lib/views/widgets/didvan/app_bar.dart similarity index 97% rename from lib/widgets/didvan/app_bar.dart rename to lib/views/widgets/didvan/app_bar.dart index 062e6cb..1de49fe 100644 --- a/lib/widgets/didvan/app_bar.dart +++ b/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 { diff --git a/lib/widgets/didvan/badge.dart b/lib/views/widgets/didvan/badge.dart similarity index 93% rename from lib/widgets/didvan/badge.dart rename to lib/views/widgets/didvan/badge.dart index 5223d0a..c88c0fd 100644 --- a/lib/widgets/didvan/badge.dart +++ b/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 { diff --git a/lib/widgets/didvan/button.dart b/lib/views/widgets/didvan/button.dart similarity index 97% rename from lib/widgets/didvan/button.dart rename to lib/views/widgets/didvan/button.dart index bb8e6ea..de7498b 100644 --- a/lib/widgets/didvan/button.dart +++ b/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 { diff --git a/lib/widgets/didvan/card.dart b/lib/views/widgets/didvan/card.dart similarity index 100% rename from lib/widgets/didvan/card.dart rename to lib/views/widgets/didvan/card.dart diff --git a/lib/widgets/didvan/checkbox.dart b/lib/views/widgets/didvan/checkbox.dart similarity index 95% rename from lib/widgets/didvan/checkbox.dart rename to lib/views/widgets/didvan/checkbox.dart index 588234c..dfeb454 100644 --- a/lib/widgets/didvan/checkbox.dart +++ b/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 { diff --git a/lib/widgets/didvan/chip.dart b/lib/views/widgets/didvan/chip.dart similarity index 89% rename from lib/widgets/didvan/chip.dart rename to lib/views/widgets/didvan/chip.dart index 358bcef..a1a7e73 100644 --- a/lib/widgets/didvan/chip.dart +++ b/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 { diff --git a/lib/widgets/didvan/divider.dart b/lib/views/widgets/didvan/divider.dart similarity index 100% rename from lib/widgets/didvan/divider.dart rename to lib/views/widgets/didvan/divider.dart diff --git a/lib/widgets/didvan/icon_button.dart b/lib/views/widgets/didvan/icon_button.dart similarity index 94% rename from lib/widgets/didvan/icon_button.dart rename to lib/views/widgets/didvan/icon_button.dart index ef501d7..3046757 100644 --- a/lib/widgets/didvan/icon_button.dart +++ b/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 { diff --git a/lib/widgets/didvan/page_view.dart b/lib/views/widgets/didvan/page_view.dart similarity index 95% rename from lib/widgets/didvan/page_view.dart rename to lib/views/widgets/didvan/page_view.dart index 588a421..2247d50 100644 --- a/lib/widgets/didvan/page_view.dart +++ b/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'; diff --git a/lib/widgets/didvan/scaffold.dart b/lib/views/widgets/didvan/scaffold.dart similarity index 98% rename from lib/widgets/didvan/scaffold.dart rename to lib/views/widgets/didvan/scaffold.dart index 1790794..db75ac9 100644 --- a/lib/widgets/didvan/scaffold.dart +++ b/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 { diff --git a/lib/widgets/didvan/switch.dart b/lib/views/widgets/didvan/switch.dart similarity index 95% rename from lib/widgets/didvan/switch.dart rename to lib/views/widgets/didvan/switch.dart index 6b6841d..558a2f7 100644 --- a/lib/widgets/didvan/switch.dart +++ b/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'; diff --git a/lib/widgets/didvan/text.dart b/lib/views/widgets/didvan/text.dart similarity index 100% rename from lib/widgets/didvan/text.dart rename to lib/views/widgets/didvan/text.dart diff --git a/lib/widgets/didvan/text_field.dart b/lib/views/widgets/didvan/text_field.dart similarity index 98% rename from lib/widgets/didvan/text_field.dart rename to lib/views/widgets/didvan/text_field.dart index f8dd15c..bf01ab4 100644 --- a/lib/widgets/didvan/text_field.dart +++ b/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'; diff --git a/lib/widgets/ink_wrapper.dart b/lib/views/widgets/ink_wrapper.dart similarity index 100% rename from lib/widgets/ink_wrapper.dart rename to lib/views/widgets/ink_wrapper.dart diff --git a/lib/widgets/item_title.dart b/lib/views/widgets/item_title.dart similarity index 94% rename from lib/widgets/item_title.dart rename to lib/views/widgets/item_title.dart index 1c0a89d..0477d87 100644 --- a/lib/widgets/item_title.dart +++ b/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 { diff --git a/lib/widgets/logos/didvan_horizontal_logo.dart b/lib/views/widgets/logos/didvan_horizontal_logo.dart similarity index 100% rename from lib/widgets/logos/didvan_horizontal_logo.dart rename to lib/views/widgets/logos/didvan_horizontal_logo.dart diff --git a/lib/widgets/logos/didvan_vertical_logo.dart b/lib/views/widgets/logos/didvan_vertical_logo.dart similarity index 100% rename from lib/widgets/logos/didvan_vertical_logo.dart rename to lib/views/widgets/logos/didvan_vertical_logo.dart diff --git a/lib/widgets/process_indicators.dart b/lib/views/widgets/process_indicators.dart similarity index 100% rename from lib/widgets/process_indicators.dart rename to lib/views/widgets/process_indicators.dart diff --git a/lib/widgets/shimmer_placeholder.dart b/lib/views/widgets/shimmer_placeholder.dart similarity index 100% rename from lib/widgets/shimmer_placeholder.dart rename to lib/views/widgets/shimmer_placeholder.dart diff --git a/lib/widgets/skeleton_image.dart b/lib/views/widgets/skeleton_image.dart similarity index 96% rename from lib/widgets/skeleton_image.dart rename to lib/views/widgets/skeleton_image.dart index dcad6af..bf7db1c 100644 --- a/lib/widgets/skeleton_image.dart +++ b/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'; diff --git a/lib/widgets/state_handlers/empty_connection.dart b/lib/views/widgets/state_handlers/empty_connection.dart similarity index 87% rename from lib/widgets/state_handlers/empty_connection.dart rename to lib/views/widgets/state_handlers/empty_connection.dart index 53e87a6..c6543bb 100644 --- a/lib/widgets/state_handlers/empty_connection.dart +++ b/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 { diff --git a/lib/widgets/state_handlers/empty_list.dart b/lib/views/widgets/state_handlers/empty_list.dart similarity index 82% rename from lib/widgets/state_handlers/empty_list.dart rename to lib/views/widgets/state_handlers/empty_list.dart index da00ac7..9be66b6 100644 --- a/lib/widgets/state_handlers/empty_list.dart +++ b/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 { diff --git a/lib/widgets/state_handlers/empty_result.dart b/lib/views/widgets/state_handlers/empty_result.dart similarity index 87% rename from lib/widgets/state_handlers/empty_result.dart rename to lib/views/widgets/state_handlers/empty_result.dart index bbb5fbb..1ae6b8f 100644 --- a/lib/widgets/state_handlers/empty_result.dart +++ b/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 { diff --git a/lib/widgets/state_handlers/empty_state.dart b/lib/views/widgets/state_handlers/empty_state.dart similarity index 92% rename from lib/widgets/state_handlers/empty_state.dart rename to lib/views/widgets/state_handlers/empty_state.dart index 6d4a883..abfe420 100644 --- a/lib/widgets/state_handlers/empty_state.dart +++ b/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'; diff --git a/lib/widgets/state_handlers/sliver_state_handler.dart b/lib/views/widgets/state_handlers/sliver_state_handler.dart similarity index 96% rename from lib/widgets/state_handlers/sliver_state_handler.dart rename to lib/views/widgets/state_handlers/sliver_state_handler.dart index e160f70..cb762f5 100644 --- a/lib/widgets/state_handlers/sliver_state_handler.dart +++ b/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 extends SliverList { diff --git a/lib/widgets/state_handlers/state_handler.dart b/lib/views/widgets/state_handlers/state_handler.dart similarity index 95% rename from lib/widgets/state_handlers/state_handler.dart rename to lib/views/widgets/state_handlers/state_handler.dart index 107db8e..513ac3f 100644 --- a/lib/widgets/state_handlers/state_handler.dart +++ b/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';