Skip to content

Commit 70b2570

Browse files
committed
Default Flet color theme
1 parent 82e04d7 commit 70b2570

File tree

4 files changed

+74
-4
lines changed

4 files changed

+74
-4
lines changed

client/lib/controls/page.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import '../models/app_state.dart';
77
import '../models/control.dart';
88
import '../models/control_children_view_model.dart';
99
import '../utils/alignment.dart';
10+
import '../utils/color_theme.dart';
1011
import '../utils/colors.dart';
1112
import '../utils/edge_insets.dart';
1213
import '../utils/theme.dart';
@@ -71,14 +72,15 @@ class PageControl extends StatelessWidget {
7172
// theme
7273
var theme = parseTheme(control, "theme") ??
7374
ThemeData(
74-
colorSchemeSeed: const Color.fromARGB(255, 0, 152, 218),
75+
colorScheme: lightColorScheme,
7576
brightness: Brightness.light,
7677
useMaterial3: true,
7778
visualDensity: VisualDensity.adaptivePlatformDensity);
7879

7980
var darkTheme = parseTheme(control, "darkTheme") ??
8081
ThemeData(
81-
colorSchemeSeed: const Color.fromARGB(255, 104, 192, 233),
82+
//colorSchemeSeed: const Color.fromARGB(255, 104, 192, 233),
83+
colorScheme: darkColorScheme,
8284
brightness: Brightness.dark,
8385
useMaterial3: true,
8486
visualDensity: VisualDensity.adaptivePlatformDensity);

client/lib/utils/color_theme.dart

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
import 'package:flutter/material.dart';
2+
3+
// https://material-foundation.github.io/material-theme-builder/#/custom
4+
5+
const seed = Color(0xFF6750A4);
6+
7+
const lightColorScheme = ColorScheme(
8+
brightness: Brightness.light,
9+
primary: Color(0xFF006496),
10+
onPrimary: Color(0xFFFFFFFF),
11+
primaryContainer: Color(0xFFC9E6FF),
12+
onPrimaryContainer: Color(0xFF001E31),
13+
secondary: Color(0xFFBE0041),
14+
onSecondary: Color(0xFFFFFFFF),
15+
secondaryContainer: Color(0xFFFFDADE),
16+
onSecondaryContainer: Color(0xFF400010),
17+
tertiary: Color(0xFF00696F),
18+
onTertiary: Color(0xFFFFFFFF),
19+
tertiaryContainer: Color(0xFF70F6FF),
20+
onTertiaryContainer: Color(0xFF002022),
21+
error: Color(0xFFB3261E),
22+
errorContainer: Color(0xFFF9DEDC),
23+
onError: Color(0xFFFFFFFF),
24+
onErrorContainer: Color(0xFF410E0B),
25+
background: Color(0xFFFFFBFE),
26+
onBackground: Color(0xFF1C1B1F),
27+
surface: Color(0xFFFFFBFE),
28+
onSurface: Color(0xFF1C1B1F),
29+
surfaceVariant: Color(0xFFE7E0EC),
30+
onSurfaceVariant: Color(0xFF49454F),
31+
outline: Color(0xFF79747E),
32+
onInverseSurface: Color(0xFFF4EFF4),
33+
inverseSurface: Color(0xFF313033),
34+
inversePrimary: Color(0xFF8BCDFF),
35+
shadow: Color(0xFF000000),
36+
);
37+
38+
const darkColorScheme = ColorScheme(
39+
brightness: Brightness.dark,
40+
primary: Color(0xFF8BCDFF),
41+
onPrimary: Color(0xFF003350),
42+
primaryContainer: Color(0xFF004B72),
43+
onPrimaryContainer: Color(0xFFC9E6FF),
44+
secondary: Color(0xFFFFB2BC),
45+
onSecondary: Color(0xFF67001F),
46+
secondaryContainer: Color(0xFF91002F),
47+
onSecondaryContainer: Color(0xFFFFDADE),
48+
tertiary: Color(0xFF4DD9E2),
49+
onTertiary: Color(0xFF00363A),
50+
tertiaryContainer: Color(0xFF004F54),
51+
onTertiaryContainer: Color(0xFF70F6FF),
52+
error: Color(0xFFF2B8B5),
53+
errorContainer: Color(0xFF8C1D18),
54+
onError: Color(0xFF601410),
55+
onErrorContainer: Color(0xFFF9DEDC),
56+
background: Color(0xFF1C1B1F),
57+
onBackground: Color(0xFFE6E1E5),
58+
surface: Color(0xFF1C1B1F),
59+
onSurface: Color(0xFFE6E1E5),
60+
surfaceVariant: Color(0xFF49454F),
61+
onSurfaceVariant: Color(0xFFCAC4D0),
62+
outline: Color(0xFF938F99),
63+
onInverseSurface: Color(0xFF1C1B1F),
64+
inverseSurface: Color(0xFFE6E1E5),
65+
inversePrimary: Color(0xFF006496),
66+
shadow: Color(0xFF000000),
67+
);

sdk/python/playground/icons-browser.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
def main(page: Page):
4242
page.title = "Flet icons browser"
43+
page.theme_mode = "light"
4344

4445
search_txt = TextField(expand=1, hint_text="Enter keyword and press search button")
4546
search_results = GridView(
@@ -84,7 +85,7 @@ def display_icons(search_term: str):
8485
# selectable=True,
8586
text_align="center",
8687
overflow="fade",
87-
color=colors.BLACK87,
88+
color=colors.ON_SURFACE_VARIANT,
8889
),
8990
],
9091
spacing=5,

sdk/python/playground/todo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,4 @@ def main(page: Page):
177177
page.add(app.view)
178178

179179

180-
flet.app(name="test1", port=8550, target=main, view=flet.FLET_APP)
180+
flet.app(name="test1", port=8550, target=main, view=flet.WEB_BROWSER)

0 commit comments

Comments
 (0)