diff --git a/peek_and_pop/example/.flutter-plugins-dependencies b/peek_and_pop/example/.flutter-plugins-dependencies new file mode 100644 index 0000000..b6cc392 --- /dev/null +++ b/peek_and_pop/example/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter","path":"/Users/fabriziotognetto/Library/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-0.3.13/","dependencies":[]}],"android":[{"name":"webview_flutter","path":"/Users/fabriziotognetto/Library/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-0.3.13/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-09-23 23:12:06.440462","version":"1.22.0-12.1.pre"} \ No newline at end of file diff --git a/peek_and_pop/example/lib/nav_bar.dart b/peek_and_pop/example/lib/nav_bar.dart index baa6ea3..d13b9c8 100644 --- a/peek_and_pop/example/lib/nav_bar.dart +++ b/peek_and_pop/example/lib/nav_bar.dart @@ -236,6 +236,7 @@ Widget _wrapWithBackground({ /// * [CupertinoSliverNavigationBar] for a navigation bar to be placed in a /// scrolling list and that supports iOS-11-style large titles. class CupertinoNavigationBar extends StatefulWidget implements ObstructingPreferredSizeWidget { + /// {@template flutter.cupertino.navBar.leading} /// Widget to place at the start of the navigation bar. Normally a back button /// for a normal page or a cancel button for full page dialogs. @@ -411,7 +412,7 @@ class CupertinoNavigationBar extends StatefulWidget implements ObstructingPrefer /// True if the navigation bar's background color has no transparency. @override - bool get fullObstruction => backgroundColor == null ? null : backgroundColor.alpha == 0xFF; + bool shouldFullyObstruct(BuildContext context) => backgroundColor == null ? null : backgroundColor.alpha == 0xFF; @override Size get preferredSize { diff --git a/peek_and_pop/example/pubspec.lock b/peek_and_pop/example/pubspec.lock index 578d57e..793e182 100644 --- a/peek_and_pop/example/pubspec.lock +++ b/peek_and_pop/example/pubspec.lock @@ -1,69 +1,55 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.5.0-nullsafety" bloc: dependency: transitive description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "6.0.3" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" - charcode: + version: "2.1.0-nullsafety" + characters: dependency: transitive description: - name: charcode + name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" - collection: + version: "1.1.0-nullsafety.2" + charcode: dependency: transitive description: - name: collection + name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: + version: "1.2.0-nullsafety" + clock: dependency: transitive description: - name: convert + name: clock url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - crypto: + version: "1.1.0-nullsafety" + collection: dependency: transitive description: - name: crypto + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "1.15.0-nullsafety.2" cupertino_icons: dependency: "direct main" description: @@ -71,13 +57,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety" flick: dependency: transitive description: name: flick url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" flutter: dependency: "direct main" description: flutter @@ -88,69 +81,34 @@ packages: description: flutter source: sdk version: "0.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.10-nullsafety" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.3.0-nullsafety.2" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" + version: "1.8.0-nullsafety" peek_and_pop: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.0.2+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" - rxdart: - dependency: transitive - description: - name: rxdart - url: "https://pub.dartlang.org" - source: hosted - version: "0.22.2" + version: "1.0.3" sky_engine: dependency: transitive description: flutter @@ -162,49 +120,49 @@ packages: name: snap url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.8.0-nullsafety" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0-nullsafety" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.19-nullsafety" transparent_image: dependency: transitive description: @@ -218,14 +176,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.2" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.2" webview_flutter: dependency: "direct main" description: @@ -233,13 +191,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.13" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.10.0-0.0.dev <2.10.0" flutter: ">=1.5.0 <2.0.0" diff --git a/peek_and_pop/lib/misc.dart b/peek_and_pop/lib/misc.dart index ff670e4..e368629 100644 --- a/peek_and_pop/lib/misc.dart +++ b/peek_and_pop/lib/misc.dart @@ -72,8 +72,8 @@ Widget scaleUpWrapper(Widget child, double scaleUpCoefficient) { ///A Bloc class for controlling the [scaleDownWrapper] and [scaleUpWrapper]. class TransformBloc extends Bloc { - @override - double initialState = 0.0; + + TransformBloc(): super(0.0); @override Stream mapEventToState(double newState) async* { diff --git a/peek_and_pop/pretty_example/.flutter-plugins-dependencies b/peek_and_pop/pretty_example/.flutter-plugins-dependencies new file mode 100644 index 0000000..25b28ee --- /dev/null +++ b/peek_and_pop/pretty_example/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter","path":"/Users/fabriziotognetto/Library/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-0.3.13/","dependencies":[]}],"android":[{"name":"webview_flutter","path":"/Users/fabriziotognetto/Library/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-0.3.13/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-09-23 23:07:44.981689","version":"1.22.0-12.1.pre"} \ No newline at end of file diff --git a/peek_and_pop/pretty_example/lib/nav_bar.dart b/peek_and_pop/pretty_example/lib/nav_bar.dart index baa6ea3..d13b9c8 100644 --- a/peek_and_pop/pretty_example/lib/nav_bar.dart +++ b/peek_and_pop/pretty_example/lib/nav_bar.dart @@ -236,6 +236,7 @@ Widget _wrapWithBackground({ /// * [CupertinoSliverNavigationBar] for a navigation bar to be placed in a /// scrolling list and that supports iOS-11-style large titles. class CupertinoNavigationBar extends StatefulWidget implements ObstructingPreferredSizeWidget { + /// {@template flutter.cupertino.navBar.leading} /// Widget to place at the start of the navigation bar. Normally a back button /// for a normal page or a cancel button for full page dialogs. @@ -411,7 +412,7 @@ class CupertinoNavigationBar extends StatefulWidget implements ObstructingPrefer /// True if the navigation bar's background color has no transparency. @override - bool get fullObstruction => backgroundColor == null ? null : backgroundColor.alpha == 0xFF; + bool shouldFullyObstruct(BuildContext context) => backgroundColor == null ? null : backgroundColor.alpha == 0xFF; @override Size get preferredSize { diff --git a/peek_and_pop/pretty_example/pubspec.lock b/peek_and_pop/pretty_example/pubspec.lock index bcf4f76..a4d033c 100644 --- a/peek_and_pop/pretty_example/pubspec.lock +++ b/peek_and_pop/pretty_example/pubspec.lock @@ -1,69 +1,55 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.5.0-nullsafety" bloc: dependency: transitive description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "0.15.0" + version: "6.0.3" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" - charcode: + version: "2.1.0-nullsafety" + characters: dependency: transitive description: - name: charcode + name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" - collection: + version: "1.1.0-nullsafety.2" + charcode: dependency: transitive description: - name: collection + name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: + version: "1.2.0-nullsafety" + clock: dependency: transitive description: - name: convert + name: clock url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - crypto: + version: "1.1.0-nullsafety" + collection: dependency: transitive description: - name: crypto + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "1.15.0-nullsafety.2" cupertino_icons: dependency: "direct main" description: @@ -71,6 +57,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety" flick: dependency: transitive description: @@ -88,69 +81,34 @@ packages: description: flutter source: sdk version: "0.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.10-nullsafety" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.3.0-nullsafety.2" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" + version: "1.8.0-nullsafety" peek_and_pop: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.0.2" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" - rxdart: - dependency: transitive - description: - name: rxdart - url: "https://pub.dartlang.org" - source: hosted - version: "0.22.2" + version: "1.0.3" sky_engine: dependency: transitive description: flutter @@ -169,42 +127,42 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.8.0-nullsafety" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0-nullsafety" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.19-nullsafety" transparent_image: dependency: transitive description: @@ -218,14 +176,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.2" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.2" webview_flutter: dependency: "direct main" description: @@ -233,13 +191,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.13" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.10.0-0.0.dev <2.10.0" flutter: ">=1.5.0 <2.0.0" diff --git a/peek_and_pop/pubspec.lock b/peek_and_pop/pubspec.lock index fdf2c5a..3fa6b34 100644 --- a/peek_and_pop/pubspec.lock +++ b/peek_and_pop/pubspec.lock @@ -1,76 +1,69 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.5.0-nullsafety" bloc: dependency: "direct main" description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "6.0.3" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "2.1.0-nullsafety" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.2" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" - collection: + version: "1.2.0-nullsafety" + clock: dependency: transitive description: - name: collection + name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: + version: "1.1.0-nullsafety" + collection: dependency: transitive description: - name: convert + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - crypto: + version: "1.15.0-nullsafety.2" + fake_async: dependency: transitive description: - name: crypto + name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "1.1.0-nullsafety" flick: dependency: transitive description: name: flick url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" flutter: dependency: "direct main" description: flutter @@ -81,62 +74,27 @@ packages: description: flutter source: sdk version: "0.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.10-nullsafety" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.3.0-nullsafety.2" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" - rxdart: - dependency: transitive - description: - name: rxdart - url: "https://pub.dartlang.org" - source: hosted - version: "0.22.2" + version: "1.8.0-nullsafety" sky_engine: dependency: transitive description: flutter @@ -148,49 +106,49 @@ packages: name: snap url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.8.0-nullsafety" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0-nullsafety" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.19-nullsafety" transparent_image: dependency: "direct main" description: @@ -204,20 +162,13 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.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: "3.5.0" + version: "2.1.0-nullsafety.2" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.10.0-0.0.dev <2.10.0" diff --git a/peek_and_pop/pubspec.yaml b/peek_and_pop/pubspec.yaml index c7df0ad..dc687b8 100644 --- a/peek_and_pop/pubspec.yaml +++ b/peek_and_pop/pubspec.yaml @@ -6,14 +6,14 @@ repository : https://github.com/aliyigitbireroglu/flutter-peek-and-pop homepage : https://www.cosmossoftware.coffee environment : - sdk: ">=2.2.2 <3.0.0" + sdk: ">=2.8.0 <3.0.0" dependencies : flutter : sdk: flutter - snap : ^1.0.4 + snap : ^1.0.5 transparent_image: ^1.0.0 - bloc : ^2.0.0 + bloc : ^6.0.3 dev_dependencies: flutter_test: