wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always set the values of the selected muscles and categories

Browse Source 
Otherwise it's not possible to remove all selections after having clicked on one
This commit is contained in:
Roland Geider
2022-03-12 23:25:23 +01:00
parent 633e7b76d4
commit 4241750708
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/screens/add_exercise_screen.dart
View File

@@ -156,14 +156,10 @@ class _BasicStepContent extends StatelessWidget {
items: equipment,
initialItems: addExerciseProvider.equipment,
onChange: (dynamic entries) {
if (entries != null && entries.isNotEmpty) {
addExerciseProvider.equipment = entries.cast<Equipment>();
}
addExerciseProvider.equipment = entries.cast<Equipment>();
},
onSaved: (dynamic entries) {
if (entries != null && entries.isNotEmpty) {
addExerciseProvider.equipment = entries.cast<Equipment>();
}
addExerciseProvider.equipment = entries.cast<Equipment>();
},
),
AddExerciseMultiselectButton<Muscle>(
@@ -171,30 +167,23 @@ class _BasicStepContent extends StatelessWidget {
items: muscles,
initialItems: addExerciseProvider.primaryMuscles,
onChange: (dynamic muscles) {
if (muscles != null && muscles.isNotEmpty) {
addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
}
addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
},
onSaved: (dynamic muscles) {
if (muscles != null && muscles.isNotEmpty) {
addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
}
addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
},
),
AddExerciseMultiselectButton<Muscle>(
title: AppLocalizations.of(context).musclesSecondary,
items: muscles,
initialItems: addExerciseProvider.secondaryMuscles,
onChange: (dynamic muscles) {
if (muscles != null && muscles.isNotEmpty) {
addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
}
},
onSaved: (dynamic muscles) {
if (muscles != null && muscles.isNotEmpty) {
addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
}
}),
title: AppLocalizations.of(context).musclesSecondary,
items: muscles,
initialItems: addExerciseProvider.secondaryMuscles,
onChange: (dynamic muscles) {
addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
},
onSaved: (dynamic muscles) {
addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
},
),
MuscleRowWidget(
muscles: addExerciseProvider.primaryMuscles,
musclesSecondary: addExerciseProvider.secondaryMuscles,

10
lib/widgets/add_exercise/add_exercise_multiselect_button.dart
View File

@@ -32,12 +32,10 @@ class _AddExerciseMultiselectButtonState<T> extends State<AddExerciseMultiselect
onSaved: widget.onSaved,
items: widget.items.map((item) => MultiSelectItem<T>(item, item.name)).toList(),
onConfirm: (value) {
if (value.isNotEmpty) {
setState(() {
_selectedItems = value.cast<T>();
widget.onChange(_selectedItems);
});
}
setState(() {
_selectedItems = value.cast<T>();
widget.onChange(_selectedItems);
});
},
chipDisplay: MultiSelectChipDisplay(
//scroll: true,