Skip to content

Commit 773de83

Browse files
SiekamCebuleSiekamCebule
committed
Refactoring SJM part 3
1 parent c96101e commit 773de83

File tree

605 files changed

+4837
-7867
lines changed

Some content is hidden

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

605 files changed

+4837
-7867
lines changed

‎lib/config/db_editing_defaults/game_variant_editing_defaults_repository.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
abstract interface class GameVariantEditingDefaultsRepository {
2+
double get maxJumperQualitySkill;
3+
}

‎lib/config/db_editing_defaults/sjm_predefined_db_editing_defaults_repository.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import 'package:sj_manager/config/db_editing_defaults/game_variant_editing_defaults_repository.dart';
2+
3+
class SjmPredefinedDbEditingDefaultsRepository
4+
implements GameVariantEditingDefaultsRepository {
5+
@override
6+
double get maxJumperQualitySkill => 20;
7+
}

‎lib/presentation/ui/navigation/routes.dart renamed to ‎lib/config/routing/routes.dart

Lines changed: 38 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
import 'package:fluro/fluro.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
4-
import 'package:sj_manager/domain/use_cases/ui/simulation/simulation_screen_navigation_cubit.dart';
4+
import 'package:sj_manager/features/database_editor/presentation/pages/database_editor_page.dart';
5+
import 'package:sj_manager/features/game_variants/presentation/bloc/game_variant_cubit.dart';
6+
import 'package:sj_manager/features/simulations/presentation/bloc/simulation_cubit.dart';
7+
import 'package:sj_manager/to_embrace/domain/use_cases/ui/simulation/simulation_screen_navigation_cubit.dart';
58
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
6-
import 'package:sj_manager/data/models/game_variant/game_variant.dart';
7-
import 'package:sj_manager/data/models/game_variant/game_variants_io_utils.dart';
8-
import 'package:sj_manager/domain/entities/simulation/database/helper/simulation_database_helper.dart';
9-
import 'package:sj_manager/domain/entities/simulation/database/simulation_database_and_models/simulation_database.dart';
10-
import 'package:sj_manager/domain/entities/simulation/jumper/simulation_jumper.dart';
11-
import 'package:sj_manager/data/models/user_simulation/simulation_model.dart';
12-
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
13-
import 'package:sj_manager/domain/repository_interfaces/countries/country_flags/country_flags_repo.dart';
14-
import 'package:sj_manager/domain/repository_interfaces/countries/country_flags/local_storage_country_flags_repo.dart';
15-
import 'package:sj_manager/domain/repository_interfaces/generic/editable_items_repo.dart';
16-
import 'package:sj_manager/domain/repository_interfaces/generic/items_repo.dart';
17-
import 'package:sj_manager/presentation/ui/reusable_widgets/database_item_images/db_item_image_generating_setup.dart';
18-
import 'package:sj_manager/presentation/ui/screens/database_editor/database_editor_screen.dart';
19-
import 'package:sj_manager/presentation/ui/screens/simulation/simulation_route.dart';
20-
import 'package:sj_manager/presentation/ui/screens/main_screen/main_screen.dart';
21-
import 'package:sj_manager/presentation/ui/screens/settings/settings_screen.dart';
9+
import 'package:sj_manager/core/general_utils/game_variants_io_utils.dart';
10+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/simulation_database_helper.dart';
11+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/simulation_jumper.dart';
12+
import 'package:sj_manager/core/core_classes/hill/hill.dart';
13+
import 'package:sj_manager/core/country_flags/country_flags_repository.dart';
14+
import 'package:sj_manager/core/country_flags/local_storage_country_flags_repo.dart';
15+
import 'package:sj_manager/general_ui/reusable_widgets/database_item_images/db_item_image_generating_setup.dart';
16+
import 'package:sj_manager/to_embrace/ui/screens/simulation/simulation_route.dart';
17+
import 'package:sj_manager/main_menu/ui/main_screen.dart';
18+
import 'package:sj_manager/features/app_settings/presentation/pages/settings_screen.dart';
2219
import 'package:provider/provider.dart';
23-
import 'package:sj_manager/presentation/ui/screens/training_analyzer/training_analyzer_screen.dart';
24-
import 'package:sj_manager/utilities/utils/db_item_images.dart';
25-
import 'package:sj_manager/utilities/utils/file_system.dart';
20+
import 'package:sj_manager/features/training_analyzer/ui/training_analyzer_screen.dart';
21+
import 'package:sj_manager/core/general_utils/db_item_images.dart';
22+
import 'package:sj_manager/core/general_utils/file_system.dart';
2623
import 'package:path/path.dart' as path;
2724

2825
void configureRoutes(FluroRouter router) {
@@ -105,10 +102,9 @@ void configureRoutes(FluroRouter router) {
105102
'/databaseEditor/:gameVariantId',
106103
(context, params) {
107104
final gameVariantId = params['gameVariantId']![0];
108-
final gameVariant = context!
109-
.read<ItemsRepo<GameVariant>>()
110-
.last
111-
.singleWhere((variant) => variant.id == gameVariantId);
105+
final gameVariantState =
106+
context!.read<GameVariantCubit>().state as GameVariantChosen;
107+
112108
final imagesDir = userDataDirectory(context.read(),
113109
path.join('game_variants', gameVariantId, 'countries', 'country_flags'));
114110
final countryFlagsRepo = LocalStorageCountryFlagsRepo(
@@ -117,8 +113,8 @@ void configureRoutes(FluroRouter router) {
117113
);
118114
return MultiProvider(
119115
providers: [
120-
Provider.value(value: gameVariant),
121-
Provider<CountryFlagsRepo>.value(value: countryFlagsRepo),
116+
Provider.value(value: gameVariantState.variant),
117+
Provider<CountryFlagsRepository>.value(value: countryFlagsRepo),
122118
Provider(
123119
create: (context) => DbItemImageGeneratingSetup<JumperDbRecord>(
124120
imagesDirectory: gameVariantDirectory(
@@ -130,29 +126,26 @@ void configureRoutes(FluroRouter router) {
130126
),
131127
),
132128
],
133-
child: const DatabaseEditorScreen(),
129+
child: const DatabaseEditorPage(),
134130
);
135131
},
136132
transitionBuilder: defaultInFromLeft,
137133
);
138-
define('/simulation/:simulationId', (context, params) {
139-
final simulationId = params['simulationId']![0];
140-
final simulationsRepo = context!.read<EditableItemsRepo<SimulationModel>>();
141-
final simulation = simulationsRepo.last.singleWhere(
142-
(simulation) => simulation.id == simulationId,
143-
);
144-
final simulationIndexInRepo = simulationsRepo.last.indexOf(simulation);
145-
final imagesDir = userDataDirectory(context.read(),
146-
path.join('simulations', simulationId, 'countries', 'country_flags'));
147-
final simulationDatabase = simulation.database!.copyWith();
134+
define('/simulation', (context, params) {
135+
final simulationState = context!.read<SimulationCubit>().state as SimulationChosen;
136+
final imagesDir = userDataDirectory(
137+
context.read(),
138+
path.join(
139+
'simulations', simulationState.simulation.id, 'countries', 'country_flags'));
140+
final simulationDatabase = simulationState.database.copyWith();
148141

149-
print('routes, initial jumpers: ${simulation.database!.jumpers}');
142+
print('routes, initial jumpers: ${simulationState.database.jumpers}');
150143

151144
return MultiProvider(
152145
providers: [
153-
Provider.value(value: simulation),
154-
Provider(create: (context) => simulation.database!.countries),
155-
Provider<CountryFlagsRepo>(
146+
Provider.value(value: simulationState.simulation),
147+
Provider(create: (context) => simulationState.database.countries),
148+
Provider<CountryFlagsRepository>(
156149
create: (context) => LocalStorageCountryFlagsRepo(
157150
imagesDirectory: imagesDir,
158151
imagesExtension: 'png',
@@ -162,7 +155,7 @@ void configureRoutes(FluroRouter router) {
162155
create: (context) => DbItemImageGeneratingSetup<SimulationJumper>(
163156
imagesDirectory: simulationDirectory(
164157
pathsCache: context.read(),
165-
simulationId: simulationId,
158+
simulationId: simulationState.simulation.id,
166159
directoryName: path.join('jumper_images'),
167160
),
168161
toFileName: simulationJumperImageName,
@@ -172,7 +165,7 @@ void configureRoutes(FluroRouter router) {
172165
create: (context) => DbItemImageGeneratingSetup<Hill>(
173166
imagesDirectory: simulationDirectory(
174167
pathsCache: context.read(),
175-
simulationId: simulationId,
168+
simulationId: simulationState.simulation.id,
176169
directoryName: path.join('hill_images'),
177170
),
178171
toFileName: hillImageName,
@@ -194,12 +187,8 @@ void configureRoutes(FluroRouter router) {
194187
],
195188
child: Builder(builder: (context) {
196189
return PopScope(
197-
onPopInvokedWithResult: (didPop, result) {
198-
final database = context.read<SimulationDatabase>();
199-
context.read<EditableItemsRepo<SimulationModel>>().replace(
200-
oldIndex: simulationIndexInRepo,
201-
newItem: simulation.copyWith(database: database),
202-
);
190+
onPopInvokedWithResult: (didPop, result) async {
191+
await context.read<SimulationCubit>().preserve();
203192
},
204193
child: const SimulationRoute(),
205194
);

‎lib/utilities/algorithms/jumpers_ranking/country_team_ranking_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/jumpers_ranking/country_team_ranking_creator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:sj_manager/domain/entities/simulation/jumper/simulation_jumper.dart';
1+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/simulation_jumper.dart';
22

33
class CountryTeamRankingCreator {
44
const CountryTeamRankingCreator({

‎lib/utilities/algorithms/reports/default_jumper_level_report_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/reports/default_jumper_level_report_creator.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/domain/entities/simulation/jumper/reports/jumper_level_description.dart';
2-
import 'package:sj_manager/domain/entities/simulation/jumper/reports/jumper_reports.dart';
3-
import 'package:sj_manager/domain/entities/simulation/jumper/simulation_jumper.dart';
1+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/reports/jumper_level_description.dart';
2+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/reports/jumper_reports.dart';
3+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/simulation_jumper.dart';
44

55
class DefaultJumperLevelReportCreator {
66
DefaultJumperLevelReportCreator({

‎lib/utilities/algorithms/reports/training_progress_report/monthly_jumper_training_progress_report_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/reports/training_progress_report/monthly_jumper_training_progress_report_creator.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/utilities/algorithms/reports/training_progress_report/training_report_creator.dart';
2-
import 'package:sj_manager/domain/entities/simulation/jumper/reports/jumper_reports.dart';
3-
import 'package:sj_manager/domain/entities/simulation/flow/simple_rating.dart';
1+
import 'package:sj_manager/core/career_mode/career_mode_utils/reports/training_progress_report/training_report_creator.dart';
2+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/reports/jumper_reports.dart';
3+
import 'package:sj_manager/core/career_mode/simple_rating.dart';
44

55
class MonthlyJumperTrainingProgressReportCreator {
66
MonthlyJumperTrainingProgressReportCreator({

‎lib/utilities/algorithms/reports/training_progress_report/training_report_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/reports/training_progress_report/training_report_creator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:sj_manager/domain/entities/simulation/jumper/reports/jumper_reports.dart';
2-
import 'package:sj_manager/domain/entities/simulation/flow/simple_rating.dart';
1+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/reports/jumper_reports.dart';
2+
import 'package:sj_manager/core/career_mode/simple_rating.dart';
33

44
class TrainingReportCreator {
55
TrainingReportCreator({

‎lib/utilities/algorithms/reports/training_progress_report/weekly_jumper_training_progress_report_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/reports/training_progress_report/weekly_jumper_training_progress_report_creator.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/utilities/algorithms/reports/training_progress_report/training_report_creator.dart';
2-
import 'package:sj_manager/domain/entities/simulation/jumper/reports/jumper_reports.dart';
3-
import 'package:sj_manager/domain/entities/simulation/flow/simple_rating.dart';
1+
import 'package:sj_manager/core/career_mode/career_mode_utils/reports/training_progress_report/training_report_creator.dart';
2+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/reports/jumper_reports.dart';
3+
import 'package:sj_manager/core/career_mode/simple_rating.dart';
44

55
class WeeklyJumperTrainingProgressReportCreator {
66
WeeklyJumperTrainingProgressReportCreator({

‎lib/utilities/algorithms/start_form/default_start_form_algorithm.dart renamed to ‎lib/core/career_mode/career_mode_utils/start_form/default_start_form_algorithm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:sj_manager/utilities/algorithms/start_form/start_form_algorithm.dart';
2-
import 'package:sj_manager/utilities/utils/random/random.dart';
1+
import 'package:sj_manager/core/career_mode/career_mode_utils/start_form/start_form_algorithm.dart';
2+
import 'package:sj_manager/core/general_utils/random/random.dart';
33

44
class DefaultStartFormAlgorithm implements StartFormAlgorithm {
55
const DefaultStartFormAlgorithm({

‎lib/utilities/algorithms/start_form/start_form_algorithm.dart renamed to ‎lib/core/career_mode/career_mode_utils/start_form/start_form_algorithm.dart

File renamed without changes.

‎lib/utilities/algorithms/subteam_appointments/overall/default_overall_appointments_algorithm.dart renamed to ‎lib/core/career_mode/career_mode_utils/subteam_appointments/overall/default_overall_appointments_algorithm.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:sj_manager/utilities/algorithms/subteam_appointments/overall/overall_appointments_algorithm.dart';
1+
import 'package:sj_manager/core/career_mode/career_mode_utils/subteam_appointments/overall/overall_appointments_algorithm.dart';
22
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
3-
import 'package:sj_manager/core/classes/country_team/country_team.dart';
4-
import 'package:sj_manager/domain/entities/simulation/team/subteam.dart';
3+
import 'package:sj_manager/core/core_classes/country_team/country_team.dart';
4+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/team/specific_teams/subteam.dart';
55

66
class DefaultOverallAppointmentsAlgorithm implements OverallAppointmentsAlgorithm {
77
@override

‎lib/utilities/algorithms/subteam_appointments/overall/overall_appointments_algorithm.dart renamed to ‎lib/core/career_mode/career_mode_utils/subteam_appointments/overall/overall_appointments_algorithm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
2-
import 'package:sj_manager/core/classes/country_team/country_team.dart';
3-
import 'package:sj_manager/domain/entities/simulation/team/subteam.dart';
2+
import 'package:sj_manager/core/core_classes/country_team/country_team.dart';
3+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/team/specific_teams/subteam.dart';
44

55
abstract interface class OverallAppointmentsAlgorithm {
66
const OverallAppointmentsAlgorithm();

‎lib/utilities/algorithms/subteam_appointments/partial/default_partial_appointments_algorithm.dart renamed to ‎lib/core/career_mode/career_mode_utils/subteam_appointments/partial/default_partial_appointments_algorithm.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:sj_manager/domain/entities/simulation/psyche/level_of_consciousness.dart';
2-
import 'package:sj_manager/utilities/algorithms/subteam_appointments/partial/partial_appointments_algorithm.dart';
3-
import 'package:sj_manager/domain/entities/simulation/jumper/simulation_jumper.dart';
4-
import 'package:sj_manager/utilities/utils/random/random.dart';
1+
import 'package:sj_manager/core/psyche/level_of_consciousness.dart';
2+
import 'package:sj_manager/core/career_mode/career_mode_utils/subteam_appointments/partial/partial_appointments_algorithm.dart';
3+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/simulation_jumper.dart';
4+
import 'package:sj_manager/core/general_utils/random/random.dart';
55

66
class DefaultPartialAppointmentsAlgorithm implements PartialAppointmentsAlgorithm {
77
const DefaultPartialAppointmentsAlgorithm();

‎lib/utilities/algorithms/subteam_appointments/partial/partial_appointments_algorithm.dart renamed to ‎lib/core/career_mode/career_mode_utils/subteam_appointments/partial/partial_appointments_algorithm.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:sj_manager/domain/entities/simulation/jumper/simulation_jumper.dart';
1+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/simulation_jumper.dart';
22

33
abstract interface class PartialAppointmentsAlgorithm {
44
const PartialAppointmentsAlgorithm();

‎lib/utilities/utils/team_preview_creator/default_team_preview_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/team_preview_creator/default_team_preview_creator.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import 'package:sj_manager/data/models/game_variant/game_variant.dart';
2-
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
1+
import 'package:sj_manager/core/core_classes/hill/hill.dart';
2+
import 'package:sj_manager/core/general_utils/country_mixin_utils.dart';
33
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
4-
import 'package:sj_manager/core/classes/jumps/simple_jump_model.dart';
5-
import 'package:sj_manager/features/game_variants/data/models/game_variant_database.dart/sex.dart';
6-
import 'package:sj_manager/core/classes/country_team/country_team.dart';
7-
import 'package:sj_manager/utilities/utils/db_items.dart';
8-
import 'package:sj_manager/utilities/utils/team_preview_creator/team_preview_creator.dart';
4+
import 'package:sj_manager/core/core_classes/jumps/simple_jump_model.dart';
5+
import 'package:sj_manager/core/core_classes/sex.dart';
6+
import 'package:sj_manager/core/core_classes/country_team/country_team.dart';
7+
import 'package:sj_manager/features/game_variants/domain/entities/game_variant.dart';
8+
import 'package:sj_manager/core/career_mode/career_mode_utils/team_preview_creator/team_preview_creator.dart';
99

1010
class DefaultCountryTeamPreviewCreator extends TeamPreviewCreator<CountryTeam> {
1111
const DefaultCountryTeamPreviewCreator({

‎lib/utilities/utils/team_preview_creator/team_preview_creator.dart renamed to ‎lib/core/career_mode/career_mode_utils/team_preview_creator/team_preview_creator.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
1+
import 'package:sj_manager/core/core_classes/hill/hill.dart';
22
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
3-
import 'package:sj_manager/core/classes/jumps/simple_jump_model.dart';
4-
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
3+
import 'package:sj_manager/core/core_classes/jumps/simple_jump_model.dart';
4+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/team/team.dart';
55

66
abstract class TeamPreviewCreator<T extends Team> {
77
const TeamPreviewCreator();

‎lib/utilities/utils/training.dart renamed to ‎lib/core/career_mode/career_mode_utils/training/training.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:sj_manager/domain/entities/simulation/flow/training/jumper_training_config.dart';
1+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/training/jumper_training_config.dart';
22

33
double sjmCalculateAvgTrainingBalance(Map<JumperTrainingCategory, double> balance) {
44
final avgBalance = (balance[JumperTrainingCategory.takeoff]! * 27.5 +

‎lib/utilities/algorithms/training_engine/jumper_training_engine.dart renamed to ‎lib/core/career_mode/career_mode_utils/training/training_engine/jumper_training_engine.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import 'dart:math';
22

3-
import 'package:sj_manager/domain/entities/simulation/flow/training/jumper_training_config.dart';
4-
import 'package:sj_manager/utilities/algorithms/training_engine/jumper_training_engine_settings.dart';
5-
import 'package:sj_manager/utilities/algorithms/training_engine/jumper_training_result.dart';
6-
import 'package:sj_manager/domain/entities/simulation/jumper/simulation_jumper.dart';
7-
import 'package:sj_manager/utilities/utils/random/random.dart';
8-
import 'package:sj_manager/utilities/utils/training.dart';
3+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/training/jumper_training_config.dart';
4+
import 'package:sj_manager/core/career_mode/career_mode_utils/training/training_engine/jumper_training_engine_settings.dart';
5+
import 'package:sj_manager/core/career_mode/career_mode_utils/training/training_engine/jumper_training_result.dart';
6+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/jumper/simulation_jumper.dart';
7+
import 'package:sj_manager/core/general_utils/random/random.dart';
8+
import 'package:sj_manager/core/career_mode/career_mode_utils/training/training.dart';
99

1010
class JumperTrainingEngine {
1111
JumperTrainingEngine({

‎lib/utilities/algorithms/training_engine/jumper_training_engine_settings.dart renamed to ‎lib/core/career_mode/career_mode_utils/training/training_engine/jumper_training_engine_settings.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:sj_manager/utilities/json/json_types.dart';
2-
import 'package:sj_manager/domain/entities/simulation/psyche/level_of_consciousness.dart';
1+
import 'package:sj_manager/core/general_utils/json/json_types.dart';
2+
import 'package:sj_manager/core/psyche/level_of_consciousness.dart';
33

44
class JumperTrainingEngineSettings {
55
const JumperTrainingEngineSettings({

‎lib/utilities/algorithms/training_engine/jumper_training_result.dart renamed to ‎lib/core/career_mode/career_mode_utils/training/training_engine/jumper_training_result.dart

File renamed without changes.

‎lib/domain/entities/simulation/flow/simple_rating.dart renamed to ‎lib/core/career_mode/simple_rating.dart

File renamed without changes.

‎lib/core/constants/date_constants.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
const daysInYear = 365.242199;

‎lib/core/classes/country/country.dart renamed to ‎lib/core/core_classes/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/utilities/json/json_types.dart';
6-
import 'package:sj_manager/utilities/utils/multilingual_string.dart';
5+
import 'package:sj_manager/core/general_utils/json/json_types.dart';
6+
import 'package:sj_manager/core/general_utils/multilingual_string.dart';
77

88
part 'country.g.dart';
99

‎lib/core/classes/country/country.g.dart renamed to ‎lib/core/core_classes/country/country.g.dart

File renamed without changes.

‎lib/core/classes/country_team/country_team.dart renamed to ‎lib/core/core_classes/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/core/classes/country/country.dart';
2-
import 'package:sj_manager/features/game_variants/data/models/game_variant_database.dart/sex.dart';
3-
import 'package:sj_manager/core/classes/country_team/country_team_facts_model.dart';
4-
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
1+
import 'package:sj_manager/core/core_classes/country/country.dart';
2+
import 'package:sj_manager/core/core_classes/sex.dart';
3+
import 'package:sj_manager/core/core_classes/country_team/country_team_facts_model.dart';
4+
import 'package:sj_manager/features/simulations/domain/entities/simulation/database/team/team.dart';
55

66
class CountryTeam extends Team {
77
const CountryTeam({

‎lib/core/classes/country_team/country_team_facts.g.dart renamed to ‎lib/core/core_classes/country_team/country_team_facts.g.dart

File renamed without changes.

0 commit comments

Comments
 (0)