Your commit message here

lib/models/cycle_entry.dart

@@ -1,4 +1,9 @@
 import 'package:hive/hive.dart';
+<<<<<<< HEAD
+=======
+import 'package:flutter/material.dart';
+import '../theme/app_theme.dart';
+>>>>>>> 6742220 (Your commit message here)
 
 part 'cycle_entry.g.dart';
 
@@ -111,6 +116,24 @@ class CycleEntry extends HiveObject {
   @HiveField(11)
   bool hasAcne;
   
+<<<<<<< HEAD
+=======
+  @HiveField(22)
+  bool hasLowerBackPain;
+  
+  @HiveField(23)
+  bool hasConstipation;
+  
+  @HiveField(24)
+  bool hasDiarrhea;
+  
+  @HiveField(25)
+  int? stressLevel; // 1-5
+  
+  @HiveField(26)
+  bool hasInsomnia;
+  
+>>>>>>> 6742220 (Your commit message here)
   @HiveField(12)
   double? basalBodyTemperature; // in Fahrenheit
   
@@ -154,6 +177,14 @@ class CycleEntry extends HiveObject {
     this.hasBreastTenderness = false,
     this.hasFatigue = false,
     this.hasAcne = false,
+<<<<<<< HEAD
+=======
+    this.hasLowerBackPain = false,
+    this.hasConstipation = false,
+    this.hasDiarrhea = false,
+    this.stressLevel,
+    this.hasInsomnia = false,
+>>>>>>> 6742220 (Your commit message here)
     this.basalBodyTemperature,
     this.cervicalMucus,
     this.ovulationTestPositive,
@@ -173,7 +204,16 @@ class CycleEntry extends HiveObject {
       hasBreastTenderness ||
       hasFatigue ||
       hasAcne ||
+<<<<<<< HEAD
       (crampIntensity != null && crampIntensity! > 0);
+=======
+      hasLowerBackPain ||
+      hasConstipation ||
+      hasDiarrhea ||
+      hasInsomnia ||
+      (crampIntensity != null && crampIntensity! > 0) ||
+      (stressLevel != null && stressLevel! > 1);
+>>>>>>> 6742220 (Your commit message here)
   
   /// Check if NFP data is logged
   bool get hasNFPData =>
@@ -189,7 +229,16 @@ class CycleEntry extends HiveObject {
     if (hasBreastTenderness) count++;
     if (hasFatigue) count++;
     if (hasAcne) count++;
+<<<<<<< HEAD
     if (crampIntensity != null && crampIntensity! > 0) count++;
+=======
+    if (hasLowerBackPain) count++;
+    if (hasConstipation) count++;
+    if (hasDiarrhea) count++;
+    if (hasInsomnia) count++;
+    if (crampIntensity != null && crampIntensity! > 0) count++;
+    if (stressLevel != null && stressLevel! > 1) count++;
+>>>>>>> 6742220 (Your commit message here)
     return count;
   }
   
@@ -207,6 +256,14 @@ class CycleEntry extends HiveObject {
     bool? hasBreastTenderness,
     bool? hasFatigue,
     bool? hasAcne,
+<<<<<<< HEAD
+=======
+    bool? hasLowerBackPain,
+    bool? hasConstipation,
+    bool? hasDiarrhea,
+    int? stressLevel,
+    bool? hasInsomnia,
+>>>>>>> 6742220 (Your commit message here)
     double? basalBodyTemperature,
     CervicalMucusType? cervicalMucus,
     bool? ovulationTestPositive,
@@ -231,6 +288,14 @@ class CycleEntry extends HiveObject {
       hasBreastTenderness: hasBreastTenderness ?? this.hasBreastTenderness,
       hasFatigue: hasFatigue ?? this.hasFatigue,
       hasAcne: hasAcne ?? this.hasAcne,
+<<<<<<< HEAD
+=======
+      hasLowerBackPain: hasLowerBackPain ?? this.hasLowerBackPain,
+      hasConstipation: hasConstipation ?? this.hasConstipation,
+      hasDiarrhea: hasDiarrhea ?? this.hasDiarrhea,
+      stressLevel: stressLevel ?? this.stressLevel,
+      hasInsomnia: hasInsomnia ?? this.hasInsomnia,
+>>>>>>> 6742220 (Your commit message here)
       basalBodyTemperature: basalBodyTemperature ?? this.basalBodyTemperature,
       cervicalMucus: cervicalMucus ?? this.cervicalMucus,
       ovulationTestPositive: ovulationTestPositive ?? this.ovulationTestPositive,
@@ -319,6 +384,35 @@ extension CyclePhaseExtension on CyclePhase {
         return '🌙';
     }
   }
+<<<<<<< HEAD
+=======
+
+  Color get color {
+    switch (this) {
+      case CyclePhase.menstrual:
+        return AppColors.menstrualPhase;
+      case CyclePhase.follicular:
+        return AppColors.follicularPhase;
+      case CyclePhase.ovulation:
+        return AppColors.ovulationPhase;
+      case CyclePhase.luteal:
+        return AppColors.lutealPhase;
+    }
+  }
+
+  List<Color> get gradientColors {
+    switch (this) {
+      case CyclePhase.menstrual:
+        return [AppColors.rose, AppColors.menstrualPhase, AppColors.blushPink];
+      case CyclePhase.follicular:
+        return [AppColors.sageGreen, AppColors.follicularPhase, AppColors.sageGreen.withOpacity(0.7)];
+      case CyclePhase.ovulation:
+        return [AppColors.lavender, AppColors.ovulationPhase, AppColors.rose];
+      case CyclePhase.luteal:
+        return [AppColors.lutealPhase, AppColors.lavender, AppColors.blushPink];
+    }
+  }
+>>>>>>> 6742220 (Your commit message here)
   
   String get description {
     switch (this) {