Skip to content
Open
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [1.1.4] - 20 Dec 2022
* Bump Dart SDK minimum version constraint to 2.17.0
* Add linter rule 'use_super_parameters'
* Use super parameters wherever applicable
* Organize imports

## [1.1.3] - 4 Aug 2021
* Properly handle the race condition when the widget is disposed while performing the action

Expand Down
1 change: 1 addition & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,4 @@ linter:
- use_string_buffers
- use_to_and_as_if_applicable
- valid_regexps
- use_super_parameters
39 changes: 37 additions & 2 deletions example/.metadata
Original file line number Diff line number Diff line change
@@ -1,10 +1,45 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled and should not be manually edited.
# This file should be version controlled.

version:
revision: d79295af24c3ed621c33713ecda14ad196fd9c31
revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
channel: stable

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
- platform: android
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
- platform: ios
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
- platform: linux
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
- platform: macos
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
- platform: web
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
- platform: windows
create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849

# User provided section

# List of Local paths (relative to this file) that should be
# ignored by the migrate tool.
#
# Files that are not part of the templates will be ignored by default.
unmanaged_files:
- 'lib/main.dart'
- 'ios/Runner.xcodeproj/project.pbxproj'
4 changes: 2 additions & 2 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:widget_with_codeview/widget_with_codeview.dart';
void main() => runApp(const MyApp());

class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key);
const MyApp({super.key});

@override
Widget build(BuildContext context) => MaterialApp(
Expand All @@ -25,7 +25,7 @@ class MyApp extends StatelessWidget {
}

class MyHomePage extends StatefulWidget {
const MyHomePage({Key? key}) : super(key: key);
const MyHomePage({super.key});

@override
_MyHomePageState createState() => _MyHomePageState();
Expand Down
39 changes: 23 additions & 16 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.1"
version: "2.9.0"
boolean_selector:
dependency: transitive
description:
Expand All @@ -21,7 +21,7 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.1"
charcode:
dependency: transitive
description:
Expand All @@ -35,14 +35,14 @@ packages:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
crypto:
dependency: transitive
description:
Expand All @@ -63,7 +63,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
ffi:
dependency: transitive
description:
Expand Down Expand Up @@ -134,7 +134,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
lints:
dependency: transitive
description:
Expand All @@ -148,21 +148,28 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.2"
path_provider:
dependency: transitive
description:
Expand Down Expand Up @@ -232,7 +239,7 @@ packages:
path: ".."
relative: true
source: path
version: "1.1.1"
version: "1.1.4"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -244,7 +251,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.9.0"
stack_trace:
dependency: transitive
description:
Expand All @@ -265,21 +272,21 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
version: "0.4.12"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -335,7 +342,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.2"
widget_with_codeview:
dependency: "direct main"
description:
Expand All @@ -358,5 +365,5 @@ packages:
source: hosted
version: "0.2.0"
sdks:
dart: ">=2.13.0 <3.0.0"
dart: ">=2.17.0 <3.0.0"
flutter: ">=2.0.0"
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=2.12.0 <3.0.0"
sdk: ">=2.17.0 <3.0.0"

dependencies:
flutter:
Expand Down
3 changes: 1 addition & 2 deletions example/test/widget_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
// gestures. You can also use WidgetTester to find child widgets in the widget
// tree, read text, and verify that the values of widget properties are correct.

import 'package:example/main.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';

import 'package:example/main.dart';

void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame.
Expand Down
49 changes: 16 additions & 33 deletions lib/src/circular_progress_builder.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';

import 'action_controller.dart';
import 'progress_builder.dart';

class CircularProgressBuilder extends ProgressBuilder {
Expand All @@ -11,44 +10,28 @@ class CircularProgressBuilder extends ProgressBuilder {
CircularProgressIndicator.adaptive(value: value);

const CircularProgressBuilder({
required ProgressChildWidgetBuilder builder,
ErrorCallback? onError,
ProgressAction? action,
VoidCallback? onDone,
VoidCallback? onStart,
VoidCallback? onSuccess,
ActionController? controller,
Key? key,
required super.builder,
super.onError,
super.action,
super.onDone,
super.onStart,
super.onSuccess,
super.controller,
super.key,
}) : super(
action: action,
builder: builder,
onDone: onDone,
onError: onError,
onStart: onStart,
onSuccess: onSuccess,
progressBuilder: _progressBuilder,
controller: controller,
key: key,
);

const CircularProgressBuilder.adaptive({
required ProgressChildWidgetBuilder builder,
ErrorCallback? onError,
ProgressAction? action,
VoidCallback? onDone,
VoidCallback? onStart,
VoidCallback? onSuccess,
ActionController? controller,
Key? key,
required super.builder,
super.onError,
super.action,
super.onDone,
super.onStart,
super.onSuccess,
super.controller,
super.key,
}) : super(
action: action,
builder: builder,
onDone: onDone,
onError: onError,
onStart: onStart,
onSuccess: onSuccess,
progressBuilder: _adaptiveProgressBuilder,
controller: controller,
key: key,
);
}
7 changes: 4 additions & 3 deletions lib/src/default_action_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class DefaultActionController extends StatefulWidget {
const DefaultActionController({
required this.child,
this.broadcast = true,
Key? key,
}) : super(key: key);
super.key,
});

/// The widget below this widget in the tree.
final Widget child;
Expand All @@ -31,7 +31,8 @@ class _DefaultActionControllerState extends State<DefaultActionController> {
@override
void initState() {
super.initState();
_controller = widget.broadcast ? ActionController.broadcast() : ActionController();
_controller =
widget.broadcast ? ActionController.broadcast() : ActionController();
}

@override
Expand Down
25 changes: 8 additions & 17 deletions lib/src/linear_progress_builder.dart
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
import 'package:flutter/material.dart';

import 'action_controller.dart';
import 'progress_builder.dart';

class LinearProgressBuilder extends ProgressBuilder {
static Widget _progressBuilder([context, double? value]) =>
LinearProgressIndicator(value: value);

const LinearProgressBuilder({
required ProgressChildWidgetBuilder builder,
ErrorCallback? onError,
ProgressAction? action,
VoidCallback? onDone,
VoidCallback? onStart,
VoidCallback? onSuccess,
ActionController? controller,
Key? key,
required super.builder,
super.onError,
super.action,
super.onDone,
super.onStart,
super.onSuccess,
super.controller,
super.key,
}) : super(
action: action,
builder: builder,
onDone: onDone,
onError: onError,
onStart: onStart,
onSuccess: onSuccess,
progressBuilder: _progressBuilder,
controller: controller,
key: key,
);
}
5 changes: 2 additions & 3 deletions lib/src/progress_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:flutter/material.dart';
import 'package:progress_builder/progress_builder.dart';
import 'action_controller.dart';

///
/// Builds a widget in the non-progress/loading state
Expand Down Expand Up @@ -70,8 +69,8 @@ class ProgressBuilder extends StatefulWidget {
this.onSuccess,
this.onDone,
this.onStart,
Key? key,
}) : super(key: key);
super.key,
});

@override
_ProgressBuilderState createState() => _ProgressBuilderState();
Expand Down
Loading