remove useless words in file names and organize them properly

user5522 · Jul 15, 2024 · 8c923ae · 8c923ae
1 parent 2123946
commit 8c923ae
Show file tree

Hide file tree

Showing 36 changed files with 32 additions and 32 deletions.
diff --git a/.../screens/timetable_management_screen.dart → ...ettings/screens/timetable_management.dart b/.../screens/timetable_management_screen.dart → ...ettings/screens/timetable_management.dart
diff --git a/...ings/screens/timetable_period_screen.dart → ...ts/settings/screens/timetable_period.dart b/...ings/screens/timetable_period_screen.dart → ...ts/settings/screens/timetable_period.dart
diff --git a/lib/components/settings/timetable_features.dart b/lib/components/settings/timetable_features.dart
@@ -1,9 +1,9 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/components/settings/screens/timetable_management_screen.dart';
+import 'package:timetable/components/settings/screens/timetable_management.dart';
 import 'package:timetable/provider/settings.dart';
-import 'package:timetable/components/settings/screens/timetable_period_screen.dart';
+import 'package:timetable/components/settings/screens/timetable_period.dart';
 
 /// All the settings for changing some timetable features.
 class TimetableFeaturesOptions extends ConsumerWidget {

diff --git a/...gement/subject_configs/colors_config.dart → ...ect_management/subject_configs/color.dart b/...gement/subject_configs/colors_config.dart → ...ect_management/subject_configs/color.dart
@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:timetable/components/subject_management/subject_configs/colors_config_screens/colors_screen.dart';
+import 'package:timetable/components/subject_management/subject_configs/colors_screens/colors.dart';
 import 'package:timetable/components/widgets/list_item_group.dart';
 
 /// Color configuration part of the Subject creation screen.

diff --git a/...s_config_screens/color_picker_screen.dart → ..._configs/colors_screens/color_picker.dart b/...s_config_screens/color_picker_screen.dart → ..._configs/colors_screens/color_picker.dart
diff --git a/.../colors_config_screens/colors_screen.dart → ...ubject_configs/colors_screens/colors.dart b/.../colors_config_screens/colors_screen.dart → ...ubject_configs/colors_screens/colors.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:timetable/components/subject_management/subject_configs/colors_config_screens/color_picker_screen.dart';
-import 'package:timetable/components/subject_management/subject_configs/colors_config_screens/preset_colors_screen.dart';
+import 'package:timetable/components/subject_management/subject_configs/colors_screens/color_picker.dart';
+import 'package:timetable/components/subject_management/subject_configs/colors_screens/preset_colors.dart';
 import 'package:timetable/constants/colors.dart';
 
 /// Colors configuration screen, basically groups [ColorPickerScreen] and [PresetColorsScreen].

diff --git a/..._config_screens/preset_colors_screen.dart → ...configs/colors_screens/preset_colors.dart b/..._config_screens/preset_colors_screen.dart → ...configs/colors_screens/preset_colors.dart
diff --git a/...anagement/subject_configs/day_config.dart → ...bject_management/subject_configs/day.dart b/...anagement/subject_configs/day_config.dart → ...bject_management/subject_configs/day.dart
diff --git a/lib/components/subject_management/subject_configs/day_time_week_tb_config.dart b/lib/components/subject_management/subject_configs/day_time_week_tb_config.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/components/subject_management/subject_configs/day_config.dart';
-import 'package:timetable/components/subject_management/subject_configs/rotation_week_config.dart';
-import 'package:timetable/components/subject_management/subject_configs/time_config.dart';
-import 'package:timetable/components/subject_management/subject_configs/timetable_config.dart';
+import 'package:timetable/components/subject_management/subject_configs/day.dart';
+import 'package:timetable/components/subject_management/subject_configs/rotation_week.dart';
+import 'package:timetable/components/subject_management/subject_configs/time.dart';
+import 'package:timetable/components/subject_management/subject_configs/timetable.dart';
 import 'package:timetable/components/widgets/list_item_group.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';

diff --git a/...ubject_configs/label_location_config.dart → ...ement/subject_configs/label_location.dart b/...ubject_configs/label_location_config.dart → ...ement/subject_configs/label_location.dart
diff --git a/...management/subject_configs/note_tile.dart → ...ject_management/subject_configs/note.dart b/...management/subject_configs/note_tile.dart → ...ject_management/subject_configs/note.dart
diff --git a/...subject_configs/rotation_week_config.dart → ...gement/subject_configs/rotation_week.dart b/...subject_configs/rotation_week_config.dart → ...gement/subject_configs/rotation_week.dart
diff --git a/...nagement/subject_configs/time_config.dart → ...ject_management/subject_configs/time.dart b/...nagement/subject_configs/time_config.dart → ...ject_management/subject_configs/time.dart
diff --git a/...ent/subject_configs/timetable_config.dart → ...management/subject_configs/timetable.dart b/...ent/subject_configs/timetable_config.dart → ...management/subject_configs/timetable.dart
diff --git a/lib/components/subject_management/subject_screen.dart b/lib/components/subject_management/subject_screen.dart
@@ -2,10 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/components/subject_management/subject_configs/colors_config.dart';
+import 'package:timetable/components/subject_management/subject_configs/color.dart';
 import 'package:timetable/components/subject_management/subject_configs/day_time_week_tb_config.dart';
-import 'package:timetable/components/subject_management/subject_configs/label_location_config.dart';
-import 'package:timetable/components/subject_management/subject_configs/note_tile.dart';
+import 'package:timetable/components/subject_management/subject_configs/label_location.dart';
+import 'package:timetable/components/subject_management/subject_configs/note.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
 import 'package:timetable/db/database.dart';

diff --git a/lib/components/timetable_views/day_view.dart → lib/components/timetable_views/day.dart b/lib/components/timetable_views/day_view.dart → lib/components/timetable_views/day.dart
@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/components/subject_management/subject_screen.dart';
-import 'package:timetable/components/widgets/day_view_subject_builder.dart';
+import 'package:timetable/components/widgets/day_view/day_view_subject_builder.dart';
 import 'package:timetable/constants/custom_times.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/error_emoticons.dart';

diff --git a/...components/timetable_views/grid_view.dart → lib/components/timetable_views/grid.dart b/...components/timetable_views/grid_view.dart → lib/components/timetable_views/grid.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/components/widgets/grid.dart';
-import 'package:timetable/components/widgets/grid_view_overlapping_subjects_builder.dart';
+import 'package:timetable/components/widgets/grid_view/grid.dart';
+import 'package:timetable/components/widgets/grid_view/grid_view_overlapping_subjects_builder.dart';
 import 'package:timetable/components/widgets/time_column.dart';
 import 'package:timetable/constants/custom_times.dart';
 import 'package:timetable/constants/grid_properties.dart';
@@ -10,9 +10,9 @@ import 'package:timetable/constants/rotation_weeks.dart';
 import 'package:timetable/db/database.dart';
 import 'package:timetable/helpers/timetables.dart';
 import 'package:timetable/provider/overlapping_subjects.dart';
-import 'package:timetable/components/widgets/grid_view_subject_builder.dart';
-import 'package:timetable/components/widgets/grid_view_subject_container_builder.dart';
-import 'package:timetable/components/widgets/tile.dart';
+import 'package:timetable/components/widgets/grid_view/grid_view_subject_builder.dart';
+import 'package:timetable/components/widgets/grid_view/grid_view_subject_container_builder.dart';
+import 'package:timetable/components/widgets/grid_view/tile.dart';
 import 'package:timetable/helpers/rotation_weeks.dart';
 import 'package:timetable/provider/settings.dart';
 import 'package:timetable/provider/timetables.dart';

diff --git a/lib/components/widgets/bottom_navigation_bar.dart b/lib/components/widgets/bottom_navigation_bar.dart
@@ -5,8 +5,8 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/provider/settings.dart';
 import 'package:timetable/provider/subjects.dart';
-import 'package:timetable/screens/settings_screen.dart';
-import 'package:timetable/screens/timetable_screen.dart';
+import 'package:timetable/screens/settings.dart';
+import 'package:timetable/screens/timetable.dart';
 
 /// The app's bottom navigation bar.
 class BottomNavigation extends HookConsumerWidget {

diff --git a/lib/components/widgets/bottom_sheets/days_modal_bottom_sheet.dart b/lib/components/widgets/bottom_sheets/days_modal_bottom_sheet.dart
@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:timetable/components/widgets/subject_data_bottom_sheet.dart';
+import 'package:timetable/components/widgets/bottom_sheets/subject_data_bottom_sheet.dart';
 import 'package:timetable/constants/days.dart';
 
 /// Bottom Sheet Modal Widget used to select a subject's day.

diff --git a/lib/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart b/lib/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart
@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:timetable/components/widgets/subject_data_bottom_sheet.dart';
+import 'package:timetable/components/widgets/bottom_sheets/subject_data_bottom_sheet.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
 import 'package:timetable/helpers/rotation_weeks.dart';
 

diff --git a/...ts/widgets/subject_data_bottom_sheet.dart → ...tom_sheets/subject_data_bottom_sheet.dart b/...ts/widgets/subject_data_bottom_sheet.dart → ...tom_sheets/subject_data_bottom_sheet.dart
diff --git a/lib/components/widgets/bottom_sheets/timetables_modal_bottom_sheet.dart b/lib/components/widgets/bottom_sheets/timetables_modal_bottom_sheet.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/components/widgets/subject_data_bottom_sheet.dart';
+import 'package:timetable/components/widgets/bottom_sheets/subject_data_bottom_sheet.dart';
 import 'package:timetable/db/database.dart';
 import 'package:timetable/provider/timetables.dart';
 

diff --git a/...nts/widgets/day_view_subject_builder.dart → ...ts/day_view/day_view_subject_builder.dart b/...nts/widgets/day_view_subject_builder.dart → ...ts/day_view/day_view_subject_builder.dart
diff --git a/lib/components/widgets/days_bar.dart → ...components/widgets/day_view/days_bar.dart b/lib/components/widgets/days_bar.dart → ...components/widgets/day_view/days_bar.dart
diff --git a/lib/components/widgets/grid.dart → lib/components/widgets/grid_view/grid.dart b/lib/components/widgets/grid.dart → lib/components/widgets/grid_view/grid.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:timetable/components/widgets/tile.dart';
+import 'package:timetable/components/widgets/grid_view/tile.dart';
 
 /// Grid for the grid view of the Timetable screen.
 class Grid extends StatelessWidget {

diff --git a/...onents/widgets/grid_day_views_toggle.dart → ...gets/grid_view/grid_day_views_toggle.dart b/...onents/widgets/grid_day_views_toggle.dart → ...gets/grid_view/grid_day_views_toggle.dart
diff --git a/...id_view_overlapping_subjects_builder.dart → ...id_view_overlapping_subjects_builder.dart b/...id_view_overlapping_subjects_builder.dart → ...id_view_overlapping_subjects_builder.dart
diff --git a/...ts/widgets/grid_view_subject_builder.dart → .../grid_view/grid_view_subject_builder.dart b/...ts/widgets/grid_view_subject_builder.dart → .../grid_view/grid_view_subject_builder.dart
diff --git a/.../grid_view_subject_container_builder.dart → .../grid_view_subject_container_builder.dart b/.../grid_view_subject_container_builder.dart → .../grid_view_subject_container_builder.dart
diff --git a/lib/components/widgets/tile.dart → lib/components/widgets/grid_view/tile.dart b/lib/components/widgets/tile.dart → lib/components/widgets/grid_view/tile.dart
diff --git a/lib/db/converters/color_converter.dart → lib/db/converters/color.dart b/lib/db/converters/color_converter.dart → lib/db/converters/color.dart
diff --git a/lib/db/converters/time_of_day_converter.dart → lib/db/converters/time_of_day.dart b/lib/db/converters/time_of_day_converter.dart → lib/db/converters/time_of_day.dart
diff --git a/lib/db/database.dart b/lib/db/database.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart' as material;
 import 'package:timetable/db/connection/native.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
 import 'package:timetable/constants/days.dart';
-import 'package:timetable/db/converters/color_converter.dart';
-import 'package:timetable/db/converters/time_of_day_converter.dart';
+import 'package:timetable/db/converters/color.dart';
+import 'package:timetable/db/converters/time_of_day.dart';
 import 'package:timetable/db/models/timetable.dart';
 import 'package:timetable/db/models/subject.dart';
 

diff --git a/lib/db/models/subject.dart b/lib/db/models/subject.dart
@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/db/converters/color_converter.dart';
-import 'package:timetable/db/converters/time_of_day_converter.dart';
+import 'package:timetable/db/converters/color.dart';
+import 'package:timetable/db/converters/time_of_day.dart';
 import 'package:timetable/db/database.dart';
 
 class Subject extends Table {

diff --git a/lib/screens/settings_screen.dart → lib/screens/settings.dart b/lib/screens/settings_screen.dart → lib/screens/settings.dart
diff --git a/lib/screens/timetable_screen.dart → lib/screens/timetable.dart b/lib/screens/timetable_screen.dart → lib/screens/timetable.dart
@@ -2,10 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/components/timetable_views/day_view.dart';
-import 'package:timetable/components/timetable_views/grid_view.dart';
-import 'package:timetable/components/widgets/days_bar.dart';
-import 'package:timetable/components/widgets/grid_day_views_toggle.dart';
+import 'package:timetable/components/timetable_views/day.dart';
+import 'package:timetable/components/timetable_views/grid.dart';
+import 'package:timetable/components/widgets/day_view/days_bar.dart';
+import 'package:timetable/components/widgets/grid_view/grid_day_views_toggle.dart';
 import 'package:timetable/components/widgets/navigation_bar_toggle.dart';
 import 'package:timetable/components/widgets/rotation_week_toggle.dart';
 import 'package:timetable/components/widgets/timetable_toggle.dart';