Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

feat: add lemonade theme color (#3666)

Yijing Huang7a24f6b6f036
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart
index 1d9125eb36..582109a5d3 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/colorscheme.dart
@@ -6,6 +6,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'default_colorscheme.dart';
import 'dandelion.dart';
import 'lavender.dart';
+import 'lemonade.dart';
part 'colorscheme.g.dart';
@@ -23,6 +24,10 @@ const Map<String, List<FlowyColorScheme>> themeMap = {
DandelionColorScheme.light(),
DandelionColorScheme.dark(),
],
+ BuiltInTheme.lemonade: [
+ LemonadeColorScheme.light(),
+ LemonadeColorScheme.dark(),
+ ],
BuiltInTheme.lavender: [
LavenderColorScheme.light(),
LavenderColorScheme.dark(),
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
index 9814728650..efb93bbc27 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
@@ -112,7 +112,7 @@ class DandelionColorScheme extends FlowyColorScheme {
main1: _darkMain1,
main2: _darkMain1,
shadow: const Color(0xff0F131C),
- sidebarBg: const Color(0xff232B38),
+ sidebarBg: const Color(0xff25300e),
divider: _darkShader3,
topbarBg: _darkShader1,
icon: _darkShader5,
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lemonade.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lemonade.dart
new file mode 100644
index 0000000000..5d6743d530
--- /dev/null
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/lemonade.dart
@@ -0,0 +1,137 @@
+import 'package:flutter/material.dart';
+
+import 'colorscheme.dart';
+
+const _black = Color(0xff000000);
+const _white = Color(0xFFFFFFFF);
+const _lightBg1 = Color(0xFFFFD13E);
+const _lightShader1 = Color(0xff333333);
+const _lightShader3 = Color(0xff828282);
+const _lightShader5 = Color(0xffe0e0e0);
+const _lightShader6 = Color(0xfff2f2f2);
+const _lightDandelionYellow = Color(0xffffcb00);
+const _lightDandelionLightYellow = Color(0xffffdf66);
+const _lightTint9 = Color(0xffe1fbff);
+
+const _darkShader1 = Color(0xff131720);
+const _darkShader2 = Color(0xff1A202C);
+const _darkShader3 = Color(0xff363D49);
+const _darkShader5 = Color(0xffBBC3CD);
+const _darkShader6 = Color(0xffF2F2F2);
+const _darkMain1 = Color(0xffffcb00);
+const _darkInput = Color(0xff282E3A);
+
+// Derive from [DandelionColorScheme]
+// Use a light yellow color in the sidebar intead of a green color in Dandelion
+// Some field name are still included 'Dandelion' to indicate they are the same color as the one in Dandelion
+class LemonadeColorScheme extends FlowyColorScheme {
+ const LemonadeColorScheme.light()
+ : super(
+ surface: Colors.white,
+ hover: const Color(0xFFe0f8ff),
+ // hover effect on setting value
+ selector: _lightDandelionLightYellow,
+ red: const Color(0xfffb006d),
+ yellow: const Color(0xffffd667),
+ green: const Color(0xff66cf80),
+ shader1: const Color(0xff333333),
+ shader2: const Color(0xff4f4f4f),
+ shader3: const Color(0xff828282),
+ // disable text color
+ shader4: const Color(0xffbdbdbd),
+ shader5: _lightShader5,
+ shader6: const Color(0xfff2f2f2),
+ shader7: _black,
+ bg1: _lightBg1,
+ bg2: const Color(0xffedeef2),
+ // Hover color on trash button
+ bg3: _lightDandelionYellow,
+ bg4: const Color(0xff2c144b),
+ tint1: const Color(0xffe8e0ff),
+ tint2: const Color(0xffffe7fd),
+ tint3: const Color(0xffffe7ee),
+ tint4: const Color(0xffffefe3),
+ tint5: const Color(0xfffff2cd),
+ tint6: const Color(0xfff5ffdc),
+ tint7: const Color(0xffddffd6),
+ tint8: const Color(0xffdefff1),
+ tint9: _lightTint9,
+ main1: _lightDandelionYellow,
+ // cursor color
+ main2: _lightDandelionYellow,
+ shadow: _black,
+ sidebarBg: const Color(0xfffaf0c8),
+ divider: _lightShader6,
+ topbarBg: _white,
+ icon: _lightShader1,
+ text: _lightShader1,
+ input: _white,
+ hint: _lightShader3,
+ primary: _lightDandelionYellow,
+ onPrimary: _white,
+ // hover color in sidebar
+ hoverBG1: _lightDandelionYellow,
+ // tool bar hover color
+ hoverBG2: _lightDandelionLightYellow,
+ hoverBG3: _lightShader6,
+ hoverFG: _lightShader1,
+ questionBubbleBG: _lightDandelionLightYellow,
+ progressBarBGColor: _lightTint9,
+ toolbarColor: _lightShader1,
+ toggleButtonBGColor: _lightDandelionYellow,
+ calendarWeekendBGColor: const Color(0xFFFBFBFC),
+ gridRowCountColor: _black,
+ );
+
+ const LemonadeColorScheme.dark()
+ : super(
+ surface: const Color(0xff292929),
+ hover: const Color(0xff1f1f1f),
+ selector: const Color(0xff333333),
+ red: const Color(0xfffb006d),
+ yellow: const Color(0xffffd667),
+ green: const Color(0xff66cf80),
+ shader1: _white,
+ shader2: _darkShader2,
+ shader3: const Color(0xff828282),
+ shader4: const Color(0xffbdbdbd),
+ shader5: _darkShader5,
+ shader6: _darkShader6,
+ shader7: _white,
+ bg1: const Color(0xFFD5A200),
+ bg2: _black,
+ bg3: _darkMain1,
+ bg4: const Color(0xff2c144b),
+ tint1: const Color(0x4d9327FF),
+ tint2: const Color(0x66FC0088),
+ tint3: const Color(0x4dFC00E2),
+ tint4: const Color(0x80BE5B00),
+ tint5: const Color(0x33F8EE00),
+ tint6: const Color(0x4d6DC300),
+ tint7: const Color(0x5900BD2A),
+ tint8: const Color(0x80008890),
+ tint9: const Color(0x4d0029FF),
+ main1: _darkMain1,
+ main2: _darkMain1,
+ shadow: _black,
+ sidebarBg: const Color(0xff232B38),
+ divider: _darkShader3,
+ topbarBg: _darkShader1,
+ icon: _darkShader5,
+ text: _darkShader5,
+ input: _darkInput,
+ hint: _darkShader5,
+ primary: _darkMain1,
+ onPrimary: _darkShader1,
+ hoverBG1: _darkMain1,
+ hoverBG2: _darkMain1,
+ hoverBG3: _darkShader3,
+ hoverFG: _darkShader1,
+ questionBubbleBG: _darkShader3,
+ progressBarBGColor: _darkShader3,
+ toolbarColor: _darkInput,
+ toggleButtonBGColor: _darkShader1,
+ calendarWeekendBGColor: const Color(0xff121212),
+ gridRowCountColor: _darkMain1,
+ );
+}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/theme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/theme.dart
index 8b1b8994b6..a79ce01107 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/theme.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/theme.dart
@@ -5,6 +5,7 @@ import 'plugins/service/plugin_service.dart';
class BuiltInTheme {
static const String defaultTheme = 'Default';
static const String dandelion = 'Dandelion';
+ static const String lemonade = 'Lemonade';
static const String lavender = 'Lavender';
}
diff --git a/frontend/appflowy_flutter/test/unit_test/theme/theme_test.dart b/frontend/appflowy_flutter/test/unit_test/theme/theme_test.dart
index b4560360f0..405e10a6af 100644
--- a/frontend/appflowy_flutter/test/unit_test/theme/theme_test.dart
+++ b/frontend/appflowy_flutter/test/unit_test/theme/theme_test.dart
@@ -47,6 +47,7 @@ void main() {
BuiltInTheme.defaultTheme,
BuiltInTheme.dandelion,
BuiltInTheme.lavender,
+ BuiltInTheme.lemonade,
]),
);
expect(theme.lightTheme, isA<FlowyColorScheme>());