Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Username1548
2025-04-24 04:31:26 +07:00
755 changed files with 1803 additions and 132605 deletions

View File

@@ -19,23 +19,25 @@ class StatusDropDownWidget extends StatefulWidget {
class _StatusDropDownWidgetState extends State<StatusDropDownWidget> {
final List<String> dietStateTitles = [];
late final List<DietState> dietStates = DietState.values;
// late final List<DietState> dietStates = DietState.values;
@override
void didChangeDependencies() {
super.didChangeDependencies();
final s = S.of(context);
if (dietStateTitles.isEmpty) {
for (var elem in dietStates) {
switch (elem) {
case DietState.active:
dietStateTitles.add(s.active_diet_state);
case DietState.draft:
dietStateTitles.add(s.draft);
case DietState.personal:
dietStateTitles.add(s.personal_diet_state);
}
}
dietStateTitles.add(s.public_diet_state);
dietStateTitles.add(s.personal_diet_state);
// for (var elem in dietStates) {
// switch (elem) {
// case DietState.active:
// dietStateTitles.add(s.active_diet_state);
// case DietState.draft:
// dietStateTitles.add(s.draft);
// case DietState.personal:
// dietStateTitles.add(s.personal_diet_state);
// }
// }
}
}
@@ -55,14 +57,19 @@ class _StatusDropDownWidgetState extends State<StatusDropDownWidget> {
),
onChanged: (value) {
if (value != null) {
final index = dietStates.indexOf(value);
context.read<CreateDietCubit>().setDietState(value, index);
if (value == s.public_diet_state) {
context.read<CreateDietCubit>().setDietState(DietState.active);
} else {
context.read<CreateDietCubit>().setDietState(DietState.personal);
}
// final index = dietStates.indexOf(value);
// context.read<CreateDietCubit>().setDietState(value, index);
}
},
items: dietStateTitles
.mapIndexed(
(index, value) => DropdownMenuItem(
value: dietStates[index],
value: dietStateTitles[index],
child: Text(
dietStateTitles[index],
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
@@ -70,7 +77,7 @@ class _StatusDropDownWidgetState extends State<StatusDropDownWidget> {
),
)
.toList(),
value: state.dietStateIndex == null ? null : dietStates[state.dietStateIndex ?? 0],
value: state.dietState == DietState.active ? dietStateTitles[0] : state.dietState == DietState.personal ? dietStateTitles[1] : null,
),
if (state.dietStateError != null) ...[
const SizedBox(