Merge pull request #231 from EthanJoyce/ej/dev-0602-meal-overview

ui: Add Carbs, Fat, Protein, overview to each meal

Author: jordan-lee-code

lib/core/data/data_source/config_data_source.dart

@@ -100,6 +100,13 @@ class ConfigDataSource {
     config?.save();
   }
 
+  Future<void> setConfigShowMealMacros(bool show) async {
+    _log.fine('Updating config showMealMacros to $show');
+    final config = _configBox.get(_configKey);
+    config?.showMealMacros = show;
+    config?.save();
+  }
+
   Future<void> setNotificationsEnabled(bool enabled) async {
     _log.fine('Updating config notificationsEnabled to $enabled');
     final config = _configBox.get(_configKey);

lib/core/data/dbo/config_dbo.dart

@@ -36,6 +36,8 @@ class ConfigDBO extends HiveObject {
   int? notificationMinute;
   @HiveField(13)
   String? selectedLocale;
+  @HiveField(14)
+  bool? showMealMacros;
 
   ConfigDBO(
     this.hasAcceptedDisclaimer,
@@ -45,6 +47,7 @@ class ConfigDBO extends HiveObject {
     this.usesImperialUnits = false,
     this.userKcalAdjustment,
     this.showActivityTracking,
+    this.showMealMacros,
     this.notificationsEnabled,
     this.notificationHour,
     this.notificationMinute,

lib/core/data/dbo/config_dbo.g.dart

@@ -65,6 +65,10 @@ class ConfigRepository {
     _configDataSource.setConfigShowActivityTracking(show);
   }
 
+  Future<void> setConfigShowMealMacros(bool show) async {
+    _configDataSource.setConfigShowMealMacros(show);
+  }
+
   Future<void> setUserMacroPct(double carbs, double protein, double fat) async {
     _configDataSource.setConfigCarbGoalPct(carbs);
     _configDataSource.setConfigProteinGoalPct(protein);

lib/core/data/repository/config_repository.dart

@@ -13,6 +13,7 @@ class ConfigEntity extends Equatable {
   final double? userProteinGoalPct;
   final double? userFatGoalPct;
   final bool showActivityTracking;
+  final bool showMealMacros;
   final bool notificationsEnabled;
   final int notificationHour;
   final int notificationMinute;
@@ -29,6 +30,7 @@ class ConfigEntity extends Equatable {
     this.userProteinGoalPct,
     this.userFatGoalPct,
     this.showActivityTracking = true,
+    this.showMealMacros = true,
     this.notificationsEnabled = false,
     this.notificationHour = 8,
     this.notificationMinute = 0,
@@ -46,6 +48,7 @@ class ConfigEntity extends Equatable {
         userProteinGoalPct: dbo.userProteinGoalPct,
         userFatGoalPct: dbo.userFatGoalPct,
         showActivityTracking: dbo.showActivityTracking ?? true,
+        showMealMacros: dbo.showMealMacros ?? true,
         notificationsEnabled: dbo.notificationsEnabled ?? false,
         notificationHour: dbo.notificationHour ?? 8,
         notificationMinute: dbo.notificationMinute ?? 0,
@@ -63,6 +66,7 @@ class ConfigEntity extends Equatable {
         userProteinGoalPct,
         userFatGoalPct,
         showActivityTracking,
+        showMealMacros,
         notificationsEnabled,
         notificationHour,
         notificationMinute,

lib/core/domain/entity/config_entity.dart

@@ -48,6 +48,10 @@ class AddConfigUsecase {
     _configRepository.setConfigShowActivityTracking(show);
   }
 
+  Future<void> setConfigShowMealMacros(bool show) async {
+    _configRepository.setConfigShowMealMacros(show);
+  }
+
   Future<void> setNotificationsEnabled(bool enabled) async {
     _configRepository.setNotificationsEnabled(enabled);
   }

lib/core/domain/usecase/add_config_usecase.dart

@@ -70,6 +70,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
             context,
             state.trackedDayMap,
             state.usesImperialUnits,
+            state.showMealMacros,
           );
         }
         return const SizedBox();
@@ -93,6 +94,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
     BuildContext context,
     Map<String, TrackedDayEntity> trackedDaysMap,
     bool usesImperialUnits,
+    bool showMealMacros,
   ) {
     return ListView(
       children: [
@@ -128,6 +130,7 @@ class _DiaryPageState extends State<DiaryPage> with WidgetsBindingObserver {
                 onEditIntake: _onEditIntakeItem,
                 onEditActivity: _onEditActivityItem,
                 usesImperialUnits: usesImperialUnits,
+                showMealMacros: showMealMacros,
               );
             }
             return const SizedBox();

lib/features/diary/diary_page.dart

@@ -22,8 +22,9 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
     on<LoadDiaryYearEvent>((event, emit) async {
       emit(DiaryLoadingState());
 
-      final usesImperialUnits =
-          (await _getConfigUsecase.getConfig()).usesImperialUnits;
+      final config = await _getConfigUsecase.getConfig();
+      final usesImperialUnits = config.usesImperialUnits;
+      final showMealMacros = config.showMealMacros;
 
       currentDay = DateTime.now();
       // #292: Extended to match calendar range (5 years back)
@@ -39,7 +40,11 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
           trackedDay.day.toParsedDay(): trackedDay,
       };
 
-      emit(DiaryLoadedState(trackedDaysMap, usesImperialUnits));
+      emit(DiaryLoadedState(
+        trackedDaysMap,
+        usesImperialUnits,
+        showMealMacros: showMealMacros,
+      ));
     });
   }
 

lib/features/diary/presentation/bloc/diary_bloc.dart

@@ -17,9 +17,14 @@ class DiaryLoadingState extends DiaryState {
 class DiaryLoadedState extends DiaryState {
   final Map<String, TrackedDayEntity> trackedDayMap;
   final bool usesImperialUnits;
+  final bool showMealMacros;
 
-  const DiaryLoadedState(this.trackedDayMap, this.usesImperialUnits);
+  const DiaryLoadedState(
+    this.trackedDayMap,
+    this.usesImperialUnits, {
+    this.showMealMacros = true,
+  });
 
   @override
-  List<Object?> get props => [trackedDayMap, usesImperialUnits];
+  List<Object?> get props => [trackedDayMap, usesImperialUnits, showMealMacros];
 }

lib/features/diary/presentation/bloc/diary_state.dart

@@ -22,6 +22,7 @@ class DayInfoWidget extends StatelessWidget {
   final List<IntakeEntity> snackIntake;
 
   final bool usesImperialUnits;
+  final bool showMealMacros;
   final Function(IntakeEntity intake, TrackedDayEntity? trackedDayEntity)
       onDeleteIntake;
   final Function(
@@ -52,6 +53,7 @@ class DayInfoWidget extends StatelessWidget {
     required this.dinnerIntake,
     required this.snackIntake,
     required this.usesImperialUnits,
+    this.showMealMacros = true,
     required this.onDeleteIntake,
     required this.onDeleteActivity,
     required this.onCopyIntake,
@@ -165,6 +167,7 @@ class DayInfoWidget extends StatelessWidget {
                       ? null
                       : onCopyIntake,
               usesImperialUnits: usesImperialUnits,
+              showMealMacros: showMealMacros,
               trackedDayEntity: trackedDay,
             ),
             IntakeVerticalList(
@@ -177,6 +180,7 @@ class DayInfoWidget extends StatelessWidget {
               onItemLongPressedCallback: onIntakeItemLongPressed,
               onItemTappedCallback: onEditIntake,
               usesImperialUnits: usesImperialUnits,
+              showMealMacros: showMealMacros,
               onCopyIntakeCallback:
                   DateUtils.isSameDay(selectedDay, DateTime.now())
                       ? null
@@ -197,6 +201,7 @@ class DayInfoWidget extends StatelessWidget {
                       ? null
                       : onCopyIntake,
               usesImperialUnits: usesImperialUnits,
+              showMealMacros: showMealMacros,
             ),
             IntakeVerticalList(
               day: selectedDay,
@@ -208,6 +213,7 @@ class DayInfoWidget extends StatelessWidget {
               onItemLongPressedCallback: onIntakeItemLongPressed,
               onItemTappedCallback: onEditIntake,
               usesImperialUnits: usesImperialUnits,
+              showMealMacros: showMealMacros,
               onCopyIntakeCallback:
                   DateUtils.isSameDay(selectedDay, DateTime.now())
                       ? null