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

Jump to bottom

Added fields to widgets as part of flutter newer versions #14

Merged
merged 1 commit into from Oct 27, 2018
Merged

Added fields to widgets as part of flutter newer versions #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 22 additions & 8 deletions lib/src/platform_alert_dialog.dart
View file
Open in desktop
Expand Up @@ -12,22 +12,28 @@ import 'package:flutter/widgets.dart';
import 'widget_base.dart';

abstract class _BaseData {
_BaseData({this.actions, this.content, this.title});
_BaseData({this.widgetKey, this.actions, this.content, this.title});

final Key widgetKey;
final List<Widget> actions;
final Widget content;
final Widget title;
}

class MaterialAlertDialogData extends _BaseData {
MaterialAlertDialogData(
{List<Widget> actions,
{Key widgetKey,
List<Widget> actions,
Widget content,
Widget title,
this.contentPadding,
this.semanticLabel,
this.titlePadding})
: super(actions: actions, content: content, title: title);
: super(
widgetKey: widgetKey,
actions: actions,
content: content,
title: title);

final EdgeInsetsGeometry contentPadding;
final String semanticLabel;
Expand All @@ -36,13 +42,20 @@ class MaterialAlertDialogData extends _BaseData {

class CupertinoAlertDialogData extends _BaseData {
CupertinoAlertDialogData(
{List<Widget> actions,
{Key widgetKey,
List<Widget> actions,
Widget content,
Widget title,
this.scrollController})
: super(actions: actions, content: content, title: title);
this.scrollController,
this.actionScrollController})
: super(
widgetKey: widgetKey,
actions: actions,
content: content,
title: title);

final ScrollController scrollController;
final ScrollController actionScrollController;
}

class PlatformAlertDialog
Expand Down Expand Up @@ -73,7 +86,7 @@ class PlatformAlertDialog
}

return AlertDialog(
key: widgetKey,
key: data?.widgetKey ?? widgetKey,
actions: data?.actions ?? actions,
content: data?.content ?? content,
contentPadding: data?.contentPadding ??
Expand All @@ -92,10 +105,11 @@ class PlatformAlertDialog
}

return CupertinoAlertDialog(
key: widgetKey,
key: data?.widgetKey ?? widgetKey,
actions: data?.actions ?? actions,
content: data?.content ?? content,
scrollController: data?.scrollController,
actionScrollController: data?.actionScrollController,
title: data?.title ?? title,
);
}
Expand Down
123 changes: 76 additions & 47 deletions lib/src/platform_app_bar.dart
View file
Open in desktop
Expand Up @@ -22,38 +22,50 @@ const Border _kDefaultNavBarBorder = const Border(
),
);


abstract class _BaseData {
_BaseData({this.title, this.backgroundColor, this.leading});
_BaseData(
{this.widgetKey,
this.title,
this.backgroundColor,
this.leading,
this.automaticallyImplyLeading});

final Widget title;
final Color backgroundColor;
final Widget leading;
final Key widgetKey;
final bool automaticallyImplyLeading;
}

class MaterialAppBarData extends _BaseData {
MaterialAppBarData(
{Widget title,
Color backgroundColor,
Widget leading,
this.actions,
this.bottom,
this.automaticallyImplyLeading: true,
this.bottomOpacity: 1.0,
this.brightness,
this.centerTitle,
this.elevation: 4.0,
this.flexibleSpace,
this.iconTheme,
this.primary: true,
this.textTheme,
this.titleSpacing: NavigationToolbar.kMiddleSpacing,
this.toolbarOpacity: 1.0})
: super(title: title, backgroundColor: backgroundColor, leading: leading);
Color backgroundColor,
Widget leading,
Key widgetKey,
bool automaticallyImplyLeading: true,
this.actions,
this.bottom,
this.bottomOpacity = 1.0,
this.brightness,
this.centerTitle,
this.elevation = 4.0,
this.flexibleSpace,
this.iconTheme,
this.primary = true,
this.textTheme,
this.titleSpacing = NavigationToolbar.kMiddleSpacing,
this.toolbarOpacity = 1.0})
: super(
widgetKey: widgetKey,
title: title,
backgroundColor: backgroundColor,
leading: leading,
automaticallyImplyLeading: automaticallyImplyLeading);

final List<Widget> actions;
final PreferredSizeWidget bottom;
final bool automaticallyImplyLeading;

final double bottomOpacity;
final Brightness brightness;
final bool centerTitle;
Expand All @@ -69,22 +81,33 @@ class MaterialAppBarData extends _BaseData {
class CupertinoNavigationBarData extends _BaseData {
CupertinoNavigationBarData(
{Widget title,
Color backgroundColor,
Widget leading,
this.trailing,
this.border,
this.automaticallyImplyLeading: true,
this.actionsForegroundColor: CupertinoColors.activeBlue,
this.transitionBetweenRoutes,
this.heroTag})
: super(title: title, backgroundColor: backgroundColor, leading: leading);
Color backgroundColor,
Widget leading,
Key widgetKey,
bool automaticallyImplyLeading = true,
this.previousPageTitle,
this.automaticallyImplyMiddle = true,
this.padding,
this.trailing,
this.border,
this.actionsForegroundColor = CupertinoColors.activeBlue,
this.transitionBetweenRoutes,
this.heroTag})
: super(
widgetKey: widgetKey,
title: title,
backgroundColor: backgroundColor,
leading: leading,
automaticallyImplyLeading: automaticallyImplyLeading);

final Widget trailing;
final Border border;
final bool automaticallyImplyLeading;
final Color actionsForegroundColor;
final bool transitionBetweenRoutes;
final Object heroTag;
final bool automaticallyImplyMiddle;
final String previousPageTitle;
final EdgeInsetsDirectional padding;
}

class PlatformAppBar
Expand All @@ -101,13 +124,13 @@ class PlatformAppBar

PlatformAppBar(
{Key key,
this.widgetKey,
this.title,
this.backgroundColor,
this.leading,
this.trailingActions,
this.android,
this.ios})
this.widgetKey,
this.title,
this.backgroundColor,
this.leading,
this.trailingActions,
this.android,
this.ios})
: super(key: key);

@override
Expand All @@ -125,12 +148,12 @@ class PlatformAppBar
automaticallyImplyLeading: data?.automaticallyImplyLeading ?? true,
bottomOpacity: data?.bottomOpacity ?? 1.0,
brightness: data?.brightness,
centerTitle: data?.centerTitle ?? false,
centerTitle: data?.centerTitle,
elevation: data?.elevation ?? 4.0,
flexibleSpace: data?.flexibleSpace,
iconTheme: data?.iconTheme,
leading: data?.leading ?? leading,
key: widgetKey,
key: data?.widgetKey ?? widgetKey,
primary: data?.primary ?? true,
textTheme: data?.textTheme,
titleSpacing: data?.titleSpacing ?? NavigationToolbar.kMiddleSpacing,
Expand All @@ -148,22 +171,25 @@ class PlatformAppBar
var trailing = trailingActions == null || trailingActions.isEmpty
? null
: new Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: trailingActions,
);
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: trailingActions,
);

if(data?.heroTag != null){
if (data?.heroTag != null) {
return CupertinoNavigationBar(
middle: data?.title ?? title,
backgroundColor: data?.backgroundColor ??
backgroundColor ??
_kDefaultNavBarBackgroundColor,
actionsForegroundColor:
data?.actionsForegroundColor ?? CupertinoColors.activeBlue,
data?.actionsForegroundColor ?? CupertinoColors.activeBlue,
automaticallyImplyLeading: data?.automaticallyImplyLeading ?? true,
automaticallyImplyMiddle: data?.automaticallyImplyMiddle ?? true,
previousPageTitle: data?.previousPageTitle,
padding: data?.padding,
border: data?.border ?? _kDefaultNavBarBorder,
key: widgetKey,
key: data?.widgetKey ?? widgetKey,
leading: data?.leading ?? leading,
trailing: data?.trailing ?? trailing,
transitionBetweenRoutes: data?.transitionBetweenRoutes ?? true,
Expand All @@ -177,10 +203,13 @@ class PlatformAppBar
backgroundColor ??
_kDefaultNavBarBackgroundColor,
actionsForegroundColor:
data?.actionsForegroundColor ?? CupertinoColors.activeBlue,
data?.actionsForegroundColor ?? CupertinoColors.activeBlue,
automaticallyImplyLeading: data?.automaticallyImplyLeading ?? true,
automaticallyImplyMiddle: data?.automaticallyImplyMiddle ?? true,
previousPageTitle: data?.previousPageTitle,
padding: data?.padding,
border: data?.border ?? _kDefaultNavBarBorder,
key: widgetKey,
key: data?.widgetKey ?? widgetKey,
leading: data?.leading ?? leading,
trailing: data?.trailing ?? trailing,
transitionBetweenRoutes: data?.transitionBetweenRoutes ?? true,
Expand Down