Your commit message here
This commit is contained in:
@@ -248,6 +248,7 @@ class AppTheme {
|
||||
useMaterial3: true,
|
||||
brightness: Brightness.dark,
|
||||
|
||||
<<<<<<< HEAD
|
||||
colorScheme: const ColorScheme.dark(
|
||||
primary: AppColors.sageGreen,
|
||||
secondary: AppColors.rose,
|
||||
@@ -258,12 +259,73 @@ class AppTheme {
|
||||
|
||||
scaffoldBackgroundColor: const Color(0xFF121212),
|
||||
|
||||
=======
|
||||
// Color Scheme
|
||||
colorScheme: ColorScheme.dark(
|
||||
primary: AppColors.sageGreen,
|
||||
secondary: AppColors.rose,
|
||||
tertiary: AppColors.lavender,
|
||||
surface: const Color(0xFF1E1E1E),
|
||||
error: AppColors.error,
|
||||
onPrimary: Colors.white,
|
||||
onSecondary: Colors.white,
|
||||
onSurface: Colors.white,
|
||||
onSurfaceVariant: Colors.white70,
|
||||
outline: Colors.white.withOpacity(0.1),
|
||||
),
|
||||
|
||||
// Scaffold
|
||||
scaffoldBackgroundColor: const Color(0xFF121212),
|
||||
|
||||
// AppBar
|
||||
appBarTheme: AppBarTheme(
|
||||
backgroundColor: const Color(0xFF121212),
|
||||
foregroundColor: Colors.white,
|
||||
elevation: 0,
|
||||
centerTitle: true,
|
||||
titleTextStyle: GoogleFonts.outfit(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
|
||||
// Text Theme
|
||||
>>>>>>> 6742220 (Your commit message here)
|
||||
textTheme: TextTheme(
|
||||
displayLarge: GoogleFonts.outfit(
|
||||
fontSize: 32,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
),
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
displayMedium: GoogleFonts.outfit(
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
),
|
||||
headlineLarge: GoogleFonts.outfit(
|
||||
fontSize: 24,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
),
|
||||
headlineMedium: GoogleFonts.outfit(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white,
|
||||
),
|
||||
titleLarge: GoogleFonts.outfit(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white,
|
||||
),
|
||||
titleMedium: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white,
|
||||
),
|
||||
>>>>>>> 6742220 (Your commit message here)
|
||||
bodyLarge: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w400,
|
||||
@@ -274,6 +336,7 @@ class AppTheme {
|
||||
fontWeight: FontWeight.w400,
|
||||
color: Colors.white70,
|
||||
),
|
||||
<<<<<<< HEAD
|
||||
),
|
||||
|
||||
cardTheme: CardTheme(
|
||||
@@ -282,6 +345,121 @@ class AppTheme {
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
=======
|
||||
bodySmall: GoogleFonts.outfit(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w400,
|
||||
color: Colors.white54,
|
||||
),
|
||||
labelLarge: GoogleFonts.outfit(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
|
||||
// Card Theme
|
||||
cardTheme: CardTheme(
|
||||
color: const Color(0xFF1E1E1E),
|
||||
elevation: 0, // Material 3 uses color/opacity for elevation in dark mode
|
||||
shadowColor: Colors.transparent,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
side: BorderSide(color: Colors.white.withOpacity(0.05)),
|
||||
),
|
||||
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
),
|
||||
|
||||
// Button Themes
|
||||
elevatedButtonTheme: ElevatedButtonThemeData(
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: AppColors.sageGreen,
|
||||
foregroundColor: Colors.white,
|
||||
elevation: 0,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 14),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
textStyle: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
outlinedButtonTheme: OutlinedButtonThemeData(
|
||||
style: OutlinedButton.styleFrom(
|
||||
foregroundColor: AppColors.sageGreen,
|
||||
side: BorderSide(color: AppColors.sageGreen.withOpacity(0.5), width: 1.5),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 14),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
textStyle: GoogleFonts.outfit(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Input Decoration
|
||||
inputDecorationTheme: InputDecorationTheme(
|
||||
filled: true,
|
||||
fillColor: const Color(0xFF1E1E1E),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide(color: Colors.white.withOpacity(0.1)),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide(color: Colors.white.withOpacity(0.1)),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: const BorderSide(color: AppColors.sageGreen, width: 2),
|
||||
),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
|
||||
hintStyle: GoogleFonts.outfit(
|
||||
color: Colors.white38,
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
|
||||
// Bottom Navigation
|
||||
bottomNavigationBarTheme: BottomNavigationBarThemeData(
|
||||
backgroundColor: const Color(0xFF1E1E1E),
|
||||
selectedItemColor: AppColors.sageGreen,
|
||||
unselectedItemColor: Colors.white38,
|
||||
type: BottomNavigationBarType.fixed,
|
||||
elevation: 0,
|
||||
selectedLabelStyle: GoogleFonts.outfit(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
unselectedLabelStyle: GoogleFonts.outfit(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
|
||||
// Slider Theme
|
||||
sliderTheme: SliderThemeData(
|
||||
activeTrackColor: AppColors.sageGreen,
|
||||
inactiveTrackColor: Colors.white.withOpacity(0.1),
|
||||
thumbColor: AppColors.sageGreen,
|
||||
overlayColor: AppColors.sageGreen.withOpacity(0.2),
|
||||
trackHeight: 4,
|
||||
tickMarkShape: const RoundSliderTickMarkShape(),
|
||||
activeTickMarkColor: Colors.white24,
|
||||
inactiveTickMarkColor: Colors.white10,
|
||||
),
|
||||
|
||||
// Divider
|
||||
dividerTheme: DividerThemeData(
|
||||
color: Colors.white.withOpacity(0.05),
|
||||
thickness: 1,
|
||||
space: 24,
|
||||
>>>>>>> 6742220 (Your commit message here)
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -289,19 +467,35 @@ class AppTheme {
|
||||
|
||||
/// Scripture text style
|
||||
TextStyle scriptureStyle(BuildContext context, {double? fontSize}) {
|
||||
<<<<<<< HEAD
|
||||
return GoogleFonts.lora(
|
||||
fontSize: fontSize ?? 16,
|
||||
fontStyle: FontStyle.italic,
|
||||
color: AppColors.charcoal,
|
||||
=======
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
return GoogleFonts.lora(
|
||||
fontSize: fontSize ?? 16,
|
||||
fontStyle: FontStyle.italic,
|
||||
color: isDark ? Colors.white : AppColors.charcoal,
|
||||
>>>>>>> 6742220 (Your commit message here)
|
||||
height: 1.6,
|
||||
);
|
||||
}
|
||||
|
||||
/// Scripture reference style
|
||||
TextStyle scriptureRefStyle(BuildContext context) {
|
||||
<<<<<<< HEAD
|
||||
return GoogleFonts.outfit(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: AppColors.warmGray,
|
||||
=======
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
return GoogleFonts.outfit(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: isDark ? Colors.white54 : AppColors.warmGray,
|
||||
>>>>>>> 6742220 (Your commit message here)
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user