Add a basic support for both sexes in team screen (also refactor country model - add team model)

Author: SiekamCebule

jumpers_female.json

@@ -1 +1 @@
-[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":1,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":37,"name":"Kamil","surname":"Stoch","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":31,"name":"Stefan","surname":"Kraft","country":"at","sex":1,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":37,"name":"Dawid","surname":"Kubacki","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]
+[{"age":35,"name":"Philipp","surname":"Aschenwald","country":"at","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":72.0,"landingStyle":-1,"jumpsConsistency":-1}},{"age":32,"name":"Daniel","surname":"Huber","country":"at","sex":1,"skills":{"qualityOnSmallerHills":81.24,"qualityOnLargerHills":88.0,"landingStyle":1,"jumpsConsistency":1}},{"age":37,"name":"Kamil","surname":"Stoch","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":82.0,"qualityOnLargerHills":83.0,"landingStyle":3,"jumpsConsistency":2}},{"age":25,"name":"Silje","surname":"Opseth","country":"no","sex":1,"skills":{"qualityOnSmallerHills":87.0,"qualityOnLargerHills":94.0,"landingStyle":0,"jumpsConsistency":0}},{"age":31,"name":"Stefan","surname":"Kraft","country":"at","sex":1,"skills":{"qualityOnSmallerHills":88.0,"qualityOnLargerHills":95.0,"landingStyle":3,"jumpsConsistency":1}},{"age":37,"name":"Dawid","surname":"Kubacki","country":"pl","sex":1,"skills":{"qualityOnSmallerHills":91.25,"qualityOnLargerHills":81.0,"landingStyle":1,"jumpsConsistency":0}}]

lib/bloc/database_editing/copied_local_db_cubit.dart

@@ -136,4 +136,8 @@ class CopiedLocalDbCubit extends Cubit<LocalDbRepo?> {
       fromJson: parameters.fromJson,
     );
   }
+
+  void dispose() {
+    originalDb.dispose();
+  }
 }

lib/models/db/local_db_repo.dart

@@ -138,6 +138,7 @@ class LocalDbRepo with EquatableMixin {
       ];
 
   void dispose() {
+    print('DISPOZE');
     maleJumpers.dispose();
     femaleJumpers.dispose();
     hills.dispose();

lib/models/simulations/simulation_wizard_options_repo.dart

@@ -1,6 +1,6 @@
 import 'package:rxdart/rxdart.dart';
-import 'package:sj_manager/models/db/country/country.dart';
 import 'package:sj_manager/models/simulations/enums.dart';
+import 'package:sj_manager/models/simulations/team.dart';
 
 class SimulationWizardOptionsRepo {
   SimulationWizardOptionsRepo();
@@ -12,10 +12,10 @@ class SimulationWizardOptionsRepo {
     _modeSubject.add(value);
   }
 
-  final _countrySubject = BehaviorSubject<Country?>.seeded(null);
-  ValueStream<Country?> get countryStream => _countrySubject.stream;
-  Country? get country => countryStream.value;
-  set country(Country? value) {
-    _countrySubject.add(value);
+  final _teamSubject = BehaviorSubject<CountryTeam?>.seeded(null);
+  ValueStream<CountryTeam?> get teamStream => _teamSubject.stream;
+  CountryTeam? get team => teamStream.value;
+  set team(CountryTeam? value) {
+    _teamSubject.add(value);
   }
 }

lib/models/simulations/team.dart

@@ -0,0 +1,30 @@
+import 'package:equatable/equatable.dart';
+import 'package:sj_manager/models/db/country/country.dart';
+import 'package:sj_manager/models/db/sex.dart';
+
+abstract class Team {
+  const Team();
+}
+
+class CountryTeam extends Team with EquatableMixin {
+  const CountryTeam({
+    required this.sex,
+    required this.country,
+  });
+
+  final Sex sex;
+  final Country country;
+
+  CountryTeam copyWith({
+    Sex? sex,
+    Country? country,
+  }) {
+    return CountryTeam(
+      sex: sex ?? this.sex,
+      country: country ?? this.country,
+    );
+  }
+
+  @override
+  List<Object?> get props => [sex, country];
+}

lib/repositories/generic/db_items_repo.dart

@@ -1,7 +1,7 @@
 import 'package:rxdart/rxdart.dart';
 import 'package:sj_manager/repositories/generic/value_repo.dart';
 
-abstract class DbItemsRepo<T> extends ValueRepo<List<T>> {
+class DbItemsRepo<T> extends ValueRepo<List<T>> {
   DbItemsRepo({super.initial});
 
   @override

lib/repositories/generic/editable_db_items_repo.dart

@@ -57,10 +57,6 @@ class EditableDbItemsRepo<T> extends DbItemsRepo<T> {
     _subject.add(_items);
   }
 
-  void dispose() {
-    _subject.close();
-  }
-
   @override
   List<T> get lastItems => items.value;
   @override

lib/repositories/generic/value_repo.dart

@@ -14,6 +14,7 @@ class ValueRepo<T> {
   }
 
   void dispose() {
+    print('VALUEREPO DISPOSE');
     _subject.close();
   }
 

lib/ui/screens/database_editor/large/__large.dart

@@ -75,6 +75,7 @@ class _LargeState extends State<_Large> with SingleTickerProviderStateMixin {
   void dispose() {
     _bodyAnimationController.dispose();
     _copiedDbCubit.close();
+    _copiedDbCubit.dispose();
     _dbChangeStatusCubit.close();
     _itemsTypeCubit.close();
     _selectedIndexesRepo.close();