Skip to content

Offline gym log for Android. No account, no ads, no internet.

Allow meals up to a week ahead

InlitX887b13377d69
diff --git a/lib/screens/nutrition/food.dart b/lib/screens/nutrition/food.dart
index b56f1e0..29c3003 100644
--- a/lib/screens/nutrition/food.dart
+++ b/lib/screens/nutrition/food.dart
@@ -1098,7 +1098,7 @@ class _EntrySheetState extends State<_EntrySheet> {
context: context,
initialDate: _day,
firstDate: DateTime(now.year - 5),
- lastDate: DateTime(now.year, now.month, now.day),
+ lastDate: DateTime(now.year, now.month, now.day + NutritionState.kNutritionDaysAhead),
);
if (picked != null && mounted) setState(() => _day = DateTime(picked.year, picked.month, picked.day));
}
diff --git a/lib/screens/nutrition_screen.dart b/lib/screens/nutrition_screen.dart
index 348a3d3..ff8edc2 100644
--- a/lib/screens/nutrition_screen.dart
+++ b/lib/screens/nutrition_screen.dart
@@ -312,12 +312,13 @@ class _WeekStrip extends StatelessWidget {
final now = DateTime.now();
final today = DateTime(now.year, now.month, now.day);
final days = fit.nutritionWeek;
+ final last = shiftDays(today, NutritionState.kNutritionDaysAhead);
return GestureDetector(
behavior: HitTestBehavior.opaque,
onHorizontalDragEnd: (d) {
final v = d.primaryVelocity ?? 0;
if (v > 200) fit.setNutritionDay(shiftDays(fit.nutritionDay, -7));
- if (v < -200 && days.last.isBefore(today)) fit.setNutritionDay(shiftDays(fit.nutritionDay, 7));
+ if (v < -200 && days.last.isBefore(last)) fit.setNutritionDay(shiftDays(fit.nutritionDay, 7));
},
child: Row(
children: [
@@ -325,7 +326,7 @@ class _WeekStrip extends StatelessWidget {
Expanded(
child: GestureDetector(
behavior: HitTestBehavior.opaque,
- onTap: d.isAfter(today) ? null : () => fit.setNutritionDay(d),
+ onTap: d.isAfter(last) ? null : () => fit.setNutritionDay(d),
child: Column(children: [
SizedBox(
height: 17,
diff --git a/lib/state/nutrition_state.dart b/lib/state/nutrition_state.dart
index 2fe6bf6..6a89e63 100644
--- a/lib/state/nutrition_state.dart
+++ b/lib/state/nutrition_state.dart
@@ -1302,10 +1302,13 @@ mixin NutritionState on FitCore, ToolsState, StatsState {
bool get hasNutritionData =>
foodLog.isNotEmpty || waterLog.isNotEmpty || foods.isNotEmpty || recipes.isNotEmpty || batches.isNotEmpty;
+ static const kNutritionDaysAhead = 7;
+
void setNutritionDay(DateTime day) {
final key = _dayKey(day);
final today = _dayKey(DateTime.now());
- nutritionDay = key.isAfter(today) ? today : key;
+ final last = shiftDays(today, kNutritionDaysAhead);
+ nutritionDay = key.isAfter(last) ? last : key;
_nutritionSetOn = today;
notifyListeners();
}
diff --git a/test/nutrition_test.dart b/test/nutrition_test.dart
index e171ae1..ecfe2e8 100644
--- a/test/nutrition_test.dart
+++ b/test/nutrition_test.dart
@@ -62,10 +62,10 @@ void main() {
expect(fit.totalOn(fit.nutritionDay).kcal, 300);
});
- test('no se puede ir a un día futuro', () {
- fit.setNutritionDay(shiftDays(DateTime.now(), 3));
+ test('no se puede ir más allá de una semana', () {
+ fit.setNutritionDay(shiftDays(DateTime.now(), 10));
final now = DateTime.now();
- expect(fit.nutritionDay, DateTime(now.year, now.month, now.day));
+ expect(fit.nutritionDay, DateTime(now.year, now.month, now.day + 7));
});
test('borrar un alimento no borra lo que ya se apuntó', () {