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.

Sign up for GitHub

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

Improve material/cupertino builder design - Rename function #230

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Improve material/cupertino builder design - Rename function #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4ef5b6
make material theme builder explicit
dickermoshe Jan 7, 2025
16dcb8d
rename material builder
dickermoshe Jan 7, 2025
3399d9f
Merge branch 'main' into main
dickermoshe Jan 7, 2025
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
202 changes: 141 additions & 61 deletions lib/src/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,37 @@ enum ShadAppType {
custom,
}

typedef MaterialThemeBuilder = ThemeData Function(
BuildContext context,
ShadThemeData themeData,
String fontFamily,
Iterable<ThemeExtension<dynamic>>? extensions,
Brightness brightness,
Color primaryColor,
Color onPrimaryColor,
Color secondaryColor,
Color onSecondaryColor,
Color errorColor,
Color onErrorColor,
Color backgroundColor,
Color onBackgroundColor,
Color surfaceColor,
Color onSurfaceColor,
Color scaffoldBackgroundColor,
DividerThemeData dividerTheme,
TextSelectionThemeData textSelectionTheme,
);

typedef CupertinoThemeBuilder = CupertinoThemeData Function(
BuildContext context,
ShadThemeData themeData,
Brightness brightness,
Color primaryColor,
Color primaryContrastingColor,
Color scaffoldBackgroundColor,
Color barBackgroundColor,
);

class ShadApp extends StatefulWidget {
/// Creates a [ShadApp] providing a [ShadTheme].
const ShadApp({
Expand Down Expand Up @@ -54,13 +85,13 @@ class ShadApp extends StatefulWidget {
this.scrollBehavior = const ShadScrollBehavior(),
this.pageRouteBuilder,
this.themeCurve = Curves.linear,
this.materialThemeBuilder,
this.materialThemeBuilder = defaultMaterialThemeBuilder,
}) : routeInformationProvider = null,
routeInformationParser = null,
routerDelegate = null,
backButtonDispatcher = null,
routerConfig = null,
cupertinoThemeBuilder = null,
cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
appBuilder = null,
type = ShadAppType.shadcn;

Expand Down Expand Up @@ -92,7 +123,7 @@ class ShadApp extends StatefulWidget {
this.restorationScopeId,
this.scrollBehavior = const ShadScrollBehavior(),
this.themeCurve = Curves.linear,
this.materialThemeBuilder,
this.materialThemeBuilder = defaultMaterialThemeBuilder,
}) : navigatorObservers = null,
navigatorKey = null,
onGenerateRoute = null,
Expand All @@ -102,7 +133,7 @@ class ShadApp extends StatefulWidget {
routes = null,
initialRoute = null,
pageRouteBuilder = null,
cupertinoThemeBuilder = null,
cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
appBuilder = null,
type = ShadAppType.shadcn;

Expand Down Expand Up @@ -138,13 +169,13 @@ class ShadApp extends StatefulWidget {
this.scrollBehavior = const MaterialScrollBehavior(),
this.pageRouteBuilder,
this.themeCurve = Curves.linear,
this.materialThemeBuilder,
this.materialThemeBuilder = defaultMaterialThemeBuilder,
}) : routeInformationProvider = null,
routeInformationParser = null,
routerDelegate = null,
backButtonDispatcher = null,
routerConfig = null,
cupertinoThemeBuilder = null,
cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
appBuilder = null,
type = ShadAppType.material;

Expand Down Expand Up @@ -176,7 +207,7 @@ class ShadApp extends StatefulWidget {
this.restorationScopeId,
this.scrollBehavior = const MaterialScrollBehavior(),
this.themeCurve = Curves.linear,
this.materialThemeBuilder,
this.materialThemeBuilder = defaultMaterialThemeBuilder,
}) : navigatorObservers = null,
navigatorKey = null,
onGenerateRoute = null,
Expand All @@ -186,7 +217,7 @@ class ShadApp extends StatefulWidget {
routes = null,
initialRoute = null,
pageRouteBuilder = null,
cupertinoThemeBuilder = null,
cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
appBuilder = null,
type = ShadAppType.material;

Expand Down Expand Up @@ -222,8 +253,8 @@ class ShadApp extends StatefulWidget {
this.scrollBehavior = const CupertinoScrollBehavior(),
this.pageRouteBuilder,
this.themeCurve = Curves.linear,
this.cupertinoThemeBuilder,
this.materialThemeBuilder,
this.cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
this.materialThemeBuilder = defaultMaterialThemeBuilder,
}) : routeInformationProvider = null,
routeInformationParser = null,
routerDelegate = null,
Expand Down Expand Up @@ -260,8 +291,8 @@ class ShadApp extends StatefulWidget {
this.restorationScopeId,
this.scrollBehavior = const CupertinoScrollBehavior(),
this.themeCurve = Curves.linear,
this.cupertinoThemeBuilder,
this.materialThemeBuilder,
this.cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
this.materialThemeBuilder = defaultMaterialThemeBuilder,
}) : navigatorObservers = null,
navigatorKey = null,
onGenerateRoute = null,
Expand All @@ -285,15 +316,15 @@ class ShadApp extends StatefulWidget {
backButtonDispatcher = null,
builder = null,
color = null,
cupertinoThemeBuilder = null,
cupertinoThemeBuilder = defaultCupertinoThemeBuilder,
debugShowCheckedModeBanner = true,
home = null,
initialRoute = null,
locale = null,
localeListResolutionCallback = null,
localeResolutionCallback = null,
localizationsDelegates = null,
materialThemeBuilder = null,
materialThemeBuilder = defaultMaterialThemeBuilder,
navigatorKey = null,
navigatorObservers = null,
onGenerateInitialRoutes = null,
Expand All @@ -316,6 +347,70 @@ class ShadApp extends StatefulWidget {
title = '',
type = ShadAppType.custom;

static ThemeData defaultMaterialThemeBuilder(
BuildContext context,
ShadThemeData themeData,
String fontFamily,
Iterable<ThemeExtension<dynamic>>? extensions,
Brightness brightness,
Color primaryColor,
Color onPrimaryColor,
Color secondaryColor,
Color onSecondaryColor,
Color errorColor,
Color onErrorColor,
Color backgroundColor,
Color onBackgroundColor,
Color surfaceColor,
Color onSurfaceColor,
Color scaffoldBackgroundColor,
DividerThemeData dividerTheme,
TextSelectionThemeData textSelectionTheme,
) {
return ThemeData(
fontFamily: fontFamily,
extensions: extensions,
colorScheme: ColorScheme(
brightness: brightness,
primary: primaryColor,
onPrimary: onPrimaryColor,
secondary: secondaryColor,
onSecondary: onSecondaryColor,
error: errorColor,
onError: onErrorColor,
// Keep deprecated members for backwards compatibility
// ignore: deprecated_member_use
background: backgroundColor,
// ignore: deprecated_member_use
onBackground: onBackgroundColor,
surface: surfaceColor,
onSurface: onSurfaceColor,
),
scaffoldBackgroundColor: scaffoldBackgroundColor,
brightness: brightness,
dividerTheme: dividerTheme,
textSelectionTheme: textSelectionTheme,
);
}

static CupertinoThemeData defaultCupertinoThemeBuilder(
BuildContext context,
ShadThemeData themeData,
Brightness brightness,
Color primaryColor,
Color primaryContrastingColor,
Color scaffoldBackgroundColor,
Color barBackgroundColor,
) {
return CupertinoThemeData(
primaryColor: primaryColor,
primaryContrastingColor: primaryContrastingColor,
scaffoldBackgroundColor: scaffoldBackgroundColor,
barBackgroundColor: barBackgroundColor,
brightness: brightness,
);
}

/// The type of app to use.
///
/// If you are going to use only Shad components, use [ShadAppType.shadcn].
Expand Down Expand Up @@ -569,13 +664,9 @@ class ShadApp extends StatefulWidget {
/// A custom app widget builder.
final Widget Function(BuildContext context, ThemeData theme)? appBuilder;

final ThemeData Function(BuildContext context, ThemeData theme)?
materialThemeBuilder;
final MaterialThemeBuilder materialThemeBuilder;

final CupertinoThemeData Function(
BuildContext context,
CupertinoThemeData theme,
)? cupertinoThemeBuilder;
final CupertinoThemeBuilder cupertinoThemeBuilder;

@override
State<ShadApp> createState() => _ShadAppState();
Expand Down Expand Up @@ -659,62 +750,51 @@ class _ShadAppState extends State<ShadApp> {

ThemeData materialTheme(BuildContext context) {
final themeData = theme(context);
var mTheme = ThemeData(
fontFamily: themeData.textTheme.family,
extensions: themeData.extensions,
colorScheme: ColorScheme(
brightness: themeData.brightness,
primary: themeData.colorScheme.primary,
onPrimary: themeData.colorScheme.primaryForeground,
secondary: themeData.colorScheme.secondary,
onSecondary: themeData.colorScheme.secondaryForeground,
error: themeData.colorScheme.destructive,
onError: themeData.colorScheme.destructiveForeground,
// Keep deprecated members for backwards compatibility
// ignore: deprecated_member_use
background: themeData.colorScheme.background,
// ignore: deprecated_member_use
onBackground: themeData.colorScheme.foreground,
surface: themeData.colorScheme.card,
onSurface: themeData.colorScheme.cardForeground,
),
scaffoldBackgroundColor: themeData.colorScheme.background,
brightness: themeData.brightness,
dividerTheme: DividerThemeData(

final mTheme = widget.materialThemeBuilder(
context,
themeData,
themeData.textTheme.family,
themeData.extensions,
themeData.brightness,
themeData.colorScheme.primary,
themeData.colorScheme.primaryForeground,
themeData.colorScheme.secondary,
themeData.colorScheme.secondaryForeground,
themeData.colorScheme.destructive,
themeData.colorScheme.destructiveForeground,
themeData.colorScheme.background,
themeData.colorScheme.foreground,
themeData.colorScheme.card,
themeData.colorScheme.cardForeground,
themeData.colorScheme.background,
DividerThemeData(
color: themeData.colorScheme.border,
thickness: 1,
),
textSelectionTheme: TextSelectionThemeData(
TextSelectionThemeData(
cursorColor: themeData.colorScheme.primary,
selectionColor: themeData.colorScheme.selection,
selectionHandleColor: themeData.colorScheme.primary,
),
);
mTheme = mTheme.copyWith(
return mTheme.copyWith(
textTheme:
themeData.textTheme.materialTextTheme(textTheme: mTheme.textTheme),
themeData.textTheme.applyGoogleFontToTextTheme(mTheme.textTheme),
);

if (widget.materialThemeBuilder == null) {
return mTheme;
}
return widget.materialThemeBuilder!(context, mTheme);
}

CupertinoThemeData cupertinoTheme(BuildContext context) {
final themeData = theme(context);
final cTheme = CupertinoThemeData(
primaryColor: themeData.colorScheme.primary,
primaryContrastingColor: themeData.colorScheme.primaryForeground,
scaffoldBackgroundColor: themeData.colorScheme.background,
barBackgroundColor: themeData.colorScheme.primary,
brightness: themeData.brightness,
return widget.cupertinoThemeBuilder(
context,
themeData,
themeData.brightness,
themeData.colorScheme.primary,
themeData.colorScheme.primaryForeground,
themeData.colorScheme.background,
themeData.colorScheme.background,
);

if (widget.cupertinoThemeBuilder == null) {
return cTheme;
}
return widget.cupertinoThemeBuilder!(context, cTheme);
}

Widget _builder(BuildContext context, Widget? child) {
Expand Down
Loading