refactor: make project structure simpler

zamaniafshar · Jul 10, 2024 · 1aec9c8 · 1aec9c8
1 parent 356628b
commit 1aec9c8
Show file tree

Hide file tree

Showing 31 changed files with 92 additions and 68 deletions.
diff --git a/lib/personal_website_app.dart b/lib/personal_website_app.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:personal_website/config/constants/constants.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/config/theme/themes.dart';
 import 'package:personal_website/provider/language_provider.dart';
-import 'package:personal_website/ui/home/home.dart';
+import 'package:personal_website/ui/home.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class PersonalWebsiteApp extends ConsumerWidget {

diff --git a/lib/common/responsive/responsive.dart → lib/responsive/responsive.dart b/lib/common/responsive/responsive.dart → lib/responsive/responsive.dart
diff --git a/lib/common/responsive/src/constants.dart → lib/responsive/src/constants.dart b/lib/common/responsive/src/constants.dart → lib/responsive/src/constants.dart
diff --git a/lib/common/responsive/src/extensions.dart → lib/responsive/src/extensions.dart b/lib/common/responsive/src/extensions.dart → lib/responsive/src/extensions.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/src/screen_data.dart';
+import 'package:personal_website/responsive/src/screen_data.dart';
 
 extension HelperExtension on ScreenData {
   double get width => size.width;

diff --git a/lib/common/responsive/src/screen.dart → lib/responsive/src/screen.dart b/lib/common/responsive/src/screen.dart → lib/responsive/src/screen.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/src/screen_data.dart';
-import 'package:personal_website/common/responsive/src/screen_type.dart';
+import 'package:personal_website/responsive/src/screen_data.dart';
+import 'package:personal_website/responsive/src/screen_type.dart';
 
 class Screen extends InheritedWidget {
   Screen({

diff --git a/lib/common/responsive/src/screen_data.dart → lib/responsive/src/screen_data.dart b/lib/common/responsive/src/screen_data.dart → lib/responsive/src/screen_data.dart
diff --git a/lib/common/responsive/src/screen_type.dart → lib/responsive/src/screen_type.dart b/lib/common/responsive/src/screen_type.dart → lib/responsive/src/screen_type.dart
diff --git a/lib/ui/home/widgets/about_me/about_me.dart → lib/ui/about_me/about_me.dart b/lib/ui/home/widgets/about_me/about_me.dart → lib/ui/about_me/about_me.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
-import 'package:personal_website/ui/home/widgets/about_me/widgets/about_me_descriptions.dart';
-import 'package:personal_website/ui/home/widgets/about_me/widgets/my_avatar.dart';
+import 'package:personal_website/responsive/responsive.dart';
+import 'package:personal_website/ui/about_me/about_me_descriptions.dart';
+import 'package:personal_website/ui/about_me/my_avatar.dart';
 
 class AboutMe extends StatelessWidget {
   const AboutMe({super.key});

diff --git a/...out_me/widgets/about_me_descriptions.dart → lib/ui/about_me/about_me_descriptions.dart b/...out_me/widgets/about_me_descriptions.dart → lib/ui/about_me/about_me_descriptions.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:personal_website/config/constants/constants.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/config/constants/home_items_tags.dart';
 import 'package:personal_website/provider/tagged_list_provider.dart';
 import 'package:personal_website/provider/url_handler.dart';

diff --git a/...e/widgets/about_me/widgets/my_avatar.dart → lib/ui/about_me/my_avatar.dart b/...e/widgets/about_me/widgets/my_avatar.dart → lib/ui/about_me/my_avatar.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:personal_website/config/constants/constants.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 
 class MyAvatar extends StatelessWidget {
   const MyAvatar({

diff --git a/...i/home/widgets/contact_me/contact_me.dart → lib/ui/contact_me/contact_me.dart b/...i/home/widgets/contact_me/contact_me.dart → lib/ui/contact_me/contact_me.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:personal_website/ui/widgets/animated_title_text.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/widgets/contact_information.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/widgets/send_message.dart';
+import 'package:personal_website/ui/contact_me/widgets/contact_information.dart';
+import 'package:personal_website/ui/contact_me/widgets/send_message.dart';
 
 class ContactMe extends StatelessWidget {
   const ContactMe({super.key});

diff --git a/...me/widgets/contact_me/form_validator.dart → lib/ui/contact_me/form_validator.dart b/...me/widgets/contact_me/form_validator.dart → lib/ui/contact_me/form_validator.dart
diff --git a/...ntact_me/widgets/contact_information.dart → ...ntact_me/widgets/contact_information.dart b/...ntact_me/widgets/contact_information.dart → ...ntact_me/widgets/contact_information.dart
diff --git a/...ct_me/widgets/custom_text_form_field.dart → ...ct_me/widgets/custom_text_form_field.dart b/...ct_me/widgets/custom_text_form_field.dart → ...ct_me/widgets/custom_text_form_field.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/form_validator.dart';
+import 'package:personal_website/ui/contact_me/form_validator.dart';
 
 class CustomTextFormField extends StatelessWidget {
   const CustomTextFormField({

diff --git a/...gets/contact_me/widgets/send_message.dart → lib/ui/contact_me/widgets/send_message.dart b/...gets/contact_me/widgets/send_message.dart → lib/ui/contact_me/widgets/send_message.dart
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/data/message_sender_api.dart';
 import 'package:personal_website/provider/message_sender_provider.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/form_validator.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/widgets/custom_text_form_field.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/widgets/send_message_snack_bars.dart';
+import 'package:personal_website/ui/contact_me/form_validator.dart';
+import 'package:personal_website/ui/contact_me/widgets/custom_text_form_field.dart';
+import 'package:personal_website/ui/contact_me/widgets/send_message_snack_bars.dart';
 import 'package:personal_website/ui/widgets/custom_elevated_button.dart';
 
 class SendMessage extends HookConsumerWidget {

diff --git a/...t_me/widgets/send_message_snack_bars.dart → ...t_me/widgets/send_message_snack_bars.dart b/...t_me/widgets/send_message_snack_bars.dart → ...t_me/widgets/send_message_snack_bars.dart
diff --git a/lib/ui/home/home.dart → lib/ui/home.dart b/lib/ui/home/home.dart → lib/ui/home.dart
@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/config/constants/home_items_tags.dart';
 import 'package:personal_website/provider/tagged_list_provider.dart';
-import 'package:personal_website/ui/home/widgets/auto_tagged_item.dart';
-import 'package:personal_website/ui/home/widgets/about_me/about_me.dart';
-import 'package:personal_website/ui/home/widgets/contact_me/contact_me.dart';
-import 'package:personal_website/ui/home/widgets/my_services/my_services.dart';
-import 'package:personal_website/ui/home/widgets/my_skills/my_skills.dart';
-import 'package:personal_website/ui/home/widgets/home_welcome.dart';
-import 'package:personal_website/ui/home/widgets/sliver_app_bar/home_appbar.dart';
+import 'package:personal_website/ui/widgets/auto_tagged_item.dart';
+import 'package:personal_website/ui/about_me/about_me.dart';
+import 'package:personal_website/ui/contact_me/contact_me.dart';
+import 'package:personal_website/ui/my_services/my_services.dart';
+import 'package:personal_website/ui/my_skills/my_skills.dart';
+import 'package:personal_website/ui/home_welcome.dart';
+import 'package:personal_website/ui/sliver_app_bar/home_appbar.dart';
 
-import 'widgets/sliver_app_bar/widgets/home_drawer.dart';
+import 'sliver_app_bar/home_drawer.dart';
 
 class HomeScreen extends HookConsumerWidget {
   const HomeScreen({super.key});

diff --git a/lib/ui/home/widgets/home_welcome.dart → lib/ui/home_welcome.dart b/lib/ui/home/widgets/home_welcome.dart → lib/ui/home_welcome.dart
@@ -2,7 +2,7 @@ import 'package:animated_text_kit/animated_text_kit.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/config/constants/assets_paths.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:personal_website/config/constants/constants.dart';

diff --git a/...home/widgets/my_services/my_services.dart → lib/ui/my_services/my_services.dart b/...home/widgets/my_services/my_services.dart → lib/ui/my_services/my_services.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/ui/widgets/animated_title_text.dart';
-import 'package:personal_website/ui/home/widgets/my_services/widgets/service_container.dart';
+import 'package:personal_website/ui/my_services/service_container.dart';
 
 class MyServices extends StatelessWidget {
   const MyServices({super.key});

diff --git a/...y_services/widgets/service_container.dart → lib/ui/my_services/service_container.dart b/...y_services/widgets/service_container.dart → lib/ui/my_services/service_container.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 
 class ServiceContainer extends StatelessWidget {
   const ServiceContainer({

diff --git a/...ts/my_skills/widgets/language_skills.dart → lib/ui/my_skills/language_skills.dart b/...ts/my_skills/widgets/language_skills.dart → lib/ui/my_skills/language_skills.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/config/constants/assets_paths.dart';
-import 'package:personal_website/ui/home/widgets/my_skills/widgets/skills_section.dart';
+import 'package:personal_website/ui/my_skills/skills_section.dart';
 
 class LanguageSkills extends StatelessWidget {
   const LanguageSkills({

diff --git a/lib/ui/home/widgets/my_skills/my_skills.dart → lib/ui/my_skills/my_skills.dart b/lib/ui/home/widgets/my_skills/my_skills.dart → lib/ui/my_skills/my_skills.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
-import 'package:personal_website/ui/home/widgets/my_skills/widgets/language_skills.dart';
-import 'package:personal_website/ui/home/widgets/my_skills/widgets/skills.dart';
+import 'package:personal_website/responsive/responsive.dart';
+import 'package:personal_website/ui/my_skills/language_skills.dart';
+import 'package:personal_website/ui/my_skills/skills.dart';
 
 class MySkills extends StatelessWidget {
   const MySkills({super.key});

diff --git a/...ome/widgets/my_skills/widgets/skills.dart → lib/ui/my_skills/skills.dart b/...ome/widgets/my_skills/widgets/skills.dart → lib/ui/my_skills/skills.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:personal_website/ui/home/widgets/my_skills/widgets/skills_section.dart';
+import 'package:personal_website/ui/my_skills/skills_section.dart';
 
 class Skills extends StatelessWidget {
   const Skills({

diff --git a/...ets/my_skills/widgets/skills_section.dart → lib/ui/my_skills/skills_section.dart b/...ets/my_skills/widgets/skills_section.dart → lib/ui/my_skills/skills_section.dart
diff --git a/.../widgets/change_language_menu_button.dart → ..._app_bar/change_language_menu_button.dart b/.../widgets/change_language_menu_button.dart → ..._app_bar/change_language_menu_button.dart
diff --git a/...pp_bar/widgets/custom_navigation_bar.dart → ...sliver_app_bar/custom_navigation_bar.dart b/...pp_bar/widgets/custom_navigation_bar.dart → ...sliver_app_bar/custom_navigation_bar.dart
@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:personal_website/config/constants/home_items_tags.dart';
 import 'package:personal_website/provider/tagged_list_provider.dart';
-import '../../../../widgets/animated_underline_text.dart';
+import '../widgets/animated_underline_text.dart';
 
 class CustomNavigationBar extends HookConsumerWidget {
   const CustomNavigationBar({

diff --git a/...e/widgets/sliver_app_bar/home_appbar.dart → lib/ui/sliver_app_bar/home_appbar.dart b/...e/widgets/sliver_app_bar/home_appbar.dart → lib/ui/sliver_app_bar/home_appbar.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 import 'package:personal_website/provider/tagged_list_provider.dart';
-import 'package:personal_website/ui/home/widgets/sliver_app_bar/widgets/change_language_menu_button.dart';
-import 'package:personal_website/ui/home/widgets/sliver_app_bar/widgets/custom_navigation_bar.dart';
+import 'package:personal_website/ui/sliver_app_bar/change_language_menu_button.dart';
+import 'package:personal_website/ui/sliver_app_bar/custom_navigation_bar.dart';
 
 class HomeAppBar extends HookConsumerWidget {
   const HomeAppBar({super.key});

diff --git a/...s/sliver_app_bar/widgets/home_drawer.dart → lib/ui/sliver_app_bar/home_drawer.dart b/...s/sliver_app_bar/widgets/home_drawer.dart → lib/ui/sliver_app_bar/home_drawer.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/ui/home/widgets/sliver_app_bar/widgets/change_language_menu_button.dart';
-import 'package:personal_website/ui/home/widgets/sliver_app_bar/widgets/custom_navigation_bar.dart';
+import 'package:personal_website/ui/sliver_app_bar/change_language_menu_button.dart';
+import 'package:personal_website/ui/sliver_app_bar/custom_navigation_bar.dart';
 
 class HomeDrawer extends StatelessWidget {
   const HomeDrawer({super.key});

diff --git a/lib/ui/home/widgets/auto_tagged_item.dart → lib/ui/widgets/auto_tagged_item.dart b/lib/ui/home/widgets/auto_tagged_item.dart → lib/ui/widgets/auto_tagged_item.dart
diff --git a/lib/ui/widgets/custom_elevated_button.dart b/lib/ui/widgets/custom_elevated_button.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:personal_website/common/responsive/responsive.dart';
+import 'package:personal_website/responsive/responsive.dart';
 
 class CustomElevatedButton extends StatelessWidget {
   const CustomElevatedButton({

diff --git a/pubspec.lock b/pubspec.lock
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   crypto:
     dependency: transitive
     description:
@@ -209,10 +209,34 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -225,34 +249,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -374,10 +398,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
@@ -390,10 +414,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -414,10 +438,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.0"
   toastification:
     dependency: "direct main"
     description:
@@ -538,14 +562,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "14.2.1"
   win32:
     dependency: transitive
     description:
@@ -571,5 +595,5 @@ packages:
     source: hosted
     version: "6.3.0"
 sdks:
-  dart: ">=3.1.5 <4.0.0"
-  flutter: ">=3.13.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"