mirror of
https://gitlab.com/veilid/veilidchat.git
synced 2025-07-21 13:48:43 -04:00
more log work
This commit is contained in:
parent
9c1d780d93
commit
39b0262d0e
35 changed files with 906 additions and 606 deletions
|
@ -7,6 +7,7 @@ import '../../tools/tools.dart';
|
|||
import 'scale_color.dart';
|
||||
import 'scale_input_decorator_theme.dart';
|
||||
import 'scale_scheme.dart';
|
||||
import 'scale_theme.dart';
|
||||
|
||||
enum RadixThemeColor {
|
||||
scarlet, // red + violet + tomato
|
||||
|
@ -610,10 +611,14 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
|
|||
borderRadiusScale: 1,
|
||||
);
|
||||
|
||||
final themeData = ThemeData.from(
|
||||
final scaleTheme = ScaleTheme(
|
||||
textTheme: textTheme, scheme: scaleScheme, config: scaleConfig);
|
||||
|
||||
final baseThemeData = ThemeData.from(
|
||||
colorScheme: colorScheme, textTheme: textTheme, useMaterial3: true);
|
||||
return themeData.copyWith(
|
||||
scrollbarTheme: themeData.scrollbarTheme.copyWith(
|
||||
|
||||
final themeData = baseThemeData.copyWith(
|
||||
scrollbarTheme: baseThemeData.scrollbarTheme.copyWith(
|
||||
thumbColor: WidgetStateProperty.resolveWith((states) {
|
||||
if (states.contains(WidgetState.pressed)) {
|
||||
return scaleScheme.primaryScale.border;
|
||||
|
@ -636,10 +641,10 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
|
|||
}
|
||||
return scaleScheme.primaryScale.subtleBorder;
|
||||
})),
|
||||
appBarTheme: themeData.appBarTheme.copyWith(
|
||||
appBarTheme: baseThemeData.appBarTheme.copyWith(
|
||||
backgroundColor: scaleScheme.primaryScale.border,
|
||||
foregroundColor: scaleScheme.primaryScale.borderText),
|
||||
bottomSheetTheme: themeData.bottomSheetTheme.copyWith(
|
||||
bottomSheetTheme: baseThemeData.bottomSheetTheme.copyWith(
|
||||
elevation: 0,
|
||||
modalElevation: 0,
|
||||
shape: const RoundedRectangleBorder(
|
||||
|
@ -647,7 +652,7 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
|
|||
topLeft: Radius.circular(16),
|
||||
topRight: Radius.circular(16)))),
|
||||
canvasColor: scaleScheme.primaryScale.subtleBackground,
|
||||
chipTheme: themeData.chipTheme.copyWith(
|
||||
chipTheme: baseThemeData.chipTheme.copyWith(
|
||||
backgroundColor: scaleScheme.primaryScale.elementBackground,
|
||||
selectedColor: scaleScheme.primaryScale.activeElementBackground,
|
||||
surfaceTintColor: scaleScheme.primaryScale.hoverElementBackground,
|
||||
|
@ -666,5 +671,11 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
|
|||
),
|
||||
inputDecorationTheme:
|
||||
ScaleInputDecoratorTheme(scaleScheme, scaleConfig, textTheme),
|
||||
extensions: <ThemeExtension<dynamic>>[scaleScheme, scaleConfig]);
|
||||
extensions: <ThemeExtension<dynamic>>[
|
||||
scaleScheme,
|
||||
scaleConfig,
|
||||
scaleTheme
|
||||
]);
|
||||
|
||||
return themeData;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue