Skip to content

Commit 2405556

Browse files
committed
Refactor folders
1 parent 787b1d2 commit 2405556

File tree

551 files changed

+2989
-2698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

551 files changed

+2989
-2698
lines changed
3.52 KB
2.39 KB

lib/algorithms/subteam_appointments/overall/default_overall_appointments_algorithm.dart

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/algorithms/subteam_appointments/overall/overall_appointments_algorithm.dart

Lines changed: 0 additions & 10 deletions
This file was deleted.

lib/constants/simulation_mode_constants.dart

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/models/database/country/country.dart renamed to lib/data/models/database/country/country.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import 'package:equatable/equatable.dart';
22
import 'package:flutter/material.dart';
33
import 'package:json_annotation/json_annotation.dart';
44

5-
import 'package:sj_manager/json/json_types.dart';
6-
import 'package:sj_manager/utils/multilingual_string.dart';
5+
import 'package:sj_manager/utilities/json/json_types.dart';
6+
import 'package:sj_manager/utilities/utils/multilingual_string.dart';
77

88
part 'country.g.dart';
99

lib/models/database/hill/hill.dart renamed to lib/data/models/database/hill/hill.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:json_annotation/json_annotation.dart';
33

4-
import 'package:sj_manager/json/countries.dart';
5-
import 'package:sj_manager/json/json_types.dart';
6-
import 'package:sj_manager/models/database/country/country.dart';
7-
import 'package:sj_manager/models/database/hill/hill_profile_type.dart';
8-
import 'package:sj_manager/models/database/hill/hill_type_by_size.dart';
9-
import 'package:sj_manager/models/database/hill/jumps_variability.dart';
10-
import 'package:sj_manager/models/database/hill/landing_ease.dart';
11-
import 'package:sj_manager/models/database/hill/typical_wind_direction.dart';
12-
import 'package:sj_manager/utils/doubles.dart';
4+
import 'package:sj_manager/utilities/json/countries.dart';
5+
import 'package:sj_manager/utilities/json/json_types.dart';
6+
import 'package:sj_manager/data/models/database/country/country.dart';
7+
import 'package:sj_manager/data/models/database/hill/hill_profile_type.dart';
8+
import 'package:sj_manager/data/models/database/hill/hill_type_by_size.dart';
9+
import 'package:sj_manager/data/models/database/hill/jumps_variability.dart';
10+
import 'package:sj_manager/data/models/database/hill/landing_ease.dart';
11+
import 'package:sj_manager/data/models/database/hill/typical_wind_direction.dart';
12+
import 'package:sj_manager/utilities/utils/doubles.dart';
1313

14-
part '../../../json/manual_json/hill_json.dart';
14+
part '../../../../utilities/json/manual_json/hill_json.dart';
1515

1616
class Hill with EquatableMixin {
1717
Hill({

lib/models/database/items_repos_registry.dart renamed to lib/data/models/database/items_repos_registry.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:equatable/equatable.dart';
2-
import 'package:sj_manager/repositories/generic/editable_items_repo.dart';
3-
import 'package:sj_manager/repositories/generic/items_repo.dart';
2+
import 'package:sj_manager/domain/repository_interfaces/generic/editable_items_repo.dart';
3+
import 'package:sj_manager/domain/repository_interfaces/generic/items_repo.dart';
44

55
class ItemsReposRegistry extends ItemsRepo<ItemsRepo> with EquatableMixin {
66
ItemsReposRegistry({

lib/models/database/jumper/jumper_db_record.dart renamed to lib/data/models/database/jumper/jumper_db_record.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
import 'package:equatable/equatable.dart';
33
import 'package:json_annotation/json_annotation.dart';
44

5-
import 'package:sj_manager/json/countries.dart';
6-
import 'package:sj_manager/json/json_types.dart';
7-
import 'package:sj_manager/models/database/country/country.dart';
8-
import 'package:sj_manager/models/database/jumper/jumper_skills_db_record.dart';
9-
import 'package:sj_manager/models/database/psyche/personalities.dart';
10-
import 'package:sj_manager/models/database/sex.dart';
11-
12-
part '../../../json/manual_json/jumper_json.dart';
5+
import 'package:sj_manager/utilities/json/countries.dart';
6+
import 'package:sj_manager/utilities/json/json_types.dart';
7+
import 'package:sj_manager/data/models/database/country/country.dart';
8+
import 'package:sj_manager/data/models/database/jumper/jumper_skills_db_record.dart';
9+
import 'package:sj_manager/data/models/database/psyche/personalities.dart';
10+
import 'package:sj_manager/data/models/database/sex.dart';
11+
12+
part '../../../../utilities/json/manual_json/jumper_json.dart';
1313

1414
class JumperDbRecord with EquatableMixin {
1515
JumperDbRecord({

lib/models/database/jumper/jumper_skills_db_record.dart renamed to lib/data/models/database/jumper/jumper_skills_db_record.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:json_annotation/json_annotation.dart';
33

4-
import 'package:sj_manager/json/json_types.dart';
4+
import 'package:sj_manager/utilities/json/json_types.dart';
55

66
part 'jumper_skills.g.dart';
77

lib/models/database/jumps/simple_jump.dart renamed to lib/data/models/database/jumps/simple_jump.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:json_annotation/json_annotation.dart';
3-
import 'package:sj_manager/json/json_types.dart';
3+
import 'package:sj_manager/utilities/json/json_types.dart';
44

55
part 'simple_jump.g.dart';
66

lib/models/database/psyche/personalities.dart renamed to lib/data/models/database/psyche/personalities.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:sj_manager/models/database/psyche/level_of_consciousness.dart';
1+
import 'package:sj_manager/data/models/database/psyche/level_of_consciousness.dart';
22

33
enum Personalities {
44
compromised, // Wstyd, Skompromitowany

lib/models/database/psyche/psyche_utils.dart renamed to lib/data/models/database/psyche/psyche_utils.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:sj_manager/models/database/psyche/level_of_consciousness.dart';
2-
import 'package:sj_manager/models/database/psyche/personalities.dart';
1+
import 'package:sj_manager/data/models/database/psyche/level_of_consciousness.dart';
2+
import 'package:sj_manager/data/models/database/psyche/personalities.dart';
33

44
const personalityByLoc = {
55
LevelOfConsciousnessLabels.shame: Personalities.compromised, // Wstyd, Skompromitowany

lib/models/database/psyche/translations.dart renamed to lib/data/models/database/psyche/translations.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:sj_manager/l10n/helpers.dart';
3-
import 'package:sj_manager/models/database/psyche/level_of_consciousness.dart';
4-
import 'package:sj_manager/models/database/psyche/personalities.dart';
3+
import 'package:sj_manager/data/models/database/psyche/level_of_consciousness.dart';
4+
import 'package:sj_manager/data/models/database/psyche/personalities.dart';
55

66
String levelOfConsciousnessName({
77
required BuildContext context,
File renamed without changes.

lib/models/database/team/competition_team.dart renamed to lib/data/models/database/team/competition_team.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:equatable/equatable.dart';
2-
import 'package:sj_manager/models/database/jumper/jumper_db_record.dart';
3-
import 'package:sj_manager/models/database/team/team.dart';
2+
import 'package:sj_manager/data/models/database/jumper/jumper_db_record.dart';
3+
import 'package:sj_manager/data/models/database/team/team.dart';
44

55
class CompetitionTeam<T extends Team> extends Team with EquatableMixin {
66
const CompetitionTeam({

lib/models/database/team/country_team/country_team.dart renamed to lib/data/models/database/team/country_team/country_team.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:sj_manager/models/database/country/country.dart';
2-
import 'package:sj_manager/models/database/sex.dart';
3-
import 'package:sj_manager/models/database/team/country_team/country_team_facts.dart';
4-
import 'package:sj_manager/models/database/team/team.dart';
1+
import 'package:sj_manager/data/models/database/country/country.dart';
2+
import 'package:sj_manager/data/models/database/sex.dart';
3+
import 'package:sj_manager/data/models/database/team/country_team/country_team_facts.dart';
4+
import 'package:sj_manager/data/models/database/team/team.dart';
55

66
class CountryTeam extends Team {
77
const CountryTeam({

lib/models/database/team/country_team/country_team_facts.dart renamed to lib/data/models/database/team/country_team/country_team_facts.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:json_annotation/json_annotation.dart';
3-
import 'package:sj_manager/json/json_types.dart';
4-
import 'package:sj_manager/models/database/jumps/simple_jump.dart';
5-
import 'package:sj_manager/models/database/team/country_team/subteam_type.dart';
3+
import 'package:sj_manager/utilities/json/json_types.dart';
4+
import 'package:sj_manager/data/models/database/jumps/simple_jump.dart';
5+
import 'package:sj_manager/data/models/database/team/country_team/subteam_type.dart';
66

77
part 'country_team_facts.g.dart';
88

lib/models/database/team/country_team/subteam_type.dart renamed to lib/data/models/database/team/country_team/subteam_type.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:sj_manager/utils/multilingual_string.dart';
1+
import 'package:sj_manager/utilities/utils/multilingual_string.dart';
22

33
enum SubteamType {
44
a,

lib/models/database/team/personal_coach_team.dart renamed to lib/data/models/database/team/personal_coach_team.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/json/json_types.dart';
2-
import 'package:sj_manager/models/database/team/team.dart';
3-
import 'package:sj_manager/models/simulation/jumper/simulation_jumper.dart';
1+
import 'package:sj_manager/utilities/json/json_types.dart';
2+
import 'package:sj_manager/data/models/database/team/team.dart';
3+
import 'package:sj_manager/data/models/simulation/jumper/simulation_jumper.dart';
44

55
class PersonalCoachTeam extends Team {
66
PersonalCoachTeam({

lib/models/database/team/subteam.dart renamed to lib/data/models/database/team/subteam.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/json/json_types.dart';
2-
import 'package:sj_manager/models/database/team/country_team/subteam_type.dart';
3-
import 'package:sj_manager/models/database/team/team.dart';
1+
import 'package:sj_manager/utilities/json/json_types.dart';
2+
import 'package:sj_manager/data/models/database/team/country_team/subteam_type.dart';
3+
import 'package:sj_manager/data/models/database/team/team.dart';
44

55
class Subteam extends Team {
66
const Subteam({

lib/models/database/user_algorithms_repo.dart renamed to lib/data/models/database/user_algorithms_repo.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/models/simulation/competition/rules/user_algorithms/unary_algorithm.dart';
2-
import 'package:sj_manager/models/simulation/competition/rules/user_algorithms/user_algorithm.dart';
3-
import 'package:sj_manager/repositories/generic/value_repo.dart';
1+
import 'package:sj_manager/data/models/simulation/competition/rules/user_algorithms/unary_algorithm.dart';
2+
import 'package:sj_manager/data/models/simulation/competition/rules/user_algorithms/user_algorithm.dart';
3+
import 'package:sj_manager/domain/repository_interfaces/generic/value_repo.dart';
44

55
typedef UserAlgorithmsList = List<UserAlgorithm<UnaryAlgorithm>>;
66

lib/errors/translation_not_found.dart renamed to lib/data/models/errors/translation_not_found.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:sj_manager/utils/multilingual_string.dart';
1+
import 'package:sj_manager/utilities/utils/multilingual_string.dart';
22

33
class TranslationNotFoundError extends Error {
44
TranslationNotFoundError({

lib/models/game_variants/default_game_variants/test_variant.dart renamed to lib/data/models/game_variants/default_game_variants/test_variant.dart

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
import 'package:flutter/material.dart';
2-
import 'package:sj_manager/json/countries.dart';
3-
import 'package:sj_manager/json/simulation_db_loading/team_loader.dart';
4-
import 'package:sj_manager/models/game_variants/default_game_variants/constants.dart';
5-
import 'package:sj_manager/models/game_variants/game_variant.dart';
6-
import 'package:sj_manager/models/game_variants/game_variant_start_date.dart';
7-
import 'package:sj_manager/models/game_variants/game_variants_io_utils.dart';
8-
import 'package:sj_manager/models/simulation/classification/classification.dart';
9-
import 'package:sj_manager/models/simulation/classification/default_classification_rules.dart';
10-
import 'package:sj_manager/models/simulation/competition/calendar_records/calendar_main_competition_record.dart';
11-
import 'package:sj_manager/models/simulation/competition/calendar_records/calendar_main_competition_record_setup.dart';
12-
import 'package:sj_manager/models/simulation/competition/calendar_records/calendar_main_competition_records_to_calendar.dart';
13-
import 'package:sj_manager/models/simulation/competition/competition.dart';
14-
import 'package:sj_manager/models/simulation/competition/competition_labels.dart';
15-
import 'package:sj_manager/models/simulation/competition/high_level_calendar.dart';
16-
import 'package:sj_manager/models/simulation/competition/rules/competition_round_rules/default_individual_competition_round_rules.dart';
17-
import 'package:sj_manager/models/simulation/competition/rules/competition_round_rules/default_team_competition_round_rules.dart';
18-
import 'package:sj_manager/models/simulation/competition/rules/competition_rules/default_competition_rules.dart';
19-
import 'package:sj_manager/models/simulation/competition/rules/entities_limit.dart';
20-
import 'package:sj_manager/models/simulation/competition/rules/ko/ko_round_rules.dart';
21-
import 'package:sj_manager/models/simulation/competition/rules/utils/classification_score_creator/concrete/individual_default.dart';
22-
import 'package:sj_manager/models/simulation/competition/rules/utils/classification_score_creator/concrete/team_default.dart';
23-
import 'package:sj_manager/models/simulation/competition/rules/utils/competition_score_creator/concrete/individual/default_linear.dart';
2+
import 'package:sj_manager/utilities/json/countries.dart';
3+
import 'package:sj_manager/utilities/json/simulation_db_loading/team_loader.dart';
4+
import 'package:sj_manager/data/models/game_variants/default_game_variants/constants.dart';
5+
import 'package:sj_manager/data/models/game_variants/game_variant.dart';
6+
import 'package:sj_manager/data/models/game_variants/game_variant_start_date.dart';
7+
import 'package:sj_manager/data/models/game_variants/game_variants_io_utils.dart';
8+
import 'package:sj_manager/data/models/simulation/classification/classification.dart';
9+
import 'package:sj_manager/data/models/simulation/classification/default_classification_rules.dart';
10+
import 'package:sj_manager/data/models/simulation/competition/calendar_records/calendar_main_competition_record.dart';
11+
import 'package:sj_manager/data/models/simulation/competition/calendar_records/calendar_main_competition_record_setup.dart';
12+
import 'package:sj_manager/data/models/simulation/competition/calendar_records/calendar_main_competition_records_to_calendar.dart';
13+
import 'package:sj_manager/data/models/simulation/competition/competition.dart';
14+
import 'package:sj_manager/data/models/simulation/competition/competition_labels.dart';
15+
import 'package:sj_manager/data/models/simulation/competition/high_level_calendar.dart';
16+
import 'package:sj_manager/data/models/simulation/competition/rules/competition_round_rules/default_individual_competition_round_rules.dart';
17+
import 'package:sj_manager/data/models/simulation/competition/rules/competition_round_rules/default_team_competition_round_rules.dart';
18+
import 'package:sj_manager/data/models/simulation/competition/rules/competition_rules/default_competition_rules.dart';
19+
import 'package:sj_manager/data/models/simulation/competition/rules/entities_limit.dart';
20+
import 'package:sj_manager/data/models/simulation/competition/rules/ko/ko_round_rules.dart';
21+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/classification_score_creator/concrete/individual_default.dart';
22+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/classification_score_creator/concrete/team_default.dart';
23+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/competition_score_creator/concrete/individual/default_linear.dart';
2424
import 'package:collection/collection.dart';
25-
import 'package:sj_manager/models/simulation/competition/rules/utils/judges_creator/concrete/default.dart';
26-
import 'package:sj_manager/models/simulation/competition/rules/utils/jump_score_creator/concrete/default_classic.dart';
27-
import 'package:sj_manager/models/simulation/competition/rules/utils/ko_group_creator.dart/concrete/default_classic.dart';
28-
import 'package:sj_manager/models/simulation/competition/rules/utils/ko_round_advancement_determinator/concrete/n_best.dart';
29-
import 'package:sj_manager/models/simulation/competition/rules/utils/wind_averager/concrete/default_weighted.dart';
30-
import 'package:sj_manager/models/simulation/database/actions/simulation_action_type.dart';
31-
import 'package:sj_manager/models/simulation/event_series/event_series.dart';
32-
import 'package:sj_manager/models/simulation/event_series/event_series_calendar.dart';
33-
import 'package:sj_manager/models/simulation/event_series/event_series_setup.dart';
34-
import 'package:sj_manager/models/simulation/database/simulation_database_and_models/simulation_season.dart';
35-
import 'package:sj_manager/models/simulation/jumper/reports/jumper_level_description.dart';
36-
import 'package:sj_manager/models/simulation/standings/standings.dart';
37-
import 'package:sj_manager/models/simulation/standings/standings_positions_map_creator/standings_positions_with_ex_aequos_creator.dart';
38-
import 'package:sj_manager/models/database/country/country.dart';
39-
import 'package:sj_manager/models/database/hill/hill.dart';
40-
import 'package:sj_manager/models/database/hill/hill_profile_type.dart';
41-
import 'package:sj_manager/models/database/hill/jumps_variability.dart';
42-
import 'package:sj_manager/models/database/hill/landing_ease.dart';
43-
import 'package:sj_manager/models/database/jumper/jumper_db_record.dart';
44-
import 'package:sj_manager/models/database/team/country_team/country_team.dart';
45-
import 'package:sj_manager/models/database/team/team.dart';
46-
import 'package:sj_manager/repositories/countries/countries_repo.dart';
47-
import 'package:sj_manager/repositories/generic/db_items_json_configuration.dart';
48-
import 'package:sj_manager/repositories/generic/items_ids_repo.dart';
49-
import 'package:sj_manager/utils/multilingual_string.dart';
25+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/judges_creator/concrete/default.dart';
26+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/jump_score_creator/concrete/default_classic.dart';
27+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/ko_group_creator.dart/concrete/default_classic.dart';
28+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/ko_round_advancement_determinator/concrete/n_best.dart';
29+
import 'package:sj_manager/data/models/simulation/competition/rules/utils/wind_averager/concrete/default_weighted.dart';
30+
import 'package:sj_manager/data/models/simulation/database/actions/simulation_action_type.dart';
31+
import 'package:sj_manager/data/models/simulation/event_series/event_series.dart';
32+
import 'package:sj_manager/data/models/simulation/event_series/event_series_calendar.dart';
33+
import 'package:sj_manager/data/models/simulation/event_series/event_series_setup.dart';
34+
import 'package:sj_manager/data/models/simulation/database/simulation_database_and_models/simulation_season.dart';
35+
import 'package:sj_manager/data/models/simulation/jumper/reports/jumper_level_description.dart';
36+
import 'package:sj_manager/data/models/simulation/standings/standings.dart';
37+
import 'package:sj_manager/data/models/simulation/standings/standings_positions_map_creator/standings_positions_with_ex_aequos_creator.dart';
38+
import 'package:sj_manager/data/models/database/country/country.dart';
39+
import 'package:sj_manager/data/models/database/hill/hill.dart';
40+
import 'package:sj_manager/data/models/database/hill/hill_profile_type.dart';
41+
import 'package:sj_manager/data/models/database/hill/jumps_variability.dart';
42+
import 'package:sj_manager/data/models/database/hill/landing_ease.dart';
43+
import 'package:sj_manager/data/models/database/jumper/jumper_db_record.dart';
44+
import 'package:sj_manager/data/models/database/team/country_team/country_team.dart';
45+
import 'package:sj_manager/data/models/database/team/team.dart';
46+
import 'package:sj_manager/domain/repository_interfaces/countries/countries_repo.dart';
47+
import 'package:sj_manager/domain/repository_interfaces/generic/db_items_json_configuration.dart';
48+
import 'package:sj_manager/domain/repository_interfaces/generic/items_ids_repo.dart';
49+
import 'package:sj_manager/utilities/utils/multilingual_string.dart';
5050
import 'package:provider/provider.dart';
5151

5252
Future<GameVariant> constructTestGameVariant({

lib/models/game_variants/default_game_variants/variants_registry.dart renamed to lib/data/models/game_variants/default_game_variants/variants_registry.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
2-
import 'package:sj_manager/models/game_variants/default_game_variants/test_variant.dart';
3-
import 'package:sj_manager/models/game_variants/game_variant.dart';
2+
import 'package:sj_manager/data/models/game_variants/default_game_variants/test_variant.dart';
3+
import 'package:sj_manager/data/models/game_variants/game_variant.dart';
44

55
Future<List<GameVariant>> constructDefaultGameVariants({
66
required BuildContext context,

0 commit comments

Comments
 (0)