Refactor: Implement multi-item inventory for Pad Tracker and dynamic navigation
This commit is contained in:
@@ -80,6 +80,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
|
||||
final user = ref.watch(userProfileProvider);
|
||||
final cycleInfo = ref.watch(currentCycleInfoProvider);
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
final phase = cycleInfo.phase;
|
||||
|
||||
@@ -107,7 +108,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
style: GoogleFonts.outfit(
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.titleLarge?.color,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -201,11 +202,11 @@ 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),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.charcoal.withOpacity(0.05),
|
||||
color: Colors.black.withOpacity(0.05),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
@@ -227,7 +228,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
style: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.titleLarge?.color,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -237,7 +238,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
scripture.reflection!,
|
||||
style: GoogleFonts.outfit(
|
||||
fontSize: 15,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.bodyLarge?.color,
|
||||
height: 1.6,
|
||||
),
|
||||
),
|
||||
@@ -252,11 +253,11 @@ 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),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.charcoal.withOpacity(0.05),
|
||||
color: Colors.black.withOpacity(0.05),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
@@ -278,7 +279,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
style: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.titleLarge?.color,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -288,7 +289,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
_getPhaseEncouragement(phase, user?.isMarried ?? false),
|
||||
style: GoogleFonts.outfit(
|
||||
fontSize: 15,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.bodyLarge?.color,
|
||||
height: 1.6,
|
||||
),
|
||||
),
|
||||
@@ -304,8 +305,8 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
AppColors.lavender.withOpacity(0.2),
|
||||
AppColors.blushPink.withOpacity(0.2),
|
||||
AppColors.lavender.withOpacity(isDark ? 0.35 : 0.2),
|
||||
AppColors.blushPink.withOpacity(isDark ? 0.35 : 0.2),
|
||||
],
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
@@ -324,7 +325,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
style: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.titleLarge?.color,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -335,7 +336,7 @@ class _DevotionalScreenState extends ConsumerState<DevotionalScreen> {
|
||||
style: GoogleFonts.lora(
|
||||
fontSize: 14,
|
||||
fontStyle: FontStyle.italic,
|
||||
color: AppColors.charcoal,
|
||||
color: Theme.of(context).textTheme.bodyMedium?.color,
|
||||
height: 1.6,
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user