Resolve all lints and deprecation warnings
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import '../theme/app_theme.dart';
|
||||
import '../models/cycle_entry.dart';
|
||||
|
||||
@@ -35,11 +34,12 @@ class ScriptureCard extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? Colors.white.withOpacity(0.05)
|
||||
: Colors.black.withOpacity(0.05)),
|
||||
? Colors.white.withValues(alpha: 0.05)
|
||||
: Colors.black.withValues(alpha: 0.05)),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: _getPhaseColor(phase).withOpacity(isDark ? 0.05 : 0.15),
|
||||
color:
|
||||
_getPhaseColor(phase).withValues(alpha: isDark ? 0.05 : 0.15),
|
||||
blurRadius: 15,
|
||||
offset: const Offset(0, 8),
|
||||
),
|
||||
@@ -60,7 +60,7 @@ class ScriptureCard extends StatelessWidget {
|
||||
height: 32,
|
||||
decoration: BoxDecoration(
|
||||
color: (isDark ? Colors.white : Colors.black)
|
||||
.withOpacity(0.1),
|
||||
.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Icon(
|
||||
@@ -68,7 +68,7 @@ class ScriptureCard extends StatelessWidget {
|
||||
size: 18,
|
||||
color: isDark
|
||||
? Colors.white70
|
||||
: AppColors.charcoal.withOpacity(0.8),
|
||||
: AppColors.charcoal.withValues(alpha: 0.8),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
@@ -78,7 +78,7 @@ class ScriptureCard extends StatelessWidget {
|
||||
fontSize: 12,
|
||||
color: isDark
|
||||
? const Color(0xFFE0E0E0)
|
||||
: AppColors.charcoal.withOpacity(0.7),
|
||||
: AppColors.charcoal.withValues(alpha: 0.7),
|
||||
letterSpacing: 0.5,
|
||||
),
|
||||
),
|
||||
@@ -111,11 +111,11 @@ class ScriptureCard extends StatelessWidget {
|
||||
horizontal: 10, vertical: 6),
|
||||
decoration: BoxDecoration(
|
||||
color: (isDark ? Colors.white : Colors.black)
|
||||
.withOpacity(0.05),
|
||||
.withValues(alpha: 0.05),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: (isDark ? Colors.white : Colors.black)
|
||||
.withOpacity(0.1),
|
||||
.withValues(alpha: 0.1),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
@@ -133,9 +133,8 @@ class ScriptureCard extends StatelessWidget {
|
||||
Icon(
|
||||
Icons.swap_horiz,
|
||||
size: 14,
|
||||
color: isDark
|
||||
? Colors.white38
|
||||
: AppColors.warmGray,
|
||||
color:
|
||||
isDark ? Colors.white38 : AppColors.warmGray,
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -157,22 +156,22 @@ class ScriptureCard extends StatelessWidget {
|
||||
switch (phase) {
|
||||
case CyclePhase.menstrual:
|
||||
return [
|
||||
AppColors.menstrualPhase.withOpacity(isDark ? 0.15 : 0.6),
|
||||
AppColors.menstrualPhase.withValues(alpha: isDark ? 0.15 : 0.6),
|
||||
baseColor,
|
||||
];
|
||||
case CyclePhase.follicular:
|
||||
return [
|
||||
AppColors.follicularPhase.withOpacity(isDark ? 0.15 : 0.3),
|
||||
AppColors.follicularPhase.withValues(alpha: isDark ? 0.15 : 0.3),
|
||||
baseColor,
|
||||
];
|
||||
case CyclePhase.ovulation:
|
||||
return [
|
||||
AppColors.ovulationPhase.withOpacity(isDark ? 0.15 : 0.5),
|
||||
AppColors.ovulationPhase.withValues(alpha: isDark ? 0.15 : 0.5),
|
||||
baseColor,
|
||||
];
|
||||
case CyclePhase.luteal:
|
||||
return [
|
||||
AppColors.lutealPhase.withOpacity(isDark ? 0.15 : 0.3),
|
||||
AppColors.lutealPhase.withValues(alpha: isDark ? 0.15 : 0.3),
|
||||
baseColor,
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user