Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/make sks counter refresh and files structure refactor #574

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ app.*.symbols
*.tailor.dart
*.gen.dart
*.gr.dart
lib/l10n/app_localizations_pl.dart
lib/l10n/app_localizations.dart

#Env setup
.env
Expand All @@ -156,4 +158,4 @@ env.g.dart
.vscode

# FVM Version Cache
.fvm/
.fvm/
2 changes: 1 addition & 1 deletion lib/config/nav_bar_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "package:flutter/material.dart";

import "../features/bottom_nav_bar/bottom_nav_bar_icon_icons.icons.dart";
import "../features/navigator/app_router.dart";
import "../features/parkings_view/widgets/parkings_icons.icons.dart";
import "../features/parkings/parkings_view/widgets/parkings_icons.icons.dart";
import "../utils/context_extensions.dart";

enum NavBarEnum {
Expand Down
2 changes: 1 addition & 1 deletion lib/config/ui_config.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "package:flutter/material.dart";

import "../features/parking_chart/utils/range_hour_points.dart";
import "../features/parkings/parking_chart/utils/range_hour_points.dart";
import "../theme/hex_color.dart";

abstract class MyAppConfig {
Expand Down
2 changes: 1 addition & 1 deletion lib/features/bottom_scroll_sheet/navigate_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "../../theme/app_theme.dart";
import "../../utils/context_extensions.dart";
import "../map_view/controllers/controllers_set.dart";
import "../map_view/widgets/map_config.dart";
import "../parkings_view/widgets/parkings_icons.icons.dart";
import "../parkings/parkings_view/widgets/parkings_icons.icons.dart";

class NavigateButton<T extends GoogleNavigable> extends ConsumerWidget {
const NavigateButton({super.key});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";

import "../../config/ui_config.dart";
import "../../theme/app_theme.dart";
import "../../utils/context_extensions.dart";
import "../../utils/determine_contact_icon.dart";
import "../../utils/where_non_null_iterable.dart";
import "../../widgets/detail_views/contact_section.dart";
import "../../widgets/detail_views/detail_view_app_bar.dart";
import "../../widgets/horizontal_symmetric_safe_area.dart";
import "../../widgets/my_error_widget.dart";
import "../../../config/ui_config.dart";
import "../../../theme/app_theme.dart";
import "../../../utils/context_extensions.dart";
import "../../../utils/determine_contact_icon.dart";
import "../../../utils/where_non_null_iterable.dart";
import "../../../widgets/detail_views/contact_section.dart";
import "../../../widgets/detail_views/detail_view_app_bar.dart";
import "../../../widgets/horizontal_symmetric_safe_area.dart";
import "../../../widgets/my_error_widget.dart";
import "repository/department_details_repository.dart";
import "utils/address_formatter.dart";
import "utils/department_details_gradient.dart";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:riverpod_annotation/riverpod_annotation.dart";

import "../../../api_base/query_adapter.dart";
import "../../../config/ttl_config.dart";
import "../../../../api_base/query_adapter.dart";
import "../../../../config/ttl_config.dart";
import "getDepartmentDetails.graphql.dart";

part "department_details_repository.g.dart";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "package:flutter/material.dart";

import "../../../config/ui_config.dart";
import "../../../theme/hex_color.dart";
import "../../../utils/colors_sort.dart";
import "../../../../config/ui_config.dart";
import "../../../../theme/hex_color.dart";
import "../../../../utils/colors_sort.dart";
import "../repository/department_details_repository.dart";

extension DepartmentDetailsDetailsX on DepartmentDetailsDetails {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "package:flutter/material.dart";
import "package:separate/separate.dart";

import "../../../theme/app_theme.dart";
import "../../../widgets/my_expansion_tile.dart";
import "../../../../theme/app_theme.dart";
import "../../../../widgets/my_expansion_tile.dart";
import "field_of_study_tile.dart";
import "fields_of_study_section.dart";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import "package:flutter/material.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:separate/separate.dart";

import "../../../theme/app_theme.dart";
import "../../../theme/utils.dart";
import "../../../utils/launch_url_util.dart";
import "../../../widgets/wide_tile_card.dart";
import "../../../../theme/app_theme.dart";
import "../../../../theme/utils.dart";
import "../../../../utils/launch_url_util.dart";
import "../../../../widgets/wide_tile_card.dart";
import "fields_of_study_section.dart";

class FieldOfStudyTile extends ConsumerWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/cupertino.dart";

import "../../../theme/app_theme.dart";
import "../../../utils/context_extensions.dart";
import "../../../../theme/app_theme.dart";
import "../../../../utils/context_extensions.dart";
import "../repository/getDepartmentDetails.graphql.dart";
import "../utils/fields_of_studies.dart";
import "field_of_study_expansion_tile.dart";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";

import "../../../config/ui_config.dart";
import "../../../utils/context_extensions.dart";
import "../../../widgets/big_preview_card.dart";
import "../../../widgets/my_error_widget.dart";
import "../../../widgets/subsection_header.dart";
import "../../home_view/widgets/loading_widgets/big_scrollable_section_loading.dart";
import "../../home_view/widgets/paddings.dart";
import "../../navigator/utils/navigation_commands.dart";
import "../../science_clubs_view/repository/science_clubs_repository.dart";
import "../../../../config/ui_config.dart";
import "../../../../utils/context_extensions.dart";
import "../../../../widgets/big_preview_card.dart";
import "../../../../widgets/my_error_widget.dart";
import "../../../../widgets/subsection_header.dart";
import "../../../home_view/widgets/loading_widgets/big_scrollable_section_loading.dart";
import "../../../home_view/widgets/paddings.dart";
import "../../../navigator/utils/navigation_commands.dart";
import "../../../science_club/science_clubs_view/repository/science_clubs_repository.dart";
import "../repository/department_details_repository.dart";

class DepartmentScienceClubsSection extends ConsumerWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "package:flutter/material.dart";

import "../../../widgets/detail_views/sliver_header_section.dart";
import "../../../widgets/detail_views/sliver_logo.dart";
import "../../../widgets/my_cached_image.dart";
import "../../../../widgets/detail_views/sliver_header_section.dart";
import "../../../../widgets/detail_views/sliver_logo.dart";
import "../../../../widgets/my_cached_image.dart";

class DepartmentSliverHeaderSection extends SliverHeaderSection {
DepartmentSliverHeaderSection({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import "package:flutter/material.dart";

import "../../../config/ui_config.dart";
import "../../../widgets/loading_widgets/contact_section_loading.dart";
import "../../../widgets/loading_widgets/header_section_loading.dart";
import "../../../widgets/loading_widgets/shimmer_loading.dart";
import "../../home_view/widgets/loading_widgets/big_scrollable_section_loading.dart";
import "../../../../config/ui_config.dart";
import "../../../../widgets/loading_widgets/contact_section_loading.dart";
import "../../../../widgets/loading_widgets/header_section_loading.dart";
import "../../../../widgets/loading_widgets/shimmer_loading.dart";
import "../../../home_view/widgets/loading_widgets/big_scrollable_section_loading.dart";

class DepartmentDetailViewLoading extends StatelessWidget {
const DepartmentDetailViewLoading({super.key});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";

import "../../config/ui_config.dart";
import "../../utils/context_extensions.dart";
import "../../widgets/horizontal_symmetric_safe_area.dart";
import "../../widgets/my_error_widget.dart";
import "../../widgets/search_box_app_bar.dart";
import "../../widgets/search_not_found.dart";
import "../navigator/utils/navigation_commands.dart";
import "../../../config/ui_config.dart";
import "../../../utils/context_extensions.dart";
import "../../../widgets/horizontal_symmetric_safe_area.dart";
import "../../../widgets/my_error_widget.dart";
import "../../../widgets/search_box_app_bar.dart";
import "../../../widgets/search_not_found.dart";
import "../../navigator/utils/navigation_commands.dart";
import "departments_view_controllers.dart";
import "repository/departments_repository.dart";
import "widgets/department_card.dart";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:riverpod_annotation/riverpod_annotation.dart";

import "../../utils/contains_lower_case.dart";
import "../../../utils/contains_lower_case.dart";
import "repository/departments_repository.dart";

part "departments_view_controllers.g.dart";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "package:flutter/material.dart";

import "../../../config/ui_config.dart";
import "../../../theme/hex_color.dart";
import "../../../utils/colors_sort.dart";
import "../../../../config/ui_config.dart";
import "../../../../theme/hex_color.dart";
import "../../../../utils/colors_sort.dart";
import "departments_repository.dart";

extension DepartmentsX on Department {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:riverpod_annotation/riverpod_annotation.dart";

import "../../../api_base/query_adapter.dart";
import "../../../config/ttl_config.dart";
import "../../../utils/ilist_nonempty.dart";
import "../../../../api_base/query_adapter.dart";
import "../../../../config/ttl_config.dart";
import "../../../../utils/ilist_nonempty.dart";
import "departments_extensions.dart";
import "getDepartments.graphql.dart";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import "package:flutter/material.dart";

import "../../../config/ui_config.dart";
import "../../../theme/app_theme.dart";
import "../../../theme/utils.dart";
import "../../../widgets/my_cached_image.dart";
import "../../../widgets/optimized_directus_image.dart";
import "../../../widgets/wide_tile_card.dart";
import "../../../../config/ui_config.dart";
import "../../../../theme/app_theme.dart";
import "../../../../theme/utils.dart";
import "../../../../widgets/my_cached_image.dart";
import "../../../../widgets/optimized_directus_image.dart";
import "../../../../widgets/wide_tile_card.dart";
import "../repository/departments_extensions.dart";
import "../repository/departments_repository.dart";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "package:flutter/material.dart";

import "../../../../widgets/loading_widgets/specific_imitations/wide_tile_loading.dart";
import "../../../config/ui_config.dart";
import "../../../../../widgets/loading_widgets/specific_imitations/wide_tile_loading.dart";
import "../../../../config/ui_config.dart";

class DepartmentsViewLoading extends StatelessWidget {
const DepartmentsViewLoading({super.key});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
import "../../../../../config/ui_config.dart";
import "../../../../../theme/app_theme.dart";
import "../../../../../widgets/my_error_widget.dart";
import "../../../../digital_guide_view/data/models/digital_guide_response.dart";
import "../../../../navigator/utils/navigation_commands.dart";
import "../../../data/models/digital_guide_response.dart";
import "../../../presentation/widgets/digital_guide_nav_link.dart";
import "../data/models/micronavigation_response.dart";
import "../data/repository/micronavigation_repository.dart";
Expand Down
2 changes: 1 addition & 1 deletion lib/features/guide_view/guide_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "../../utils/context_extensions.dart";
import "../../utils/launch_url_util.dart";
import "../../widgets/search_box_app_bar.dart";
import "../../widgets/wide_tile_card.dart";
import "../departments_view/widgets/departments_view_loading.dart";
import "../departments/departments_view/widgets/departments_view_loading.dart";
import "guide_view_controller.dart";
import "repository/guide_repository.dart";
import "widgets/guide_grid.dart";
Expand Down
6 changes: 3 additions & 3 deletions lib/features/home_view/keep_alive_home_view_providers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import "package:riverpod_annotation/riverpod_annotation.dart";
import "../academic_calendar/repository/academic_calendar_repo.dart";
import "../app_streak/business/get_days_use_case.dart";
import "../buildings_view/repository/buildings_repository.dart";
import "../departments_view/repository/departments_repository.dart";
import "../departments/departments_view/repository/departments_repository.dart";
import "../guide_view/repository/guide_repository.dart";
import "../parkings_view/repository/parkings_repository.dart";
import "../science_clubs_view/repository/science_clubs_repository.dart";
import "../parkings/parkings_view/repository/parkings_repository.dart";
import "../science_club/science_clubs_view/repository/science_clubs_repository.dart";
import "home_view.dart";

part "keep_alive_home_view_providers.g.dart";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import "../../../../theme/app_theme.dart";
import "../../../../widgets/my_cached_image.dart";
import "../../../../widgets/optimized_directus_image.dart";
import "../../../../widgets/tile_splash.dart";
import "../../../departments_view/repository/departments_extensions.dart";
import "../../../departments_view/repository/departments_repository.dart";
import "../../../departments/departments_view/repository/departments_extensions.dart";
import "../../../departments/departments_view/repository/departments_repository.dart";

class DepartmentHomeTile extends StatelessWidget {
final Department department;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
import "../../../../utils/context_extensions.dart";
import "../../../../widgets/my_error_widget.dart";
import "../../../../widgets/subsection_header.dart";
import "../../../departments_view/repository/departments_repository.dart";
import "../../../departments/departments_view/repository/departments_repository.dart";
import "../../../navigator/utils/navigation_commands.dart";
import "../loading_widgets/scrollable_section_loading.dart";
import "../paddings.dart";
Expand Down
4 changes: 2 additions & 2 deletions lib/features/home_view/widgets/parkings_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import "../../../utils/context_extensions.dart";
import "../../../widgets/my_error_widget.dart";
import "../../../widgets/subsection_header.dart";
import "../../navigator/utils/navigation_commands.dart";
import "../../parkings_view/models/parking.dart";
import "../../parkings_view/repository/parkings_repository.dart";
import "../../parkings/parkings_view/models/parking.dart";
import "../../parkings/parkings_view/repository/parkings_repository.dart";
import "buildings_section/building_card.dart";
import "loading_widgets/scrollable_section_loading.dart";
import "paddings.dart";
Expand Down
2 changes: 1 addition & 1 deletion lib/features/home_view/widgets/science_clubs_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "../../../widgets/big_preview_card.dart";
import "../../../widgets/my_error_widget.dart";
import "../../../widgets/subsection_header.dart";
import "../../navigator/utils/navigation_commands.dart";
import "../../science_clubs_view/repository/science_clubs_repository.dart";
import "../../science_club/science_clubs_view/repository/science_clubs_repository.dart";
import "loading_widgets/big_scrollable_section_loading.dart";
import "paddings.dart";

Expand Down
30 changes: 15 additions & 15 deletions lib/features/navigator/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ import "package:riverpod_annotation/riverpod_annotation.dart";
import "../../../../features/buildings_view/model/building_model.dart";
import "../about_us_view/about_us_view.dart";
import "../buildings_view/buildings_view.dart";
import "../department_detail_view/department_detail_view.dart";
import "../departments_view/departments_view.dart";
import "../digital_guide_view/presentation/digital_guide_view.dart";
import "../digital_guide_view/tabs/adapted_toilets/data/models/adapted_toilet.dart";
import "../digital_guide_view/tabs/adapted_toilets/presentation/adapted_toilet_detail_view.dart";
import "../digital_guide_view/tabs/lifts/data/models/digital_guide_lift.dart";
import "../digital_guide_view/tabs/lifts/presentation/digital_guide_lift_detail_view.dart";
import "../digital_guide_view/tabs/micronavigation/data/models/micronavigation_response.dart";
import "../digital_guide_view/tabs/micronavigation/presentation/micronavigation_detail_view.dart";
import "../digital_guide_view/tabs/rooms/data/models/digital_guide_room.dart";
import "../digital_guide_view/tabs/rooms/presentation/digital_guide_room_detail_view.dart";
import "../departments/department_detail_view/department_detail_view.dart";
import "../departments/departments_view/departments_view.dart";
import "../digital_guide/presentation/digital_guide_view.dart";
import "../digital_guide/tabs/adapted_toilets/data/models/adapted_toilet.dart";
import "../digital_guide/tabs/adapted_toilets/presentation/adapted_toilet_detail_view.dart";
import "../digital_guide/tabs/lifts/data/models/digital_guide_lift.dart";
import "../digital_guide/tabs/lifts/presentation/digital_guide_lift_detail_view.dart";
import "../digital_guide/tabs/micronavigation/data/models/micronavigation_response.dart";
import "../digital_guide/tabs/micronavigation/presentation/micronavigation_detail_view.dart";
import "../digital_guide/tabs/rooms/data/models/digital_guide_room.dart";
import "../digital_guide/tabs/rooms/presentation/digital_guide_room_detail_view.dart";
import "../guide_detail_view/guide_detail_view.dart";
import "../guide_view/guide_view.dart";
import "../home_view/home_view.dart";
import "../navigation_tab_view/navigation_tab_view.dart";
import "../parkings_view/parkings_view.dart";
import "../science_club_detail_view/science_club_detail_view.dart";
import "../science_clubs_view/science_clubs_view.dart";
import "../sks_menu/presentation/sks_menu_screen.dart";
import "../parkings/parkings_view/parkings_view.dart";
import "../science_club/science_club_detail_view/science_club_detail_view.dart";
import "../science_club/science_clubs_view/science_clubs_view.dart";
import "../sks/sks_menu/presentation/sks_menu_screen.dart";
import "root_view.dart";

part "app_router.g.dart";
Expand Down
10 changes: 5 additions & 5 deletions lib/features/navigator/utils/navigation_commands.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import "package:logger/logger.dart";

import "../../../utils/launch_url_util.dart";
import "../../buildings_view/model/building_model.dart";
import "../../digital_guide_view/tabs/adapted_toilets/data/models/adapted_toilet.dart";
import "../../digital_guide_view/tabs/lifts/data/models/digital_guide_lift.dart";
import "../../digital_guide_view/tabs/micronavigation/data/models/micronavigation_response.dart";
import "../../digital_guide_view/tabs/rooms/data/models/digital_guide_room.dart";
import "../../parkings_view/models/parking.dart";
import "../../digital_guide/tabs/adapted_toilets/data/models/adapted_toilet.dart";
import "../../digital_guide/tabs/lifts/data/models/digital_guide_lift.dart";
import "../../digital_guide/tabs/micronavigation/data/models/micronavigation_response.dart";
import "../../digital_guide/tabs/rooms/data/models/digital_guide_room.dart";
import "../../parkings/parkings_view/models/parking.dart";
import "../app_router.dart";
import "../navigation_controller.dart";

Expand Down
Loading
Loading