Skip to content

Commit

Permalink
yaru_accents: add prussianGreen and sage (#141)
Browse files Browse the repository at this point in the history 
* yaru_accents: add prussianGreen and sage

* Adapt ColorsView and screenshots
  • Loading branch information
@Feichtmeier
Feichtmeier committed Mar 18, 2022
1 parent db2d439 commit 0758278
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 28 deletions.
Binary file modified doc/readme/screenshot_dark.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/readme/screenshot_light.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion example/lib/view/color_disk.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ColorDisk extends StatelessWidget {
@override
Widget build(BuildContext context) {
return SizedBox(
width: 50,
width: 42,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: TextButton(
Expand Down
19 changes: 17 additions & 2 deletions example/lib/view/colors_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ColorsView extends StatelessWidget {
Expanded(child: colorPaletteExample('bark', barkMaterialColor)),
],
),
Divider(height: 50.0, color: Colors.black),
Divider(height: 50.0),
Row(
children: [
Expanded(
Expand All @@ -30,14 +30,29 @@ class ColorsView extends StatelessWidget {
Expanded(child: colorPaletteExample('red', lightRedMaterialColor)),
],
),
Divider(height: 50.0, color: Colors.black),
Divider(height: 50.0),
Row(
children: [
Expanded(child: colorPaletteExample('blue', blueMaterialColor)),
SizedBox(width: 25.0),
Expanded(
child: colorPaletteExample('magenta', magentaMaterialColor)),
SizedBox(width: 25.0),
Expanded(
child: colorPaletteExample('sageMaterial', sageMaterialColor)),
],
),
Divider(height: 50.0),
Row(
children: [
Expanded(
child: colorPaletteExample(
'prussianGreen', prussianGreenMaterialColor)),
SizedBox(width: 25.0),
Expanded(
child: colorPaletteExample(
'jet', YaruColors.createMaterialColor(YaruColors.jet))),
SizedBox(width: 25.0),
Expanded(
child: colorPaletteExample('warmGrey', YaruColors.warmGrey)),
],
Expand Down
51 changes: 33 additions & 18 deletions example/lib/view/home_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,27 @@ class _HomePageState extends State<HomePage> {
lightTheme.value = yaruLight;
darkTheme.value = yaruDark;
}),
ColorDisk(
color: YaruColors.olive,
selected: Theme.of(context).primaryColor == oliveMaterialColor,
onPressed: () {
lightTheme.value = yaruOliveLight;
darkTheme.value = yaruOliveDark;
}),
ColorDisk(
color: YaruColors.bark,
selected: Theme.of(context).primaryColor == barkMaterialColor,
onPressed: () {
lightTheme.value = yaruBarkLight;
darkTheme.value = yaruBarkDark;
}),
ColorDisk(
color: YaruColors.sage,
selected: Theme.of(context).primaryColor == sageMaterialColor,
onPressed: () {
lightTheme.value = yaruSageLight;
darkTheme.value = yaruSageDark;
}),
ColorDisk(
color: YaruColors.olive,
selected: Theme.of(context).primaryColor == oliveMaterialColor,
onPressed: () {
lightTheme.value = yaruOliveLight;
darkTheme.value = yaruOliveDark;
}),
ColorDisk(
color: YaruColors.viridian,
selected: Theme.of(context).primaryColor == viridianMaterialColor,
Expand All @@ -94,18 +101,12 @@ class _HomePageState extends State<HomePage> {
darkTheme.value = yaruViridianDark;
}),
ColorDisk(
color: YaruColors.purple,
selected: Theme.of(context).primaryColor == purpleMaterialColor,
onPressed: () {
lightTheme.value = yaruPurpleLight;
darkTheme.value = yaruPurpleDark;
}),
ColorDisk(
color: YaruColors.lightRed,
selected: Theme.of(context).primaryColor == lightRedMaterialColor,
color: YaruColors.prussianGreen,
selected:
Theme.of(context).primaryColor == prussianGreenMaterialColor,
onPressed: () {
lightTheme.value = yaruRedLight;
darkTheme.value = yaruRedDark;
lightTheme.value = yaruPrussianGreenLight;
darkTheme.value = yaruPrussianGreenDark;
}),
ColorDisk(
color: YaruColors.blue,
Expand All @@ -114,13 +115,27 @@ class _HomePageState extends State<HomePage> {
lightTheme.value = yaruBlueLight;
darkTheme.value = yaruBlueDark;
}),
ColorDisk(
color: YaruColors.purple,
selected: Theme.of(context).primaryColor == purpleMaterialColor,
onPressed: () {
lightTheme.value = yaruPurpleLight;
darkTheme.value = yaruPurpleDark;
}),
ColorDisk(
color: YaruColors.magenta,
selected: Theme.of(context).primaryColor == magentaMaterialColor,
onPressed: () {
lightTheme.value = yarMagentaLight;
darkTheme.value = yaruMagentaDark;
}),
ColorDisk(
color: YaruColors.lightRed,
selected: Theme.of(context).primaryColor == lightRedMaterialColor,
onPressed: () {
lightTheme.value = yaruRedLight;
darkTheme.value = yaruRedDark;
}),
SizedBox(
width: 20,
),
Expand Down
16 changes: 9 additions & 7 deletions lib/src/colors/yaru_colors.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ class YaruColors {
static const Color porcelain = Color(0xFFFAFAFA);
static const Color inkstone = Color(0xFF3B3B3B);
static const Color jet = Color(0xFF2B2B2B);
static const olive = Color(0xFF4B8501);
static const bark = Color(0xFF787859);
static const viridian = Color(0xFF03875B);
static const purple = Color(0xFF8856EB);
static const lightRed = Color(0xFFE61D34);
static const blue = Color(0xFF0073E5);
static const magenta = Color(0xFFBC33DB);
static const Color olive = Color(0xFF4B8501);
static const Color bark = Color(0xFF787859);
static const Color sage = Color(0xFF657B69);
static const Color prussianGreen = Color(0xFF308280);
static const Color viridian = Color(0xFF03875B);
static const Color purple = Color(0xFF8856EB);
static const Color lightRed = Color(0xFFE61D34);
static const Color blue = Color(0xFF0073E5);
static const Color magenta = Color(0xFFBC33DB);

static MaterialColor createMaterialColor(Color color) {
List strengths = <double>[.05];
Expand Down
55 changes: 55 additions & 0 deletions lib/src/themes/yaru_accents.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import 'package:yaru/src/themes/common_themes.dart';

final oliveMaterialColor = YaruColors.createMaterialColor(YaruColors.olive);
final barkMaterialColor = YaruColors.createMaterialColor(YaruColors.bark);
final sageMaterialColor = YaruColors.createMaterialColor(YaruColors.sage);
final prussianGreenMaterialColor =
YaruColors.createMaterialColor(YaruColors.prussianGreen);
final viridianMaterialColor =
YaruColors.createMaterialColor(YaruColors.viridian);
final purpleMaterialColor = YaruColors.createMaterialColor(YaruColors.purple);
Expand All @@ -12,6 +15,58 @@ final lightRedMaterialColor =
final blueMaterialColor = YaruColors.createMaterialColor(YaruColors.blue);
final magentaMaterialColor = YaruColors.createMaterialColor(YaruColors.magenta);

final yaruSageLight = createYaruLightTheme(
colorScheme: ColorScheme.fromSwatch(
primarySwatch: sageMaterialColor,
primaryColorDark: YaruColors.coolGrey,
accentColor: YaruColors.sage,
cardColor: Colors.white,
backgroundColor: YaruColors.porcelain,
errorColor: YaruColors.red,
brightness: Brightness.light,
),
primaryColor: sageMaterialColor,
);

final yaruSageDark = createYaruDarkTheme(
colorScheme: ColorScheme.fromSwatch(
primarySwatch: sageMaterialColor,
primaryColorDark: YaruColors.coolGrey,
accentColor: YaruColors.sage,
cardColor: YaruColors.jet,
backgroundColor: YaruColors.jet,
errorColor: YaruColors.red,
brightness: Brightness.dark,
),
primaryColor: sageMaterialColor,
);

final yaruPrussianGreenLight = createYaruLightTheme(
colorScheme: ColorScheme.fromSwatch(
primarySwatch: prussianGreenMaterialColor,
primaryColorDark: YaruColors.coolGrey,
accentColor: YaruColors.prussianGreen,
cardColor: Colors.white,
backgroundColor: YaruColors.porcelain,
errorColor: YaruColors.red,
brightness: Brightness.light,
),
primaryColor: prussianGreenMaterialColor,
);

final yaruPrussianGreenDark = createYaruDarkTheme(
colorScheme: ColorScheme.fromSwatch(
primarySwatch: prussianGreenMaterialColor,
primaryColorDark: YaruColors.coolGrey,
accentColor: YaruColors.prussianGreen,
cardColor: YaruColors.jet,
backgroundColor: YaruColors.jet,
errorColor: YaruColors.red,
brightness: Brightness.dark,
),
primaryColor: prussianGreenMaterialColor,
);

final yaruOliveLight = createYaruLightTheme(
colorScheme: ColorScheme.fromSwatch(
primarySwatch: oliveMaterialColor,
Expand Down

0 comments on commit 0758278

Please sign in to comment.