sterl/Tracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance Pad Tracking with new Flow and Supply logic

Browse Source
This commit is contained in:
Sterlen
2026-01-09 13:35:07 -06:00
parent 24ffac2415
commit dc6bcad83f
17 changed files with 765 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/screens/devotional/devotional_screen.dart
View File

@@ -143,7 +143,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
phase.description,
style: GoogleFonts.outfit(
fontSize: 14,
color: AppColors.warmGray,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
const SizedBox(height: 32),
@@ -170,7 +170,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
onPressed: () => ref
.read(scriptureProvider.notifier)
.getPreviousScripture(),
color: AppColors.charcoal,
color: Theme.of(context).colorScheme.onSurface,
),
),
Positioned(
@@ -180,7 +180,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
onPressed: () => ref
.read(scriptureProvider.notifier)
.getNextScripture(),
color: AppColors.charcoal,
color: Theme.of(context).colorScheme.onSurface,
),
),
],
@@ -321,16 +321,16 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Row(
Row(
children: [
Text('🙏', style: TextStyle(fontSize: 20)),
SizedBox(width: 8),
const Text('🙏', style: TextStyle(fontSize: 20)),
const SizedBox(width: 8),
Text(
'Prayer Prompt',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: AppColors.charcoal, // Assuming a default color
color: Theme.of(context).colorScheme.onSurface,
),
),
],
@@ -460,7 +460,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
width: double.infinity,
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: Colors.white,
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColors.gold.withValues(alpha: 0.5)),
boxShadow: [
@@ -510,7 +510,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
style: GoogleFonts.outfit(
fontSize: 18,
fontWeight: FontWeight.w600,
color: AppColors.charcoal,
color: Theme.of(context).colorScheme.onSurface,
),
),
if (latestPlan.scriptureReference.isNotEmpty) ...[
@@ -530,7 +530,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
style: GoogleFonts.lora(
fontSize: 15,
height: 1.5,
color: AppColors.charcoal.withValues(alpha: 0.9),
color: Theme.of(context).textTheme.bodyMedium?.color,
),
),
],
@@ -543,7 +543,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
width: double.infinity,
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: Colors.white,
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.circular(16),
border: Border.all(
color: AppColors.warmGray.withValues(alpha: 0.3),
@@ -595,7 +595,10 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
style: GoogleFonts.outfit(
fontSize: 18,
fontWeight: FontWeight.w600,
color: AppColors.charcoal.withValues(alpha: 0.7),
color: Theme.of(context)
.colorScheme
.onSurface
.withValues(alpha: 0.7),
),
),
const SizedBox(height: 4),