Your commit message here

lib/screens/devotional/devotional_screen.dart

@@ -6,10 +6,57 @@ import '../../providers/user_provider.dart';
 import '../../services/cycle_service.dart';
 import '../../models/cycle_entry.dart';
 import '../../theme/app_theme.dart';
+<<<<<<< HEAD
+=======
+import '../../widgets/scripture_card.dart';
+import '../../models/user_profile.dart';
+>>>>>>> 6742220 (Your commit message here)
 
 class DevotionalScreen extends ConsumerWidget {
   const DevotionalScreen({super.key});
 
+<<<<<<< HEAD
+=======
+  Future<void> _showTranslationPicker(BuildContext context, WidgetRef ref, UserProfile? user) async {
+    if (user == null) return;
+
+    final selected = await showModalBottomSheet<BibleTranslation>(
+      context: context,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+      ),
+      builder: (context) => Container(
+        padding: const EdgeInsets.symmetric(vertical: 20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+              child: Text(
+                'Select Bible Translation',
+                style: Theme.of(context).textTheme.titleLarge,
+              ),
+            ),
+            ...BibleTranslation.values.map((t) => ListTile(
+              title: Text(t.label),
+              trailing: user.bibleTranslation == t 
+                ? Icon(Icons.check, color: AppColors.sageGreen) 
+                : null,
+              onTap: () => Navigator.pop(context, t),
+            )),
+          ],
+        ),
+      ),
+    );
+
+    if (selected != null) {
+      await ref.read(userProfileProvider.notifier).updateProfile(
+        user.copyWith(bibleTranslation: selected)
+      );
+    }
+  }
+
+>>>>>>> 6742220 (Your commit message here)
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final user = ref.watch(userProfileProvider);
@@ -71,6 +118,7 @@ class DevotionalScreen extends ConsumerWidget {
             const SizedBox(height: 32),
 
             // Main Scripture Card
+<<<<<<< HEAD
             Container(
               width: double.infinity,
               padding: const EdgeInsets.all(24),
@@ -130,6 +178,14 @@ class DevotionalScreen extends ConsumerWidget {
                   ),
                 ],
               ),
+=======
+            ScriptureCard(
+              verse: scripture.getVerse(user?.bibleTranslation ?? BibleTranslation.esv),
+              reference: scripture.reference,
+              translation: (user?.bibleTranslation ?? BibleTranslation.esv).label,
+              phase: phase,
+              onTranslationTap: () => _showTranslationPicker(context, ref, user),
+>>>>>>> 6742220 (Your commit message here)
             ),
             const SizedBox(height: 24),