Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin UI: Setup enmeshed design #581

Merged
merged 15 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
51 changes: 43 additions & 8 deletions AdminUi/apps/admin_ui/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import 'package:admin_ui/theme/colors/color_schemes.dart';
import 'package:admin_ui/theme/colors/custom_color.dart';
import 'package:admin_ui/theme/theme_manager.dart';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';

import 'home/home.dart';
import 'pages/pages.dart';
Expand All @@ -10,7 +15,12 @@ void main() async {

await setup();

runApp(const MainApp());
runApp(
ChangeNotifierProvider(
create: (context) => ThemeManager(),
child: const MainApp(),
),
);
}

final _rootNavigatorKey = GlobalKey<NavigatorState>();
Expand Down Expand Up @@ -68,13 +78,38 @@ class MainApp extends StatelessWidget {

@override
Widget build(BuildContext context) {
const colorSchemeSeed = Color.fromARGB(255, 23, 66, 141);
return MaterialApp.router(
debugShowCheckedModeBanner: false,
themeMode: ThemeMode.light,
theme: ThemeData(colorSchemeSeed: colorSchemeSeed, useMaterial3: true),
darkTheme: ThemeData(brightness: Brightness.dark, colorSchemeSeed: colorSchemeSeed, useMaterial3: true),
routerConfig: _router,
return DynamicColorBuilder(
builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
ColorScheme lightScheme;
ColorScheme darkScheme;

if (lightDynamic != null && darkDynamic != null) {
lightScheme = lightDynamic.harmonized();
lightCustomColors = lightCustomColors.harmonized(lightScheme);

darkScheme = darkDynamic.harmonized();
darkCustomColors = darkCustomColors.harmonized(darkScheme);
} else {
lightScheme = lightColorScheme;
darkScheme = darkColorScheme;
}

return MaterialApp.router(
themeMode: Provider.of<ThemeManager>(context).themeMode,
theme: ThemeData(
useMaterial3: true,
colorScheme: lightScheme,
extensions: [lightCustomColors],
),
darkTheme: ThemeData(
useMaterial3: true,
colorScheme: darkScheme,
extensions: [darkCustomColors],
),
debugShowCheckedModeBanner: false,
routerConfig: _router,
);
},
);
}
}
69 changes: 69 additions & 0 deletions AdminUi/apps/admin_ui/lib/theme/colors/color_schemes.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import 'package:flutter/material.dart';

const lightColorScheme = ColorScheme(
brightness: Brightness.light,
primary: Color(0xFF365CA8),
onPrimary: Color(0xFFFFFFFF),
primaryContainer: Color(0xFFD9E2FF),
onPrimaryContainer: Color(0xFF001945),
secondary: Color(0xFF0060A9),
onSecondary: Color(0xFFFFFFFF),
secondaryContainer: Color(0xFFD3E4FF),
onSecondaryContainer: Color(0xFF001C38),
tertiary: Color(0xFF9B4500),
onTertiary: Color(0xFFFFFFFF),
tertiaryContainer: Color(0xFFFFDBC9),
onTertiaryContainer: Color(0xFF331200),
error: Color(0xFFBA1A1A),
errorContainer: Color(0xFFFFDAD6),
onError: Color(0xFFFFFFFF),
onErrorContainer: Color(0xFF410002),
background: Color(0xFFF8FDFF),
onBackground: Color(0xFF001F25),
surface: Color(0xFFF8FDFF),
onSurface: Color(0xFF001F25),
surfaceVariant: Color(0xFFE1E2EC),
onSurfaceVariant: Color(0xFF44464F),
outline: Color(0xFF757780),
onInverseSurface: Color(0xFFD6F6FF),
inverseSurface: Color(0xFF00363F),
inversePrimary: Color(0xFFB0C6FF),
shadow: Color(0xFF000000),
surfaceTint: Color(0xFF365CA8),
outlineVariant: Color(0xFFC5C6D0),
scrim: Color(0xFF000000),
);

const darkColorScheme = ColorScheme(
brightness: Brightness.dark,
primary: Color(0xFFB0C6FF),
onPrimary: Color(0xFF002D6E),
primaryContainer: Color(0xFF18438F),
onPrimaryContainer: Color(0xFFD9E2FF),
secondary: Color(0xFFA2C9FF),
onSecondary: Color(0xFF00315B),
secondaryContainer: Color(0xFF004881),
onSecondaryContainer: Color(0xFFD3E4FF),
tertiary: Color(0xFFFFB68D),
onTertiary: Color(0xFF532200),
tertiaryContainer: Color(0xFF763300),
onTertiaryContainer: Color(0xFFFFDBC9),
error: Color(0xFFFFB4AB),
errorContainer: Color(0xFF93000A),
onError: Color(0xFF690005),
onErrorContainer: Color(0xFFFFDAD6),
background: Color(0xFF001F25),
onBackground: Color(0xFFA6EEFF),
surface: Color(0xFF001F25),
onSurface: Color(0xFFA6EEFF),
surfaceVariant: Color(0xFF44464F),
onSurfaceVariant: Color(0xFFC5C6D0),
outline: Color(0xFF8F9099),
onInverseSurface: Color(0xFF001F25),
inverseSurface: Color(0xFFA6EEFF),
inversePrimary: Color(0xFF365CA8),
shadow: Color(0xFF000000),
surfaceTint: Color(0xFFB0C6FF),
outlineVariant: Color(0xFF44464F),
scrim: Color(0xFF000000),
);
Loading