Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/core/config/theme/colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ class AnyStepColors {
static const Color black = Color(0xFF0C1821);
static const Color pureBlack = Color(0xFF000000);
static const Color gray = Color(0xFFB0B0B0);
static const Color grayDark = Color(0xFF28262C);
static const Color grayDark = Color(0xFF26282C);
static const Color navyDark = Color(0xFF273043);
static const Color blueDeep = Color(0xFF14248A);
static const Color blueBright = Color(0xFF47A7ED);
static const Color blueBright20 = Color.fromRGBO(71, 167, 237, 0.2);
static const Color white = Color(0xFFFFFCF9);
static const Color pureWhite = Color(0xFFFFFFFF);
static const Color lightSecondaryContainer = Color(0xFFF4F3EE);
static const Color lightTertiaryContainer = Color(0xFFEEEDE6);
static const Color lightSecondaryContainer = Color.fromARGB(255, 249, 247, 243);
static const Color lightTertiaryContainer = Color.fromARGB(255, 244, 242, 238);
static const Color error = Color(0xFFD62839);
static const Color errorDark = Color(0xFFBA1A1A);
static const Color success = Color(0xFF2E7D32);
Expand Down
18 changes: 5 additions & 13 deletions lib/core/config/theme/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ class AnyStepTheme {
static final lightTheme = ThemeData(
useMaterial3: true,
brightness: Brightness.light,
fontFamily: '.SF Pro Text',
fontFamilyFallback: const ['.SF Pro Display'],
fontFamily: 'Montserrat',
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
colorScheme: ColorScheme.light(
Expand Down Expand Up @@ -57,19 +56,14 @@ class AnyStepTheme {
static final darkTheme = ThemeData(
useMaterial3: true,
brightness: Brightness.dark,
fontFamily: '.SF Pro Text',
fontFamilyFallback: const ['.SF Pro Display'],
fontFamily: 'Montserrat',
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
colorScheme: ColorScheme.fromSeed(
seedColor: AnyStepColors.blueBright,
brightness: Brightness.dark,
surface: AnyStepColors.black,
onSurface: AnyStepColors.white,
surfaceContainer: AnyStepColors.grayDark,
surfaceContainerHighest: AnyStepColors.navyDark,
error: AnyStepColors.errorDark,
onError: AnyStepColors.white,
onError: AnyStepColors.pureWhite,
),
textTheme: _tightTextTheme(AnyStepColors.pureWhite).copyWith(
bodyMedium: AnyStepTextStyles.bodyMedium.copyWith(
Expand All @@ -91,8 +85,7 @@ class AnyStepTheme {
static final highContrastLightTheme = ThemeData(
useMaterial3: true,
brightness: Brightness.light,
fontFamily: '.SF Pro Text',
fontFamilyFallback: const ['.SF Pro Display'],
fontFamily: 'Montserrat',
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
colorScheme: ColorScheme.highContrastLight(
Expand Down Expand Up @@ -121,8 +114,7 @@ class AnyStepTheme {
static final highContrastDarkTheme = ThemeData(
useMaterial3: true,
brightness: Brightness.dark,
fontFamily: '.SF Pro Text',
fontFamilyFallback: const ['.SF Pro Display'],
fontFamily: 'Montserrat',
visualDensity: VisualDensity.compact,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
colorScheme: ColorScheme.fromSeed(
Expand Down