Your commit message here

2025-12-19 22:47:27 -06:00
parent 5d746d694e
commit 464692ce56
21 changed files with 3018 additions and 0 deletions
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -140,8 +140,19 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {

  @override
  Widget build(BuildContext context) {
+<<<<<<< HEAD
    // Different background color for husband flow
    final bgColor = _role == UserRole.husband ? AppColors.warmCream : AppColors.cream;
+=======
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    
+    // Different background color for husband flow
+    final isHusband = _role == UserRole.husband;
+    final bgColor = isHusband 
+        ? (isDark ? const Color(0xFF1A1C1E) : AppColors.warmCream)
+        : theme.scaffoldBackgroundColor;
+>>>>>>> 6742220 (Your commit message here)
    
    return Scaffold(
      backgroundColor: bgColor,
@@ -154,13 +165,22 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
                padding: const EdgeInsets.all(24),
                child: SmoothPageIndicator(
                  controller: _pageController,
+<<<<<<< HEAD
                  count: _role == UserRole.husband ? 2 : 5, 
+=======
+                  count: isHusband ? 2 : 5, 
+>>>>>>> 6742220 (Your commit message here)
                  effect: WormEffect(
                    dotHeight: 8,
                    dotWidth: 8,
                    spacing: 12,
+<<<<<<< HEAD
                    activeDotColor: _role == UserRole.husband ? AppColors.navyBlue : AppColors.sageGreen,
                    dotColor: AppColors.lightGray.withOpacity(0.3),
+=======
+                    activeDotColor: isHusband ? AppColors.navyBlue : AppColors.sageGreen,
+                    dotColor: theme.colorScheme.outline.withOpacity(0.2),
+>>>>>>> 6742220 (Your commit message here)
                  ),
                ),
              ),
@@ -189,6 +209,11 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildRolePage() {
+<<<<<<< HEAD
+=======
+    final theme = Theme.of(context);
+    
+>>>>>>> 6742220 (Your commit message here)
    return Padding(
      padding: const EdgeInsets.all(32),
      child: Column(
@@ -215,10 +240,17 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          Text(
            'Who is this app for?',
             textAlign: TextAlign.center,
+<<<<<<< HEAD
            style: GoogleFonts.outfit(
              fontSize: 28,
              fontWeight: FontWeight.w600,
              color: AppColors.charcoal,
+=======
+            style: theme.textTheme.displayMedium?.copyWith(
+              fontSize: 28,
+              fontWeight: FontWeight.w600,
+              color: theme.colorScheme.onSurface,
+>>>>>>> 6742220 (Your commit message here)
            ),
          ),
          const SizedBox(height: 48),
@@ -230,6 +262,10 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          const Spacer(),
          SizedBox(
            width: double.infinity,
+<<<<<<< HEAD
+=======
+            height: 54,
+>>>>>>> 6742220 (Your commit message here)
            child: ElevatedButton(
              onPressed: _nextPage,
              style: ElevatedButton.styleFrom(
@@ -244,10 +280,20 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildRoleOption(UserRole role, String title, String subtitle, IconData icon) {
+<<<<<<< HEAD
    final isSelected = _role == role;
    // Dynamic colors based on role selection
    final activeColor = role == UserRole.wife ? AppColors.sageGreen : AppColors.navyBlue;
    final activeBg = role == UserRole.wife ? AppColors.sageGreen.withOpacity(0.1) : AppColors.navyBlue.withOpacity(0.1);
+=======
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final isSelected = _role == role;
+    
+    // Dynamic colors based on role selection
+    final activeColor = role == UserRole.wife ? AppColors.sageGreen : AppColors.navyBlue;
+    final activeBg = activeColor.withOpacity(isDark ? 0.3 : 0.1);
+>>>>>>> 6742220 (Your commit message here)
    
    return GestureDetector(
      onTap: () => setState(() => _role = role),
@@ -255,6 +301,7 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
        duration: const Duration(milliseconds: 200),
        padding: const EdgeInsets.all(20),
        decoration: BoxDecoration(
+<<<<<<< HEAD
          color: isSelected ? activeBg : Colors.white,
          borderRadius: BorderRadius.circular(16),
          border: Border.all(
@@ -268,18 +315,34 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
              offset: const Offset(0, 4),
            )
          ] : [],
+=======
+          color: isSelected ? activeBg : theme.cardTheme.color,
+          borderRadius: BorderRadius.circular(16),
+          border: Border.all(
+            color: isSelected ? activeColor : theme.colorScheme.outline.withOpacity(0.1),
+            width: isSelected ? 2 : 1,
+          ),
+>>>>>>> 6742220 (Your commit message here)
        ),
        child: Row(
          children: [
            Container(
              padding: const EdgeInsets.all(12),
              decoration: BoxDecoration(
+<<<<<<< HEAD
                color: isSelected ? activeColor : AppColors.lightGray.withOpacity(0.1),
+=======
+                color: isSelected ? activeColor : theme.colorScheme.surfaceVariant,
+>>>>>>> 6742220 (Your commit message here)
                shape: BoxShape.circle,
              ),
              child: Icon(
                icon,
+<<<<<<< HEAD
                color: isSelected ? Colors.white : AppColors.warmGray,
+=======
+                color: isSelected ? Colors.white : theme.colorScheme.onSurfaceVariant,
+>>>>>>> 6742220 (Your commit message here)
                size: 24,
              ),
            ),
@@ -290,18 +353,30 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
                children: [
                  Text(
                    title,
+<<<<<<< HEAD
                    style: GoogleFonts.outfit(
                      fontSize: 18,
                      fontWeight: FontWeight.w600,
                      color: AppColors.charcoal,
+=======
+                    style: theme.textTheme.titleLarge?.copyWith(
+                      fontSize: 18,
+                      fontWeight: FontWeight.w600,
+                      color: theme.colorScheme.onSurface,
+>>>>>>> 6742220 (Your commit message here)
                    ),
                  ),
                  const SizedBox(height: 4),
                  Text(
                    subtitle,
+<<<<<<< HEAD
                    style: GoogleFonts.outfit(
                      fontSize: 14,
                      color: AppColors.warmGray,
+=======
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      color: theme.colorScheme.onSurfaceVariant,
+>>>>>>> 6742220 (Your commit message here)
                    ),
                  ),
                ],
@@ -316,6 +391,10 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildNamePage() {
+<<<<<<< HEAD
+=======
+    final theme = Theme.of(context);
+>>>>>>> 6742220 (Your commit message here)
    final isHusband = _role == UserRole.husband;
    final activeColor = isHusband ? AppColors.navyBlue : AppColors.sageGreen;

@@ -327,18 +406,30 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          const SizedBox(height: 40),
          Text(
            isHusband ? 'What\'s your name, sir?' : 'What\'s your name?',
+<<<<<<< HEAD
            style: GoogleFonts.outfit(
              fontSize: 28,
              fontWeight: FontWeight.w600,
              color: isHusband ? AppColors.navyBlue : AppColors.charcoal,
+=======
+            style: theme.textTheme.displaySmall?.copyWith(
+              fontSize: 28,
+              fontWeight: FontWeight.w600,
+              color: theme.colorScheme.onSurface,
+>>>>>>> 6742220 (Your commit message here)
            ),
          ),
          const SizedBox(height: 8),
          Text(
            'We\'ll use this to personalize the app.',
+<<<<<<< HEAD
            style: GoogleFonts.outfit(
              fontSize: 14,
              color: AppColors.warmGray,
+=======
+            style: theme.textTheme.bodyMedium?.copyWith(
+              color: theme.colorScheme.onSurfaceVariant,
+>>>>>>> 6742220 (Your commit message here)
            ),
          ),
          const SizedBox(height: 32),
@@ -349,6 +440,7 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
              hintText: 'Enter your name',
              prefixIcon: Icon(
                Icons.person_outline,
+<<<<<<< HEAD
                color: AppColors.warmGray,
              ),
               focusedBorder: OutlineInputBorder(
@@ -357,6 +449,16 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
              ),
            ),
            style: GoogleFonts.outfit(fontSize: 16),
+=======
+                color: theme.colorScheme.onSurfaceVariant,
+              ),
+               focusedBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12),
+                borderSide: BorderSide(color: activeColor, width: 2),
+              ),
+            ),
+            style: theme.textTheme.bodyLarge,
+>>>>>>> 6742220 (Your commit message here)
            textCapitalization: TextCapitalization.words,
          ),
          
@@ -365,6 +467,7 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          Row(
            children: [
              Expanded(
+<<<<<<< HEAD
                child: OutlinedButton(
                  onPressed: _previousPage,
                  style: OutlinedButton.styleFrom(
@@ -372,16 +475,40 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
                     side: BorderSide(color: isHusband ? AppColors.navyBlue : AppColors.sageGreen),
                  ),
                  child: const Text('Back'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: OutlinedButton(
+                    onPressed: _previousPage,
+                    style: OutlinedButton.styleFrom(
+                       foregroundColor: activeColor,
+                       side: BorderSide(color: activeColor),
+                    ),
+                    child: const Text('Back'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
              const SizedBox(width: 16),
              Expanded(
+<<<<<<< HEAD
                child: ElevatedButton(
                  onPressed: (_name.isNotEmpty && !_isNavigating) ? _nextPage : null,
                  style: ElevatedButton.styleFrom(
                    backgroundColor: activeColor,
                  ),
                  child: Text(isHusband ? 'Finish Setup' : 'Continue'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: ElevatedButton(
+                    onPressed: (_name.isNotEmpty && !_isNavigating) ? _nextPage : null,
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: activeColor,
+                    ),
+                    child: Text(isHusband ? 'Finish Setup' : 'Continue'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
            ],
@@ -392,6 +519,11 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildRelationshipPage() {
+<<<<<<< HEAD
+=======
+    final theme = Theme.of(context);
+    
+>>>>>>> 6742220 (Your commit message here)
    return Padding(
      padding: const EdgeInsets.all(32),
      child: Column(
@@ -400,10 +532,17 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          const SizedBox(height: 40),
          Text(
            'Tell us about yourself',
+<<<<<<< HEAD
            style: GoogleFonts.outfit(
              fontSize: 28,
              fontWeight: FontWeight.w600,
              color: AppColors.charcoal,
+=======
+            style: theme.textTheme.displaySmall?.copyWith(
+              fontSize: 28,
+              fontWeight: FontWeight.w600,
+              color: theme.colorScheme.onSurface,
+>>>>>>> 6742220 (Your commit message here)
            ),
          ),
          const SizedBox(height: 32),
@@ -418,17 +557,39 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
           Row(
            children: [
              Expanded(
+<<<<<<< HEAD
                child: OutlinedButton(
                  onPressed: _previousPage,
                   style: OutlinedButton.styleFrom(foregroundColor: AppColors.sageGreen, side: BorderSide(color: AppColors.sageGreen)),
                  child: const Text('Back'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: OutlinedButton(
+                    onPressed: _previousPage,
+                     style: OutlinedButton.styleFrom(
+                       foregroundColor: AppColors.sageGreen, 
+                       side: const BorderSide(color: AppColors.sageGreen)
+                     ),
+                    child: const Text('Back'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
              const SizedBox(width: 16),
              Expanded(
+<<<<<<< HEAD
                child: ElevatedButton(
                  onPressed: (_relationshipStatus != null && !_isNavigating) ? _nextPage : null,
                  child: const Text('Continue'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: ElevatedButton(
+                    onPressed: (_relationshipStatus != null && !_isNavigating) ? _nextPage : null,
+                    child: const Text('Continue'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
            ],
@@ -439,30 +600,67 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildRelationshipOption(RelationshipStatus status, String title, String subtitle, IconData icon) {
+<<<<<<< HEAD
    final isSelected = _relationshipStatus == status;
+=======
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final isSelected = _relationshipStatus == status;
+    
+>>>>>>> 6742220 (Your commit message here)
    return GestureDetector(
      onTap: () => setState(() => _relationshipStatus = status),
      child: AnimatedContainer(
        duration: const Duration(milliseconds: 200),
        padding: const EdgeInsets.all(16),
        decoration: BoxDecoration(
+<<<<<<< HEAD
          color: isSelected ? AppColors.sageGreen.withOpacity(0.1) : Colors.white,
          borderRadius: BorderRadius.circular(12),
          border: Border.all(
            color: isSelected ? AppColors.sageGreen : AppColors.lightGray.withOpacity(0.5),
+=======
+          color: isSelected ? AppColors.sageGreen.withOpacity(isDark ? 0.3 : 0.1) : theme.cardTheme.color,
+          borderRadius: BorderRadius.circular(12),
+          border: Border.all(
+            color: isSelected ? AppColors.sageGreen : theme.colorScheme.outline.withOpacity(0.1),
+>>>>>>> 6742220 (Your commit message here)
            width: isSelected ? 2 : 1,
          ),
        ),
        child: Row(
          children: [
+<<<<<<< HEAD
            Icon(icon, color: isSelected ? AppColors.sageGreen : AppColors.warmGray),
+=======
+            Icon(
+              icon, 
+              color: isSelected ? AppColors.sageGreen : theme.colorScheme.onSurfaceVariant
+            ),
+>>>>>>> 6742220 (Your commit message here)
            const SizedBox(width: 16),
            Expanded(
              child: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
+<<<<<<< HEAD
                  Text(title, style: GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w600, color: AppColors.charcoal)),
                  Text(subtitle, style: GoogleFonts.outfit(fontSize: 13, color: AppColors.warmGray)),
+=======
+                  Text(
+                    title, 
+                    style: theme.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w600, 
+                      color: theme.colorScheme.onSurface
+                    )
+                  ),
+                  Text(
+                    subtitle, 
+                    style: theme.textTheme.bodySmall?.copyWith(
+                      color: theme.colorScheme.onSurfaceVariant
+                    )
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ],
              ),
            ),
@@ -474,13 +672,29 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildFertilityGoalPage() {
+<<<<<<< HEAD
+=======
+    final theme = Theme.of(context);
+    
+>>>>>>> 6742220 (Your commit message here)
    return Padding(
      padding: const EdgeInsets.all(32),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          const SizedBox(height: 40),
+<<<<<<< HEAD
          Text('What\'s your goal?', style: GoogleFonts.outfit(fontSize: 28, fontWeight: FontWeight.w600, color: AppColors.charcoal)),
+=======
+          Text(
+            'What\'s your goal?', 
+            style: theme.textTheme.displaySmall?.copyWith(
+              fontSize: 28, 
+              fontWeight: FontWeight.w600, 
+              color: theme.colorScheme.onSurface
+            )
+          ),
+>>>>>>> 6742220 (Your commit message here)
          const SizedBox(height: 32),
          _buildGoalOption(FertilityGoal.tryingToConceive, 'Trying to Conceive', 'Track fertile days', Icons.child_care_outlined),
          const SizedBox(height: 12),
@@ -491,17 +705,39 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          Row(
            children: [
              Expanded(
+<<<<<<< HEAD
                child: OutlinedButton(
                  onPressed: _previousPage,
                   style: OutlinedButton.styleFrom(foregroundColor: AppColors.sageGreen, side: BorderSide(color: AppColors.sageGreen)),
                  child: const Text('Back'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: OutlinedButton(
+                    onPressed: _previousPage,
+                     style: OutlinedButton.styleFrom(
+                       foregroundColor: AppColors.sageGreen, 
+                       side: const BorderSide(color: AppColors.sageGreen)
+                     ),
+                    child: const Text('Back'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
              const SizedBox(width: 16),
              Expanded(
+<<<<<<< HEAD
                child: ElevatedButton(
                  onPressed: (_fertilityGoal != null && !_isNavigating) ? _nextPage : null,
                  child: const Text('Continue'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: ElevatedButton(
+                    onPressed: (_fertilityGoal != null && !_isNavigating) ? _nextPage : null,
+                    child: const Text('Continue'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
            ],
@@ -512,30 +748,67 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildGoalOption(FertilityGoal goal, String title, String subtitle, IconData icon) {
+<<<<<<< HEAD
     final isSelected = _fertilityGoal == goal;
+=======
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final isSelected = _fertilityGoal == goal;
+    
+>>>>>>> 6742220 (Your commit message here)
    return GestureDetector(
      onTap: () => setState(() => _fertilityGoal = goal),
      child: AnimatedContainer(
        duration: const Duration(milliseconds: 200),
        padding: const EdgeInsets.all(16),
        decoration: BoxDecoration(
+<<<<<<< HEAD
          color: isSelected ? AppColors.sageGreen.withOpacity(0.1) : Colors.white,
          borderRadius: BorderRadius.circular(12),
          border: Border.all(
            color: isSelected ? AppColors.sageGreen : AppColors.lightGray.withOpacity(0.5),
+=======
+          color: isSelected ? AppColors.sageGreen.withOpacity(isDark ? 0.3 : 0.1) : theme.cardTheme.color,
+          borderRadius: BorderRadius.circular(12),
+          border: Border.all(
+            color: isSelected ? AppColors.sageGreen : theme.colorScheme.outline.withOpacity(0.1),
+>>>>>>> 6742220 (Your commit message here)
            width: isSelected ? 2 : 1,
          ),
        ),
        child: Row(
          children: [
+<<<<<<< HEAD
            Icon(icon, color: isSelected ? AppColors.sageGreen : AppColors.warmGray),
+=======
+            Icon(
+              icon, 
+              color: isSelected ? AppColors.sageGreen : theme.colorScheme.onSurfaceVariant
+            ),
+>>>>>>> 6742220 (Your commit message here)
            const SizedBox(width: 16),
            Expanded(
              child: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
+<<<<<<< HEAD
                  Text(title, style: GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w600, color: AppColors.charcoal)),
                  Text(subtitle, style: GoogleFonts.outfit(fontSize: 13, color: AppColors.warmGray)),
+=======
+                  Text(
+                    title, 
+                    style: theme.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w600, 
+                      color: theme.colorScheme.onSurface
+                    )
+                  ),
+                  Text(
+                    subtitle, 
+                    style: theme.textTheme.bodySmall?.copyWith(
+                      color: theme.colorScheme.onSurfaceVariant
+                    )
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ],
              ),
            ),
@@ -547,16 +820,42 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
  }

  Widget _buildCyclePage() {
+<<<<<<< HEAD
+=======
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    
+>>>>>>> 6742220 (Your commit message here)
    return Padding(
      padding: const EdgeInsets.all(32),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          const SizedBox(height: 40),
+<<<<<<< HEAD
          Text('About your cycle', style: GoogleFonts.outfit(fontSize: 28, fontWeight: FontWeight.w600, color: AppColors.charcoal)),
          const SizedBox(height: 32),
          
          Text('Average cycle length', style: GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w500, color: AppColors.charcoal)),
+=======
+          Text(
+            'About your cycle', 
+            style: theme.textTheme.displaySmall?.copyWith(
+              fontSize: 28, 
+              fontWeight: FontWeight.w600, 
+              color: theme.colorScheme.onSurface
+            )
+          ),
+          const SizedBox(height: 32),
+          
+          Text(
+            'Average cycle length', 
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w500, 
+              color: theme.colorScheme.onSurface
+            )
+          ),
+>>>>>>> 6742220 (Your commit message here)
          Row(
            children: [
              Expanded(
@@ -565,16 +864,39 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
                  min: 21,
                  max: 40,
                  divisions: 19,
+<<<<<<< HEAD
                  onChanged: (value) => setState(() => _averageCycleLength = value.round()),
                ),
              ),
              Text('$_averageCycleLength days', style: GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w600, color: AppColors.sageGreen)),
+=======
+                  activeColor: AppColors.sageGreen,
+                  onChanged: (value) => setState(() => _averageCycleLength = value.round()),
+                ),
+              ),
+              Text(
+                '$_averageCycleLength days', 
+                style: theme.textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.w600, 
+                  color: AppColors.sageGreen
+                )
+              ),
+>>>>>>> 6742220 (Your commit message here)
            ],
          ),

          // Irregular Cycle Checkbox
          CheckboxListTile(
+<<<<<<< HEAD
            title: Text('My cycles are irregular', style: GoogleFonts.outfit(fontSize: 14, color: AppColors.charcoal)),
+=======
+            title: Text(
+              'My cycles are irregular', 
+              style: theme.textTheme.bodyLarge?.copyWith(
+                color: theme.colorScheme.onSurface
+              )
+            ),
+>>>>>>> 6742220 (Your commit message here)
            value: _isIrregularCycle,
            onChanged: (val) => setState(() => _isIrregularCycle = val ?? false),
            activeColor: AppColors.sageGreen,
@@ -583,7 +905,17 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          ),

          const SizedBox(height: 24),
+<<<<<<< HEAD
          Text('Last period start date', style: GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w500, color: AppColors.charcoal)),
+=======
+          Text(
+            'Last period start date', 
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w500, 
+              color: theme.colorScheme.onSurface
+            )
+          ),
+>>>>>>> 6742220 (Your commit message here)
          const SizedBox(height: 8),
          GestureDetector(
            onTap: () async {
@@ -594,8 +926,16 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
                lastDate: DateTime.now(),
                 builder: (context, child) {
                  return Theme(
+<<<<<<< HEAD
                    data: Theme.of(context).copyWith(
                      colorScheme: const ColorScheme.light(primary: AppColors.sageGreen, onPrimary: Colors.white, surface: Colors.white, onSurface: AppColors.charcoal),
+=======
+                    data: theme.copyWith(
+                      colorScheme: theme.colorScheme.copyWith(
+                        primary: AppColors.sageGreen,
+                        onPrimary: Colors.white,
+                      ),
+>>>>>>> 6742220 (Your commit message here)
                    ),
                    child: child!,
                  );
@@ -605,12 +945,32 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
            },
            child: Container(
              padding: const EdgeInsets.all(16),
+<<<<<<< HEAD
              decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(12), border: Border.all(color: AppColors.lightGray.withOpacity(0.5))),
              child: Row(
                children: [
                  Icon(Icons.calendar_today, color: AppColors.warmGray),
                  const SizedBox(width: 12),
                  Text(_lastPeriodStart != null ? "${_lastPeriodStart!.month}/${_lastPeriodStart!.day}/${_lastPeriodStart!.year}" : "Select Date", style: GoogleFonts.outfit(fontSize: 16, color: AppColors.charcoal)),
+=======
+              decoration: BoxDecoration(
+                color: theme.cardTheme.color, 
+                borderRadius: BorderRadius.circular(12), 
+                border: Border.all(color: theme.colorScheme.outline.withOpacity(0.1))
+              ),
+              child: Row(
+                children: [
+                  Icon(Icons.calendar_today, color: theme.colorScheme.onSurfaceVariant),
+                  const SizedBox(width: 12),
+                  Text(
+                    _lastPeriodStart != null 
+                        ? "${_lastPeriodStart!.month}/${_lastPeriodStart!.day}/${_lastPeriodStart!.year}" 
+                        : "Select Date", 
+                    style: theme.textTheme.bodyLarge?.copyWith(
+                      color: theme.colorScheme.onSurface
+                    )
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ],
              ),
            ),
@@ -620,17 +980,39 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
          Row(
            children: [
               Expanded(
+<<<<<<< HEAD
                child: OutlinedButton(
                  onPressed: _previousPage,
                   style: OutlinedButton.styleFrom(foregroundColor: AppColors.sageGreen, side: BorderSide(color: AppColors.sageGreen)),
                  child: const Text('Back'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: OutlinedButton(
+                    onPressed: _previousPage,
+                     style: OutlinedButton.styleFrom(
+                       foregroundColor: AppColors.sageGreen, 
+                       side: const BorderSide(color: AppColors.sageGreen)
+                     ),
+                    child: const Text('Back'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
              const SizedBox(width: 16),
              Expanded(
+<<<<<<< HEAD
                child: ElevatedButton(
                  onPressed: (_lastPeriodStart != null && !_isNavigating) ? _nextPage : null,
                  child: const Text('Get Started'),
+=======
+                child: SizedBox(
+                  height: 54,
+                  child: ElevatedButton(
+                    onPressed: (_lastPeriodStart != null && !_isNavigating) ? _nextPage : null,
+                    child: const Text('Get Started'),
+                  ),
+>>>>>>> 6742220 (Your commit message here)
                ),
              ),
            ],