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

flutter 3.10.1 compatibilty #2

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [0.3.0] - May 2023

- Update Dart 3.10.1 [#1](https://github.com/GUIKAR741/NewGradientAppBar/pull/1)
- Update using dart fix
-
## [0.2.0] - April 2021

- Update Dart 2.12.0 [#1](https://github.com/GUIKAR741/NewGradientAppBar/pull/1)
Expand Down
160 changes: 0 additions & 160 deletions example/pubspec.lock

This file was deleted.

23 changes: 11 additions & 12 deletions lib/new_gradient_app_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';

const double _kLeadingWidth =
kToolbarHeight; // So the leading button is square.
Expand Down Expand Up @@ -418,12 +417,12 @@ class _NewGradientAppBarState extends State<NewGradientAppBar> {
IconThemeData actionsIconTheme = widget.actionsIconTheme ??
appBarTheme.actionsIconTheme ??
overallIconTheme;
TextStyle centerStyle = (widget.textTheme?.headline6 ??
appBarTheme.textTheme?.headline6 ??
themeData.primaryTextTheme.headline6)!;
TextStyle? sideStyle = widget.textTheme?.bodyText2 ??
appBarTheme.textTheme?.bodyText2 ??
themeData.primaryTextTheme.bodyText2;
TextStyle centerStyle = (widget.textTheme?.titleLarge ??
appBarTheme.titleTextStyle ??
themeData.primaryTextTheme.titleLarge)!;
TextStyle? sideStyle = widget.textTheme?.bodyMedium ??
appBarTheme.toolbarTextStyle ??
themeData.primaryTextTheme.bodyMedium;

if (widget.toolbarOpacity != 1.0) {
final double opacity =
Expand Down Expand Up @@ -577,8 +576,8 @@ class _NewGradientAppBarState extends State<NewGradientAppBar> {
);
}
final Brightness brightness = widget.brightness ??
appBarTheme.brightness ??
themeData.primaryColorBrightness;
appBarTheme.systemOverlayStyle?.statusBarBrightness ??
themeData.brightness;
final SystemUiOverlayStyle overlayStyle = brightness == Brightness.dark
? SystemUiOverlayStyle.light
: SystemUiOverlayStyle.dark;
Expand All @@ -588,7 +587,7 @@ class _NewGradientAppBarState extends State<NewGradientAppBar> {
child: AnnotatedRegion<SystemUiOverlayStyle>(
value: overlayStyle,
child: Material(
color: appBarTheme.color ?? themeData.primaryColor,
color: appBarTheme.backgroundColor ?? themeData.primaryColor,
elevation:
widget.elevation ?? appBarTheme.elevation ?? _defaultElevation,
shape: widget.shape,
Expand Down Expand Up @@ -623,7 +622,7 @@ class _FloatingGradientAppBarState extends State<_FloatingGradientAppBar> {
super.didChangeDependencies();
if (_position != null)
_position!.isScrollingNotifier.removeListener(_isScrollingListener);
_position = Scrollable.of(context)?.position;
_position = Scrollable.of(context).position;
if (_position != null)
_position!.isScrollingNotifier.addListener(_isScrollingListener);
}
Expand Down Expand Up @@ -679,7 +678,7 @@ class _SliverGradientAppBarDelegate extends SliverPersistentHeaderDelegate {
required this.pinned,
required this.snapConfiguration,
required this.shape,
}) : assert(primary || topPadding == 0.0),
}) : assert(primary || topPadding == 0.0),
_bottomHeight = bottom.preferredSize.height;

final Widget leading;
Expand Down
146 changes: 0 additions & 146 deletions pubspec.lock

This file was deleted.

2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: new_gradient_app_bar
description: The official AppBar, with a more colorful twist. Add gradients to spice up your application and make it beautiful.
version: 0.2.0
version: 0.3.0
homepage: https://github.com/GUIKAR741/NewGradientAppBar

dependencies:
Expand Down