Skip to content

Add "warmup" to list of slot entry types #1132

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.

Sign up for GitHub

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

Open
rolandgeider wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add "warmup" to list of slot entry types #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
"slotEntryTypeNormal": "Normal",
"slotEntryTypeDropset": "Dropset",
"slotEntryTypeMyo": "Myo",
"slotEntryTypeWarmup": "Warmup",
"slotEntryTypePartial": "Partial",
"slotEntryTypeForced": "Forced",
"slotEntryTypeTut": "Time under Tension",
Expand Down
1 change: 1 addition & 0 deletions lib/models/workouts/set_config_data.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions lib/models/workouts/slot_entry.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of wger Workout Manager <https://github.com/wger-project>.
* Copyright (C) 2020, 2021 wger Team
* Copyright (c) 2020 - 2026 wger Team
*
* wger Workout Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Expand All @@ -27,13 +27,15 @@ import 'package:wger/models/workouts/weight_unit.dart';

part 'slot_entry.g.dart';

enum SlotEntryType { normal, dropset, myo, partial, forced, tut, iso, jump }
enum SlotEntryType { normal, warmup, dropset, myo, partial, forced, tut, iso, jump }

extension SlotEntryTypeExtension on SlotEntryType {
String i18Label(AppLocalizations i18n) {
switch (this) {
case SlotEntryType.normal:
return i18n.slotEntryTypeNormal;
case SlotEntryType.warmup:
return i18n.slotEntryTypeWarmup;
case SlotEntryType.dropset:
return i18n.slotEntryTypeDropset;
case SlotEntryType.myo:
Expand Down
1 change: 1 addition & 0 deletions lib/models/workouts/slot_entry.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions test/core/validators_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,17 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
)
as String);

@override
String get slotEntryTypeWarmup =>
(super.noSuchMethod(
Invocation.getter(#slotEntryTypeWarmup),
returnValue: _i3.dummyValue<String>(
this,
Invocation.getter(#slotEntryTypeWarmup),
),
)
as String);

@override
String get slotEntryTypePartial =>
(super.noSuchMethod(
Expand Down Expand Up @@ -3832,6 +3843,28 @@ class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
)
as String);

@override
String get productNotFoundOpenFoodFacts =>
(super.noSuchMethod(
Invocation.getter(#productNotFoundOpenFoodFacts),
returnValue: _i3.dummyValue<String>(
this,
Invocation.getter(#productNotFoundOpenFoodFacts),
),
)
as String);

@override
String get addToOpenFoodFacts =>
(super.noSuchMethod(
Invocation.getter(#addToOpenFoodFacts),
returnValue: _i3.dummyValue<String>(
this,
Invocation.getter(#addToOpenFoodFacts),
),
)
as String);

@override
String exerciseNr(String? nr) =>
(super.noSuchMethod(
Expand Down