Skip to content

Commit 80db699

Browse files
SiekamCebuleSiekamCebule
committed
Fix "appropiate" type
1 parent 246b885 commit 80db699

File tree

12 files changed

+27
-29
lines changed

12 files changed

+27
-29
lines changed

‎lib/models/db/event_series/competition/calendar_records/calendar_main_competition_records_to_calendar.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ class CalendarMainCompetitionRecordsToCalendarConverter
2323
List<Competition> convert(List<CalendarMainCompetitionRecord> highLevelCalendar) {
2424
_highLevelCalendar = highLevelCalendar;
2525
_competitionsWhichShouldMoveBackIfHaveTeamCompBehind = {};
26-
_createLowCalendarAndAppropiatelyMarkCompetitions();
26+
_createLowCalendarAndAppropriatelyMarkCompetitions();
2727
_moveAppropriateCompetitionsBehindTeamComps();
2828
_addDayForTrainingsAndTrialRoundsAfterCompetitionOrQualificationsIfSameDay();
2929
return _lowLevelCalendar;
3030
}
3131

32-
void _createLowCalendarAndAppropiatelyMarkCompetitions() {
32+
void _createLowCalendarAndAppropriatelyMarkCompetitions() {
3333
_lowLevelCalendar = _highLevelCalendar.expand((highLevelComp) {
3434
final rawComps = highLevelComp.createRawCompetitions();
3535
_maybeMarkCompetitionItShouldMoveBehindTeamComp(

‎lib/models/db/jumper/jumper.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class Jumper with EquatableMixin {
3838
final JumperSkills skills;
3939

4040
String nameAndSurname({bool capitalizeSurname = false, bool reverse = false}) {
41-
var appropiateSurname = surname;
41+
var appropriateSurname = surname;
4242
if (capitalizeSurname) {
43-
appropiateSurname = appropiateSurname.toUpperCase();
43+
appropriateSurname = appropriateSurname.toUpperCase();
4444
}
45-
return reverse ? '$appropiateSurname $name ' : '$name $appropiateSurname';
45+
return reverse ? '$appropriateSurname $name ' : '$name $appropriateSurname';
4646
}
4747

4848
static Jumper fromJson(Json json, {required JsonCountryLoader countryLoader}) {

‎lib/ui/reusable_widgets/animations/animated_visibility.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class _AnimatedVisibilityState extends State<AnimatedVisibility>
4242
_shouldShowVisibility = false;
4343
}
4444
});
45-
_animateInAppropiateDirection();
45+
_animateInAppropriateDirection();
4646

4747
super.initState();
4848
}
@@ -56,12 +56,12 @@ class _AnimatedVisibilityState extends State<AnimatedVisibility>
5656
@override
5757
void didUpdateWidget(covariant AnimatedVisibility oldWidget) {
5858
if (oldWidget.visible != widget.visible) {
59-
_animateInAppropiateDirection();
59+
_animateInAppropriateDirection();
6060
}
6161
super.didUpdateWidget(oldWidget);
6262
}
6363

64-
Future<void> _animateInAppropiateDirection() async {
64+
Future<void> _animateInAppropriateDirection() async {
6565
if (widget.visible) {
6666
_controller.forward();
6767
} else {

‎lib/ui/screens/database_editor/database_editor_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import 'package:sj_manager/repositories/generic/value_repo.dart';
3434
import 'package:sj_manager/ui/assets/icons.dart';
3535
import 'package:sj_manager/ui/database_item_editors/fields/my_dropdown_field.dart';
3636
import 'package:sj_manager/ui/database_item_editors/hill_editor.dart';
37+
import 'package:sj_manager/ui/database_item_editors/jumper_editor.dart';
3738
import 'package:sj_manager/ui/responsiveness/responsive_builder.dart';
3839
import 'package:sj_manager/ui/responsiveness/ui_constants.dart';
3940
import 'package:sj_manager/ui/reusable_widgets/animations/animated_visibility.dart';
@@ -43,16 +44,15 @@ import 'package:sj_manager/ui/reusable_widgets/menu_entries/predefined_reusable_
4344
import 'package:sj_manager/ui/screens/database_editor/large/dialogs/database_editor_unsaved_changes_dialog.dart';
4445
import 'package:sj_manager/ui/screens/database_editor/large/dialogs/database_successfully_saved_dialog.dart';
4546
import 'package:sj_manager/ui/screens/database_editor/large/dialogs/selected_db_is_not_valid_dialog.dart';
46-
import 'package:sj_manager/ui/screens/database_editor/large/widgets/appropiate_db_item_list_tile.dart';
47-
import 'package:sj_manager/ui/database_item_editors/jumper_editor.dart';
47+
import 'package:sj_manager/ui/screens/database_editor/large/widgets/appropriate_db_item_list_tile.dart';
4848
import 'package:sj_manager/ui/screens/database_editor/large/widgets/database_items_list.dart';
4949
import 'package:sj_manager/utils/file_system.dart';
5050
import 'package:sj_manager/utils/filtering_countries.dart';
5151
import 'package:sj_manager/utils/single_where_type.dart';
5252

5353
part 'large/__large.dart';
5454
part 'large/widgets/__body.dart';
55-
part 'large/widgets/__appropiate_item_editor.dart';
55+
part 'large/widgets/__appropriate_item_editor.dart';
5656
part 'large/widgets/__app_bar.dart';
5757
part 'large/widgets/__bottom_app_bar.dart';
5858
part 'large/widgets/filters/__for_jumpers.dart';

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ class _LargeState extends State<_Large> with SingleTickerProviderStateMixin {
128128

129129
@override
130130
Widget build(BuildContext context) {
131-
print('build()');
132131
return ValueListenableBuilder(
133132
valueListenable: _initialized,
134133
builder: (context, prepared, child) {
@@ -159,7 +158,6 @@ class _LargeState extends State<_Large> with SingleTickerProviderStateMixin {
159158
context.watch<ChangeStatusCubit>();
160159
context.watch<DatabaseItemsTypeCubit>();
161160
context.watch<LocalDbFilteredItemsCubit>();
162-
print('Builder rebuild');
163161
return RepositoryProvider.value(
164162
value: _currentCountries,
165163
child: PopScope(

‎lib/ui/screens/database_editor/large/widgets/__animated_editor.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class _AnimatedEditor extends StatelessWidget {
55
this.editorKey,
66
});
77

8-
final GlobalKey<_AppropiateItemEditorState>? editorKey;
8+
final GlobalKey<_AppropriateItemEditorState>? editorKey;
99

1010
@override
1111
Widget build(BuildContext context) {
@@ -32,7 +32,7 @@ class _AnimatedEditor extends StatelessWidget {
3232
duration: Durations.medium1,
3333
curve: Curves.easeIn,
3434
visible: editorShouldBeVisible,
35-
child: _AppropiateItemEditor(
35+
child: _AppropriateItemEditor(
3636
key: editorKey,
3737
itemType: itemsType,
3838
onChange: (changedItem) async {

‎lib/ui/screens/database_editor/large/widgets/__appropiate_item_editor.dart renamed to ‎lib/ui/screens/database_editor/large/widgets/__appropriate_item_editor.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
part of '../../database_editor_screen.dart';
22

3-
class _AppropiateItemEditor extends StatefulWidget {
4-
const _AppropiateItemEditor({
3+
class _AppropriateItemEditor extends StatefulWidget {
4+
const _AppropriateItemEditor({
55
super.key,
66
required this.itemType,
77
required this.onChange,
@@ -11,10 +11,10 @@ class _AppropiateItemEditor extends StatefulWidget {
1111
final Function(Object?) onChange;
1212

1313
@override
14-
State<_AppropiateItemEditor> createState() => _AppropiateItemEditorState();
14+
State<_AppropriateItemEditor> createState() => _AppropriateItemEditorState();
1515
}
1616

17-
class _AppropiateItemEditorState extends State<_AppropiateItemEditor> {
17+
class _AppropriateItemEditorState extends State<_AppropriateItemEditor> {
1818
final _jumperEditorKey = GlobalKey<JumperEditorState>();
1919
final _hillEditorKey = GlobalKey<HillEditorState>();
2020

‎lib/ui/screens/database_editor/large/widgets/__body.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class _Body extends StatefulWidget {
88
}
99

1010
class _BodyState extends State<_Body> {
11-
final _editorKey = GlobalKey<_AppropiateItemEditorState>();
11+
final _editorKey = GlobalKey<_AppropriateItemEditorState>();
1212
late final StreamSubscription _selectionChangesSubscription;
1313

1414
@override

‎lib/ui/screens/database_editor/large/widgets/__items_list.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class _ItemsListState extends State<_ItemsList> {
4343
},
4444
length: filteredItemsByType.length,
4545
itemBuilder: (context, index) {
46-
return AppropiateDbItemListTile(
46+
return AppropriateDbItemListTile(
4747
key: ValueKey(index),
4848
reorderable: listShouldBeReorderable,
4949
itemType: itemsType,

‎lib/ui/screens/database_editor/large/widgets/appropiate_db_item_list_tile.dart renamed to ‎lib/ui/screens/database_editor/large/widgets/appropriate_db_item_list_tile.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'package:sj_manager/enums/db_editable_item_type.dart';
33
import 'package:sj_manager/ui/reusable_widgets/database_item_tiles/hill_info_list_tile.dart';
44
import 'package:sj_manager/ui/reusable_widgets/database_item_tiles/jumper_info_list_tile.dart';
55

6-
class AppropiateDbItemListTile extends StatelessWidget {
7-
const AppropiateDbItemListTile({
6+
class AppropriateDbItemListTile extends StatelessWidget {
7+
const AppropriateDbItemListTile({
88
super.key,
99
required this.itemType,
1010
required this.item,

‎lib/ui/screens/main_screen/large/simulation_wizard/widgets/__header.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class _Header extends StatelessWidget {
1515
SimulationWizardNavigationState>(
1616
builder: (context, state) {
1717
return Text(
18-
_appropiateTitleText(
18+
_appropriateTitleText(
1919
context,
2020
(state as InitializedSimulationWizardNavigationState)
2121
.currentScreen),
@@ -42,7 +42,7 @@ class _Header extends StatelessWidget {
4242
);
4343
}
4444

45-
String _appropiateTitleText(BuildContext context, SimulationWizardScreen screen) {
45+
String _appropriateTitleText(BuildContext context, SimulationWizardScreen screen) {
4646
return switch (screen) {
4747
SimulationWizardScreen.mode => "Wybierz tryb rozgrywki",
4848
SimulationWizardScreen.calendars => "Wybierz kalendarze",

‎test/ui/database_editor/database_editor_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import 'package:sj_manager/ui/providers/locale_notifier.dart';
2828
import 'package:sj_manager/ui/reusable_widgets/animations/animated_visibility.dart';
2929
import 'package:sj_manager/ui/screens/database_editor/database_editor_screen.dart';
3030
import 'package:flutter/material.dart';
31-
import 'package:sj_manager/ui/screens/database_editor/large/widgets/appropiate_db_item_list_tile.dart';
31+
import 'package:sj_manager/ui/screens/database_editor/large/widgets/appropriate_db_item_list_tile.dart';
3232
import 'package:sj_manager/ui/screens/database_editor/large/widgets/database_items_list.dart';
3333
import 'package:sj_manager/ui/theme/app_color_scheme_repo.dart';
3434
import 'package:sj_manager/ui/theme/app_theme_brightness_repo.dart';
@@ -183,7 +183,7 @@ void main() {
183183
);
184184
});
185185

186-
testWidgets('Appropiate displaying', (tester) async {
186+
testWidgets('Appropriate displaying', (tester) async {
187187
await tester.pumpWidget(appWidget);
188188
await tester.pumpAndSettle();
189189

@@ -217,10 +217,10 @@ void main() {
217217

218218
final secondTile = find.descendant(
219219
of: find.byType(DatabaseItemsList), matching: find.byKey(const ValueKey(1)));
220-
expect(tester.widget<AppropiateDbItemListTile>(secondTile).selected, false);
220+
expect(tester.widget<AppropriateDbItemListTile>(secondTile).selected, false);
221221
await tester.tap(secondTile);
222222
await tester.pumpAndSettle();
223-
expect(tester.widget<AppropiateDbItemListTile>(secondTile).selected, true);
223+
expect(tester.widget<AppropriateDbItemListTile>(secondTile).selected, true);
224224
});
225225

226226
testWidgets('Editing hills and changing between them', (tester) async {

0 commit comments

Comments
 (0)