Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
264 changes: 264 additions & 0 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.2"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.3"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.13"
convert:
dependency: transitive
description:
name: convert
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
flutter:
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
flutter_svg:
dependency: "direct main"
description:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "0.18.1"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
flutter_web_plugins:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
getwidget:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "1.1.3"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.8"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.8"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
path_drawing:
dependency: transitive
description:
name: path_drawing
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.1+1"
path_parsing:
dependency: transitive
description:
name: path_parsing
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.4"
platform_detect:
dependency: transitive
description:
name: platform_detect
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
pub_semver:
dependency: transitive
description:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.4"
sky_engine:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
source_span:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.5"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.17"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
url_launcher:
dependency: "direct main"
description:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "5.5.3"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+1"
url_launcher_macos:
dependency: transitive
description:
name: url_launcher_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+7"
url_launcher_platform_interface:
dependency: transitive
description:
name: url_launcher_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.8"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3+2"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.0"
sdks:
dart: ">=2.9.0-14.0.dev <3.0.0"
flutter: ">=1.18.0-6.0.pre <2.0.0"
6 changes: 3 additions & 3 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ dependencies:
sdk: flutter
getwidget:
path: ../
cupertino_icons: ^0.1.2
flutter_svg: ^0.18.0
url_launcher: ^5.4.1
cupertino_icons: ^0.1.3
flutter_svg: ^0.18.1
url_launcher: ^5.5.3

dev_dependencies:
flutter_test:
Expand Down
10 changes: 3 additions & 7 deletions lib/components/accordian/gf_accordian.dart
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,10 @@ class _GFAccordionState extends State<GFAccordion>
@override
void initState() {
showAccordion = widget.showAccordion;
animationController = AnimationController(
duration: const Duration(seconds: 2),
vsync: this
);
animationController =
AnimationController(duration: const Duration(seconds: 2), vsync: this);
controller = AnimationController(
duration: const Duration(milliseconds: 300),
vsync: this
);
duration: const Duration(milliseconds: 300), vsync: this);
offset = Tween(
begin: const Offset(0, -0.06),
end: Offset.zero,
Expand Down
4 changes: 1 addition & 3 deletions lib/components/alert/gf_alert.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
@override
void initState() {
animationController = AnimationController(
duration: const Duration(milliseconds: 300),
vsync: this
);
duration: const Duration(milliseconds: 300), vsync: this);
animation = CurvedAnimation(
parent: animationController,
curve: Curves.fastOutSlowIn,
Expand Down
12 changes: 7 additions & 5 deletions lib/components/animation/gf_animation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ class _GFAnimationState extends State<GFAnimation>
if (widget.type == GFAnimationType.rotateTransition) {
controller = widget.controller ??
AnimationController(
duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
duration: widget.duration ?? const Duration(seconds: 2),
vsync: this);
animation = widget.turnsAnimation ??
Tween<double>(begin: 0, end: 20).animate(controller);
if (widget.turnsAnimation == null) {
Expand All @@ -127,15 +128,16 @@ class _GFAnimationState extends State<GFAnimation>
} else if (widget.type == GFAnimationType.scaleTransition) {
controller = widget.controller ??
AnimationController(
duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
duration: widget.duration ?? const Duration(seconds: 2),
vsync: this);
animation = widget.scaleAnimation ??
CurvedAnimation(
parent: controller, curve: widget.curve ?? Curves.ease);
controller.forward();
} else if (widget.type == GFAnimationType.slideTransition) {
controller = AnimationController(
duration: widget.duration ?? const Duration(seconds: 2), vsync: this
)..repeat(reverse: true);
duration: widget.duration ?? const Duration(seconds: 2), vsync: this)
..repeat(reverse: true);
offsetAnimation = Tween<Offset>(
begin: Offset.zero,
end: const Offset(1.5, 0),
Expand Down Expand Up @@ -252,7 +254,7 @@ class _GFAnimationState extends State<GFAnimation>
fontWeight: widget.fontWeight ?? FontWeight.normal,
fontSize: widget.fontSize ?? 16,
color: widget.color ?? Colors.blue),
// textWidthBasis: widget.textWidthBasis ?? TextWidthBasis.parent,
textWidthBasis: widget.textWidthBasis ?? TextWidthBasis.parent,
textAlign: widget.textAlign ?? TextAlign.start,
curve: widget.curve ?? Curves.linear,
duration: widget.duration ?? const Duration(seconds: 2),
Expand Down
12 changes: 6 additions & 6 deletions lib/components/appbar/gf_appbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,12 @@ class _GFAppBarState extends State<GFAppBar> {
IconThemeData actionsIconTheme = widget.actionsIconTheme ??
appBarTheme.actionsIconTheme ??
overallIconTheme;
TextStyle centerStyle = widget.textTheme?.headline ??
appBarTheme.textTheme?.headline ??
theme.primaryTextTheme.headline;
TextStyle sideStyle = widget.textTheme?.body1 ??
appBarTheme.textTheme?.body1 ??
theme.primaryTextTheme.body1;
TextStyle centerStyle = widget.textTheme?.headline5 ??
appBarTheme.textTheme?.headline5 ??
theme.primaryTextTheme.headline5;
TextStyle sideStyle = widget.textTheme?.bodyText1 ??
appBarTheme.textTheme?.bodyText1 ??
theme.primaryTextTheme.bodyText1;

if (widget.toolbarOpacity != 1.0) {
final double opacity = const Interval(
Expand Down
2 changes: 1 addition & 1 deletion lib/components/avatar/gf_avatar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class GFAvatar extends StatelessWidget {
final Color foregroundColor = this.foregroundColor;
assert(debugCheckHasMediaQuery(context));
final ThemeData theme = Theme.of(context);
TextStyle textStyle = theme.primaryTextTheme.subtitle.copyWith(
TextStyle textStyle = theme.primaryTextTheme.subtitle1.copyWith(
color: foregroundColor,
);
Color effectiveBackgroundColor = backgroundColor;
Expand Down
Loading