Skip to content

Commit 1e403f7

Browse files
ashtankoashtanko
committed
Add orange theme
1 parent 7393db8 commit 1e403f7

File tree

2 files changed

+332
-5
lines changed

2 files changed

+332
-5
lines changed

‎lib/bloc/theme/theme_cubit.dart‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Map<AppTheme, ThemeData> getThemeData(MaterialTheme theme) {
88
final themeData = <AppTheme, ThemeData>{
99
AppTheme.system: theme.yellowLight(),
1010
AppTheme.light: theme.yellowLight(),
11-
AppTheme.lightGold: theme.yellowLightHighContrast(),
11+
AppTheme.lightGold: theme.orangeLight(),
1212
AppTheme.lightMint: theme.yellowLightMediumContrast(),
1313
AppTheme.dark: theme.yellowDark(),
14-
AppTheme.darkGold: theme.yellowDarkHighContrast(),
14+
AppTheme.darkGold: theme.orangeDark(),
1515
AppTheme.darkMint: theme.yellowDarkMediumContrast(),
1616
AppTheme.experimental: theme.yellowDarkMediumContrast(),
1717
};
@@ -80,7 +80,4 @@ class ThemeCubit extends Cubit<AppTheme> {
8080
return themeData[AppTheme.experimental] ?? theme.yellowLight();
8181
}
8282
}
83-
84-
/// Default dark theme
85-
//ThemeData get darkTheme => themeData[AppTheme.dark] ?? Style.dark;
8683
}

‎lib/theme/style.dart‎

Lines changed: 330 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,336 @@ class MaterialTheme {
335335
return theme(yellowDarkHighContrastScheme());
336336
}
337337

338+
static ColorScheme orangeLightScheme() {
339+
return const ColorScheme(
340+
brightness: Brightness.light,
341+
primary: Color(0xff8f4c38),
342+
surfaceTint: Color(0xff8f4c38),
343+
onPrimary: Color(0xffffffff),
344+
primaryContainer: Color(0xffffdbd1),
345+
onPrimaryContainer: Color(0xff723523),
346+
secondary: Color(0xff77574e),
347+
onSecondary: Color(0xffffffff),
348+
secondaryContainer: Color(0xffffdbd1),
349+
onSecondaryContainer: Color(0xff5d4037),
350+
tertiary: Color(0xff6c5d2f),
351+
onTertiary: Color(0xffffffff),
352+
tertiaryContainer: Color(0xfff5e1a7),
353+
onTertiaryContainer: Color(0xff534619),
354+
error: Color(0xffba1a1a),
355+
onError: Color(0xffffffff),
356+
errorContainer: Color(0xffffdad6),
357+
onErrorContainer: Color(0xff93000a),
358+
surface: Color(0xfffff8f6),
359+
onSurface: Color(0xff231917),
360+
onSurfaceVariant: Color(0xff53433f),
361+
outline: Color(0xff85736e),
362+
outlineVariant: Color(0xffd8c2bc),
363+
shadow: Color(0xff000000),
364+
scrim: Color(0xff000000),
365+
inverseSurface: Color(0xff392e2b),
366+
inversePrimary: Color(0xffffb5a0),
367+
primaryFixed: Color(0xffffdbd1),
368+
onPrimaryFixed: Color(0xff3a0b01),
369+
primaryFixedDim: Color(0xffffb5a0),
370+
onPrimaryFixedVariant: Color(0xff723523),
371+
secondaryFixed: Color(0xffffdbd1),
372+
onSecondaryFixed: Color(0xff2c150f),
373+
secondaryFixedDim: Color(0xffe7bdb2),
374+
onSecondaryFixedVariant: Color(0xff5d4037),
375+
tertiaryFixed: Color(0xfff5e1a7),
376+
onTertiaryFixed: Color(0xff231b00),
377+
tertiaryFixedDim: Color(0xffd8c58d),
378+
onTertiaryFixedVariant: Color(0xff534619),
379+
surfaceDim: Color(0xffe8d6d2),
380+
surfaceBright: Color(0xfffff8f6),
381+
surfaceContainerLowest: Color(0xffffffff),
382+
surfaceContainerLow: Color(0xfffff1ed),
383+
surfaceContainer: Color(0xfffceae5),
384+
surfaceContainerHigh: Color(0xfff7e4e0),
385+
surfaceContainerHighest: Color(0xfff1dfda),
386+
);
387+
}
388+
389+
ThemeData orangeLight() {
390+
return theme(orangeLightScheme());
391+
}
392+
393+
static ColorScheme orangeLightMediumContrastScheme() {
394+
return const ColorScheme(
395+
brightness: Brightness.light,
396+
primary: Color(0xff5d2514),
397+
surfaceTint: Color(0xff8f4c38),
398+
onPrimary: Color(0xffffffff),
399+
primaryContainer: Color(0xffa15a45),
400+
onPrimaryContainer: Color(0xffffffff),
401+
secondary: Color(0xff4b2f28),
402+
onSecondary: Color(0xffffffff),
403+
secondaryContainer: Color(0xff87655c),
404+
onSecondaryContainer: Color(0xffffffff),
405+
tertiary: Color(0xff41350a),
406+
onTertiary: Color(0xffffffff),
407+
tertiaryContainer: Color(0xff7b6c3c),
408+
onTertiaryContainer: Color(0xffffffff),
409+
error: Color(0xff740006),
410+
onError: Color(0xffffffff),
411+
errorContainer: Color(0xffcf2c27),
412+
onErrorContainer: Color(0xffffffff),
413+
surface: Color(0xfffff8f6),
414+
onSurface: Color(0xff180f0d),
415+
onSurfaceVariant: Color(0xff41332f),
416+
outline: Color(0xff5f4f4a),
417+
outlineVariant: Color(0xff7b6964),
418+
shadow: Color(0xff000000),
419+
scrim: Color(0xff000000),
420+
inverseSurface: Color(0xff392e2b),
421+
inversePrimary: Color(0xffffb5a0),
422+
primaryFixed: Color(0xffa15a45),
423+
onPrimaryFixed: Color(0xffffffff),
424+
primaryFixedDim: Color(0xff84422f),
425+
onPrimaryFixedVariant: Color(0xffffffff),
426+
secondaryFixed: Color(0xff87655c),
427+
onSecondaryFixed: Color(0xffffffff),
428+
secondaryFixedDim: Color(0xff6d4d45),
429+
onSecondaryFixedVariant: Color(0xffffffff),
430+
tertiaryFixed: Color(0xff7b6c3c),
431+
onTertiaryFixed: Color(0xffffffff),
432+
tertiaryFixedDim: Color(0xff615426),
433+
onTertiaryFixedVariant: Color(0xffffffff),
434+
surfaceDim: Color(0xffd4c3be),
435+
surfaceBright: Color(0xfffff8f6),
436+
surfaceContainerLowest: Color(0xffffffff),
437+
surfaceContainerLow: Color(0xfffff1ed),
438+
surfaceContainer: Color(0xfff7e4e0),
439+
surfaceContainerHigh: Color(0xffebd9d4),
440+
surfaceContainerHighest: Color(0xffdfcec9),
441+
);
442+
}
443+
444+
ThemeData orangeLightMediumContrast() {
445+
return theme(orangeLightMediumContrastScheme());
446+
}
447+
448+
static ColorScheme orangeLightHighContrastScheme() {
449+
return const ColorScheme(
450+
brightness: Brightness.light,
451+
primary: Color(0xff501b0b),
452+
surfaceTint: Color(0xff8f4c38),
453+
onPrimary: Color(0xffffffff),
454+
primaryContainer: Color(0xff753725),
455+
onPrimaryContainer: Color(0xffffffff),
456+
secondary: Color(0xff3f261e),
457+
onSecondary: Color(0xffffffff),
458+
secondaryContainer: Color(0xff60423a),
459+
onSecondaryContainer: Color(0xffffffff),
460+
tertiary: Color(0xff362b02),
461+
onTertiary: Color(0xffffffff),
462+
tertiaryContainer: Color(0xff55481c),
463+
onTertiaryContainer: Color(0xffffffff),
464+
error: Color(0xff600004),
465+
onError: Color(0xffffffff),
466+
errorContainer: Color(0xff98000a),
467+
onErrorContainer: Color(0xffffffff),
468+
surface: Color(0xfffff8f6),
469+
onSurface: Color(0xff000000),
470+
onSurfaceVariant: Color(0xff000000),
471+
outline: Color(0xff372925),
472+
outlineVariant: Color(0xff554641),
473+
shadow: Color(0xff000000),
474+
scrim: Color(0xff000000),
475+
inverseSurface: Color(0xff392e2b),
476+
inversePrimary: Color(0xffffb5a0),
477+
primaryFixed: Color(0xff753725),
478+
onPrimaryFixed: Color(0xffffffff),
479+
primaryFixedDim: Color(0xff592111),
480+
onPrimaryFixedVariant: Color(0xffffffff),
481+
secondaryFixed: Color(0xff60423a),
482+
onSecondaryFixed: Color(0xffffffff),
483+
secondaryFixedDim: Color(0xff472c24),
484+
onSecondaryFixedVariant: Color(0xffffffff),
485+
tertiaryFixed: Color(0xff55481c),
486+
onTertiaryFixed: Color(0xffffffff),
487+
tertiaryFixedDim: Color(0xff3d3206),
488+
onTertiaryFixedVariant: Color(0xffffffff),
489+
surfaceDim: Color(0xffc6b5b1),
490+
surfaceBright: Color(0xfffff8f6),
491+
surfaceContainerLowest: Color(0xffffffff),
492+
surfaceContainerLow: Color(0xffffede8),
493+
surfaceContainer: Color(0xfff1dfda),
494+
surfaceContainerHigh: Color(0xffe2d1cc),
495+
surfaceContainerHighest: Color(0xffd4c3be),
496+
);
497+
}
498+
499+
ThemeData orangeLightHighContrast() {
500+
return theme(orangeLightHighContrastScheme());
501+
}
502+
503+
static ColorScheme orangeDarkScheme() {
504+
return const ColorScheme(
505+
brightness: Brightness.dark,
506+
primary: Color(0xffffb5a0),
507+
surfaceTint: Color(0xffffb5a0),
508+
onPrimary: Color(0xff561f0f),
509+
primaryContainer: Color(0xff723523),
510+
onPrimaryContainer: Color(0xffffdbd1),
511+
secondary: Color(0xffe7bdb2),
512+
onSecondary: Color(0xff442a22),
513+
secondaryContainer: Color(0xff5d4037),
514+
onSecondaryContainer: Color(0xffffdbd1),
515+
tertiary: Color(0xffd8c58d),
516+
onTertiary: Color(0xff3b2f05),
517+
tertiaryContainer: Color(0xff534619),
518+
onTertiaryContainer: Color(0xfff5e1a7),
519+
error: Color(0xffffb4ab),
520+
onError: Color(0xff690005),
521+
errorContainer: Color(0xff93000a),
522+
onErrorContainer: Color(0xffffdad6),
523+
surface: Color(0xff1a110f),
524+
onSurface: Color(0xfff1dfda),
525+
onSurfaceVariant: Color(0xffd8c2bc),
526+
outline: Color(0xffa08c87),
527+
outlineVariant: Color(0xff53433f),
528+
shadow: Color(0xff000000),
529+
scrim: Color(0xff000000),
530+
inverseSurface: Color(0xfff1dfda),
531+
inversePrimary: Color(0xff8f4c38),
532+
primaryFixed: Color(0xffffdbd1),
533+
onPrimaryFixed: Color(0xff3a0b01),
534+
primaryFixedDim: Color(0xffffb5a0),
535+
onPrimaryFixedVariant: Color(0xff723523),
536+
secondaryFixed: Color(0xffffdbd1),
537+
onSecondaryFixed: Color(0xff2c150f),
538+
secondaryFixedDim: Color(0xffe7bdb2),
539+
onSecondaryFixedVariant: Color(0xff5d4037),
540+
tertiaryFixed: Color(0xfff5e1a7),
541+
onTertiaryFixed: Color(0xff231b00),
542+
tertiaryFixedDim: Color(0xffd8c58d),
543+
onTertiaryFixedVariant: Color(0xff534619),
544+
surfaceDim: Color(0xff1a110f),
545+
surfaceBright: Color(0xff423734),
546+
surfaceContainerLowest: Color(0xff140c0a),
547+
surfaceContainerLow: Color(0xff231917),
548+
surfaceContainer: Color(0xff271d1b),
549+
surfaceContainerHigh: Color(0xff322825),
550+
surfaceContainerHighest: Color(0xff3d322f),
551+
);
552+
}
553+
554+
ThemeData orangeDark() {
555+
return theme(orangeDarkScheme());
556+
}
557+
558+
static ColorScheme orangeDarkMediumContrastScheme() {
559+
return const ColorScheme(
560+
brightness: Brightness.dark,
561+
primary: Color(0xffffd2c6),
562+
surfaceTint: Color(0xffffb5a0),
563+
onPrimary: Color(0xff481506),
564+
primaryContainer: Color(0xffcb7c65),
565+
onPrimaryContainer: Color(0xff000000),
566+
secondary: Color(0xfffed3c7),
567+
onSecondary: Color(0xff381f18),
568+
secondaryContainer: Color(0xffae887e),
569+
onSecondaryContainer: Color(0xff000000),
570+
tertiary: Color(0xffefdba1),
571+
onTertiary: Color(0xff2f2500),
572+
tertiaryContainer: Color(0xffa0905c),
573+
onTertiaryContainer: Color(0xff000000),
574+
error: Color(0xffffd2cc),
575+
onError: Color(0xff540003),
576+
errorContainer: Color(0xffff5449),
577+
onErrorContainer: Color(0xff000000),
578+
surface: Color(0xff1a110f),
579+
onSurface: Color(0xffffffff),
580+
onSurfaceVariant: Color(0xffeed7d1),
581+
outline: Color(0xffc2ada8),
582+
outlineVariant: Color(0xffa08c87),
583+
shadow: Color(0xff000000),
584+
scrim: Color(0xff000000),
585+
inverseSurface: Color(0xfff1dfda),
586+
inversePrimary: Color(0xff743624),
587+
primaryFixed: Color(0xffffdbd1),
588+
onPrimaryFixed: Color(0xff280500),
589+
primaryFixedDim: Color(0xffffb5a0),
590+
onPrimaryFixedVariant: Color(0xff5d2514),
591+
secondaryFixed: Color(0xffffdbd1),
592+
onSecondaryFixed: Color(0xff200b06),
593+
secondaryFixedDim: Color(0xffe7bdb2),
594+
onSecondaryFixedVariant: Color(0xff4b2f28),
595+
tertiaryFixed: Color(0xfff5e1a7),
596+
onTertiaryFixed: Color(0xff171100),
597+
tertiaryFixedDim: Color(0xffd8c58d),
598+
onTertiaryFixedVariant: Color(0xff41350a),
599+
surfaceDim: Color(0xff1a110f),
600+
surfaceBright: Color(0xff4e423f),
601+
surfaceContainerLowest: Color(0xff0d0604),
602+
surfaceContainerLow: Color(0xff251b19),
603+
surfaceContainer: Color(0xff302623),
604+
surfaceContainerHigh: Color(0xff3b302d),
605+
surfaceContainerHighest: Color(0xff463b38),
606+
);
607+
}
608+
609+
ThemeData orangeDarkMediumContrast() {
610+
return theme(orangeDarkMediumContrastScheme());
611+
}
612+
613+
static ColorScheme orangeDarkHighContrastScheme() {
614+
return const ColorScheme(
615+
brightness: Brightness.dark,
616+
primary: Color(0xffffece7),
617+
surfaceTint: Color(0xffffb5a0),
618+
onPrimary: Color(0xff000000),
619+
primaryContainer: Color(0xffffaf98),
620+
onPrimaryContainer: Color(0xff1e0300),
621+
secondary: Color(0xffffece7),
622+
onSecondary: Color(0xff000000),
623+
secondaryContainer: Color(0xffe3b9ae),
624+
onSecondaryContainer: Color(0xff190603),
625+
tertiary: Color(0xffffefc4),
626+
onTertiary: Color(0xff000000),
627+
tertiaryContainer: Color(0xffd4c289),
628+
onTertiaryContainer: Color(0xff100b00),
629+
error: Color(0xffffece9),
630+
onError: Color(0xff000000),
631+
errorContainer: Color(0xffffaea4),
632+
onErrorContainer: Color(0xff220001),
633+
surface: Color(0xff1a110f),
634+
onSurface: Color(0xffffffff),
635+
onSurfaceVariant: Color(0xffffffff),
636+
outline: Color(0xffffece7),
637+
outlineVariant: Color(0xffd4beb8),
638+
shadow: Color(0xff000000),
639+
scrim: Color(0xff000000),
640+
inverseSurface: Color(0xfff1dfda),
641+
inversePrimary: Color(0xff743624),
642+
primaryFixed: Color(0xffffdbd1),
643+
onPrimaryFixed: Color(0xff000000),
644+
primaryFixedDim: Color(0xffffb5a0),
645+
onPrimaryFixedVariant: Color(0xff280500),
646+
secondaryFixed: Color(0xffffdbd1),
647+
onSecondaryFixed: Color(0xff000000),
648+
secondaryFixedDim: Color(0xffe7bdb2),
649+
onSecondaryFixedVariant: Color(0xff200b06),
650+
tertiaryFixed: Color(0xfff5e1a7),
651+
onTertiaryFixed: Color(0xff000000),
652+
tertiaryFixedDim: Color(0xffd8c58d),
653+
onTertiaryFixedVariant: Color(0xff171100),
654+
surfaceDim: Color(0xff1a110f),
655+
surfaceBright: Color(0xff5a4d4a),
656+
surfaceContainerLowest: Color(0xff000000),
657+
surfaceContainerLow: Color(0xff271d1b),
658+
surfaceContainer: Color(0xff392e2b),
659+
surfaceContainerHigh: Color(0xff443936),
660+
surfaceContainerHighest: Color(0xff504441),
661+
);
662+
}
663+
664+
ThemeData orangeDarkHighContrast() {
665+
return theme(orangeDarkHighContrastScheme());
666+
}
667+
338668
ThemeData theme(ColorScheme colorScheme) => ThemeData(
339669
useMaterial3: true,
340670
brightness: colorScheme.brightness,

0 commit comments

Comments
 (0)