From decbb4c5829c70e137ad2cb850652ae56c4e4a07 Mon Sep 17 00:00:00 2001 From: Kiat Stanley Date: Thu, 20 Jan 2022 17:03:59 +0700 Subject: [PATCH 1/2] Intergrated dependencies to this package, removed from pubspec.yaml --- example/lib/InnerSwiper.dart | 4 +- example/lib/listener_test.dart | 6 - example/lib/main.dart | 7 +- example/lib/src/ExampleCustom.dart | 1 - .../lib/src/ExampleSwiperInScrollView.dart | 1 - example/pubspec.lock | 116 ++-- example/test/widget_test.dart | 46 +- lib/flutter_swiper.dart | 2 + .../flutter_page_indicator.dart | 351 ++++++++++ lib/src/swiper.dart | 10 +- lib/src/swiper_controller.dart | 2 +- lib/src/swiper_pagination.dart | 3 - lib/src/swiper_plugin.dart | 1 - .../index_controller.dart | 47 ++ lib/src/transformer_page_view/parallax.dart | 145 ++++ .../transformer_page_view.dart | 622 ++++++++++++++++++ pubspec.lock | 106 +-- pubspec.yaml | 3 - 18 files changed, 1308 insertions(+), 165 deletions(-) create mode 100644 lib/src/flutter_page_indicator/flutter_page_indicator.dart create mode 100644 lib/src/transformer_page_view/index_controller.dart create mode 100644 lib/src/transformer_page_view/parallax.dart create mode 100644 lib/src/transformer_page_view/transformer_page_view.dart diff --git a/example/lib/InnerSwiper.dart b/example/lib/InnerSwiper.dart index ccf32a6..20a9cb8 100644 --- a/example/lib/InnerSwiper.dart +++ b/example/lib/InnerSwiper.dart @@ -29,10 +29,10 @@ class _InnerSwiperState extends State { @override void initState() { controller = new SwiperController(); - autoplayes = new List() + autoplayes = [] ..length = 10 ..fillRange(0, 10, false); - controllers = new List() + controllers = [] ..length = 10 ..fillRange(0, 10, new SwiperController()); super.initState(); diff --git a/example/lib/listener_test.dart b/example/lib/listener_test.dart index a81ca60..a4fe22f 100644 --- a/example/lib/listener_test.dart +++ b/example/lib/listener_test.dart @@ -1,11 +1,5 @@ import 'package:flutter/material.dart'; - import 'package:flutter_swiper/flutter_swiper.dart'; -import 'src/ExampleCustom.dart'; -import 'src/config.dart'; -import 'src/ExampleSwiperInScrollView.dart'; - -import 'package:flutter/cupertino.dart'; void main() => runApp(new MyApp()); diff --git a/example/lib/main.dart b/example/lib/main.dart index 6f05be1..7396f17 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,12 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_page_indicator/flutter_page_indicator.dart'; - import 'package:flutter_swiper/flutter_swiper.dart'; + import 'src/ExampleCustom.dart'; -import 'src/config.dart'; import 'src/ExampleSwiperInScrollView.dart'; - -import 'package:flutter/cupertino.dart'; +import 'src/config.dart'; void main() => runApp(new MyApp()); diff --git a/example/lib/src/ExampleCustom.dart b/example/lib/src/ExampleCustom.dart index 3b65a43..e31a81c 100644 --- a/example/lib/src/ExampleCustom.dart +++ b/example/lib/src/ExampleCustom.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_page_indicator/flutter_page_indicator.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'config.dart'; import 'forms/form_widget.dart'; diff --git a/example/lib/src/ExampleSwiperInScrollView.dart b/example/lib/src/ExampleSwiperInScrollView.dart index e15339f..7d7d663 100644 --- a/example/lib/src/ExampleSwiperInScrollView.dart +++ b/example/lib/src/ExampleSwiperInScrollView.dart @@ -114,7 +114,6 @@ class _ExampleState extends State @override Widget build(BuildContext context) { - double screenWidth = MediaQuery.of(context).size.width; return new Container( color: Theme.of(context).primaryColorLight, child: CustomScrollView( diff --git a/example/pubspec.lock b/example/pubspec.lock index 5aa195f..8266d7e 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,60 +1,74 @@ # Generated by pub -# See https://www.dartlang.org/tools/pub/glossary#lockfile +# See https://dart.dev/tools/pub/glossary#lockfile packages: async: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.5.0-nullsafety.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.1.0-nullsafety.1" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0-nullsafety.1" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.15.0-nullsafety.3" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.1.2" + version: "0.1.3" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0-nullsafety.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_page_indicator: - dependency: transitive - description: - name: flutter_page_indicator - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.0.3" flutter_swiper: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.1.5" + version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -64,37 +78,30 @@ packages: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.12.3+1" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.3" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.6.2" + version: "1.8.0-nullsafety.1" percent_indicator: dependency: "direct main" description: name: percent_indicator - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.9" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.9+1" sky_engine: dependency: transitive description: flutter @@ -104,65 +111,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.4.1" + version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.6.8" + version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.2.1" - transformer_page_view: - dependency: transitive - description: - name: transformer_page_view - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.5" + version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.3" sdks: - dart: ">=2.0.0 <3.0.0" + dart: ">=2.10.0-110 <2.11.0" flutter: ">=0.1.4 <3.0.0" diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart index 63d397c..a466b0f 100644 --- a/example/test/widget_test.dart +++ b/example/test/widget_test.dart @@ -1,29 +1,29 @@ -// This is a basic Flutter widget test. -// To perform an interaction with a widget in your test, use the WidgetTester utility that Flutter -// provides. For example, you can send tap and scroll 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. +// // This is a basic Flutter widget test. +// // To perform an interaction with a widget in your test, use the WidgetTester utility that Flutter +// // provides. For example, you can send tap and scroll 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:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; +// import 'package:flutter/material.dart'; +// import 'package:flutter_test/flutter_test.dart'; -import 'package:example/main.dart'; +// import 'package:example/main.dart'; -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(new MyApp()); +// void main() { +// testWidgets('Counter increments smoke test', (WidgetTester tester) async { +// // Build our app and trigger a frame. +// await tester.pumpWidget(new MyApp()); - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); +// // Verify that our counter starts at 0. +// expect(find.text('0'), findsOneWidget); +// expect(find.text('1'), findsNothing); - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); +// // Tap the '+' icon and trigger a frame. +// await tester.tap(find.byIcon(Icons.add)); +// await tester.pump(); - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} +// // Verify that our counter has incremented. +// expect(find.text('0'), findsNothing); +// expect(find.text('1'), findsOneWidget); +// }); +// } diff --git a/lib/flutter_swiper.dart b/lib/flutter_swiper.dart index 5f19cad..e5cb768 100644 --- a/lib/flutter_swiper.dart +++ b/lib/flutter_swiper.dart @@ -5,3 +5,5 @@ export 'src/swiper_pagination.dart'; export 'src/swiper_control.dart'; export 'src/swiper_controller.dart'; export 'src/swiper_plugin.dart'; +export 'src/flutter_page_indicator/flutter_page_indicator.dart'; +export 'src/transformer_page_view/transformer_page_view.dart'; diff --git a/lib/src/flutter_page_indicator/flutter_page_indicator.dart b/lib/src/flutter_page_indicator/flutter_page_indicator.dart new file mode 100644 index 0000000..67b03da --- /dev/null +++ b/lib/src/flutter_page_indicator/flutter_page_indicator.dart @@ -0,0 +1,351 @@ +library flutter_page_indicator; + +import 'package:flutter/material.dart'; + +class _WarmPainter extends _BasePainter { + _WarmPainter(PageIndicator widget, double page, int index, Paint paint) + : super(widget, page, index, paint); + + void draw(Canvas canvas, double space, double size, double radius) { + double progress = page - index; + double distance = size + space; + double start = index * (size + space); + + if (progress > 0.5) { + double right = start + size + distance; + //progress=>0.5-1.0 + //left:0.0=>distance + + double left = index * distance + distance * (progress - 0.5) * 2; + canvas.drawRRect( + new RRect.fromLTRBR( + left, 0.0, right, size, new Radius.circular(radius)), + _paint); + } else { + double right = start + size + distance * progress * 2; + + canvas.drawRRect( + new RRect.fromLTRBR( + start, 0.0, right, size, new Radius.circular(radius)), + _paint); + } + } +} + +class _DropPainter extends _BasePainter { + _DropPainter(PageIndicator widget, double page, int index, Paint paint) + : super(widget, page, index, paint); + + @override + void draw(Canvas canvas, double space, double size, double radius) { + double progress = page - index; + double dropHeight = widget.dropHeight; + double rate = (0.5 - progress).abs() * 2; + double scale = widget.scale; + + //lerp(begin, end, progress) + + canvas.drawCircle( + new Offset(radius + ((page) * (size + space)), + radius - dropHeight * (1 - rate)), + radius * (scale + rate * (1.0 - scale)), + _paint); + } +} + +class _NonePainter extends _BasePainter { + _NonePainter(PageIndicator widget, double page, int index, Paint paint) + : super(widget, page, index, paint); + + @override + void draw(Canvas canvas, double space, double size, double radius) { + double progress = page - index; + double secondOffset = index == widget.count - 1 + ? radius + : radius + ((index + 1) * (size + space)); + + if (progress > 0.5) { + canvas.drawCircle(new Offset(secondOffset, radius), radius, _paint); + } else { + canvas.drawCircle(new Offset(radius + (index * (size + space)), radius), + radius, _paint); + } + } +} + +class _SlidePainter extends _BasePainter { + _SlidePainter(PageIndicator widget, double page, int index, Paint paint) + : super(widget, page, index, paint); + + @override + void draw(Canvas canvas, double space, double size, double radius) { + canvas.drawCircle( + new Offset(radius + (page * (size + space)), radius), radius, _paint); + } +} + +class _ScalePainter extends _BasePainter { + _ScalePainter(PageIndicator widget, double page, int index, Paint paint) + : super(widget, page, index, paint); + + // 连续的两个点，含有最后一个和第一个 + @override + bool _shouldSkip(int i) { + if (index == widget.count - 1) { + return i == 0 || i == index; + } + return (i == index || i == index + 1); + } + + @override + void paint(Canvas canvas, Size size) { + _paint.color = widget.color; + double space = widget.space; + double size = widget.size; + double radius = size / 2; + for (int i = 0, c = widget.count; i < c; ++i) { + if (_shouldSkip(i)) { + continue; + } + canvas.drawCircle(new Offset(i * (size + space) + radius, radius), + radius * widget.scale, _paint); + } + + _paint.color = widget.activeColor; + draw(canvas, space, size, radius); + } + + @override + void draw(Canvas canvas, double space, double size, double radius) { + double secondOffset = index == widget.count - 1 + ? radius + : radius + ((index + 1) * (size + space)); + + double progress = page - index; + _paint.color = Color.lerp(widget.activeColor, widget.color, progress); + //last + canvas.drawCircle(new Offset(radius + (index * (size + space)), radius), + lerp(radius, radius * widget.scale, progress), _paint); + //first + _paint.color = Color.lerp(widget.color, widget.activeColor, progress); + canvas.drawCircle(new Offset(secondOffset, radius), + lerp(radius * widget.scale, radius, progress), _paint); + } +} + +class _ColorPainter extends _BasePainter { + _ColorPainter(PageIndicator widget, double page, int index, Paint paint) + : super(widget, page, index, paint); + + // 连续的两个点，含有最后一个和第一个 + @override + bool _shouldSkip(int i) { + if (index == widget.count - 1) { + return i == 0 || i == index; + } + return (i == index || i == index + 1); + } + + @override + void draw(Canvas canvas, double space, double size, double radius) { + double progress = page - index; + double secondOffset = index == widget.count - 1 + ? radius + : radius + ((index + 1) * (size + space)); + + _paint.color = Color.lerp(widget.activeColor, widget.color, progress); + //left + canvas.drawCircle( + new Offset(radius + (index * (size + space)), radius), radius, _paint); + //right + _paint.color = Color.lerp(widget.color, widget.activeColor, progress); + canvas.drawCircle(new Offset(secondOffset, radius), radius, _paint); + } +} + +abstract class _BasePainter extends CustomPainter { + final PageIndicator widget; + final double page; + final int index; + final Paint _paint; + + double lerp(double begin, double end, double progress) { + return begin + (end - begin) * progress; + } + + _BasePainter(this.widget, this.page, this.index, this._paint); + + void draw(Canvas canvas, double space, double size, double radius); + + bool _shouldSkip(int index) { + return false; + } + //double secondOffset = index == widget.count-1 ? radius : radius + ((index + 1) * (size + space)); + + @override + void paint(Canvas canvas, Size size) { + _paint.color = widget.color; + double space = widget.space; + double size = widget.size; + double radius = size / 2; + for (int i = 0, c = widget.count; i < c; ++i) { + if (_shouldSkip(i)) { + continue; + } + canvas.drawCircle( + new Offset(i * (size + space) + radius, radius), radius, _paint); + } + + double page = this.page; + if (page < index) { + page = 0.0; + } + _paint.color = widget.activeColor; + draw(canvas, space, size, radius); + } + + @override + bool shouldRepaint(_BasePainter oldDelegate) { + return oldDelegate.page != page; + } +} + +class _PageIndicatorState extends State { + int index = 0; + Paint _paint = new Paint(); + + _BasePainter _createPainer() { + switch (widget.layout) { + case PageIndicatorLayout.NONE: + return new _NonePainter( + widget, widget.controller.page ?? 0.0, index, _paint); + case PageIndicatorLayout.SLIDE: + return new _SlidePainter( + widget, widget.controller.page ?? 0.0, index, _paint); + case PageIndicatorLayout.WARM: + return new _WarmPainter( + widget, widget.controller.page ?? 0.0, index, _paint); + case PageIndicatorLayout.COLOR: + return new _ColorPainter( + widget, widget.controller.page ?? 0.0, index, _paint); + case PageIndicatorLayout.SCALE: + return new _ScalePainter( + widget, widget.controller.page ?? 0.0, index, _paint); + case PageIndicatorLayout.DROP: + return new _DropPainter( + widget, widget.controller.page ?? 0.0, index, _paint); + default: + throw new Exception("Not a valid layout"); + } + } + + @override + Widget build(BuildContext context) { + Widget child = new SizedBox( + width: widget.count * widget.size + (widget.count - 1) * widget.space, + height: widget.size, + child: new CustomPaint( + painter: _createPainer(), + ), + ); + + if (widget.layout == PageIndicatorLayout.SCALE || + widget.layout == PageIndicatorLayout.COLOR) { + child = new ClipRect( + child: child, + ); + } + + return new IgnorePointer( + child: child, + ); + } + + void _onController() { + double page = widget.controller.page ?? 0.0; + index = page.floor(); + + setState(() {}); + } + + @override + void initState() { + widget.controller.addListener(_onController); + super.initState(); + } + + @override + void didUpdateWidget(PageIndicator oldWidget) { + if (widget.controller != oldWidget.controller) { + oldWidget.controller.removeListener(_onController); + widget.controller.addListener(_onController); + } + super.didUpdateWidget(oldWidget); + } + + @override + void dispose() { + widget.controller.removeListener(_onController); + super.dispose(); + } +} + +enum PageIndicatorLayout { + NONE, + SLIDE, + WARM, + COLOR, + SCALE, + DROP, +} + +class PageIndicator extends StatefulWidget { + /// size of the dots + final double size; + + /// space between dots. + final double space; + + /// count of dots + final int count; + + /// active color + final Color activeColor; + + /// normal color + final Color color; + + /// layout of the dots,default is [PageIndicatorLayout.SLIDE] + final PageIndicatorLayout layout; + + // Only valid when layout==PageIndicatorLayout.scale + final double scale; + + // Only valid when layout==PageIndicatorLayout.drop + final double dropHeight; + + final PageController controller; + + final double activeSize; + + PageIndicator( + {Key key, + this.size: 20.0, + this.space: 5.0, + this.count, + this.activeSize: 20.0, + this.controller, + this.color: Colors.white30, + this.layout: PageIndicatorLayout.SLIDE, + this.activeColor: Colors.white, + this.scale: 0.6, + this.dropHeight: 20.0}) + : assert(count != null), + assert(controller != null), + super(key: key); + + @override + State createState() { + return new _PageIndicatorState(); + } +} \ No newline at end of file diff --git a/lib/src/swiper.dart b/lib/src/swiper.dart index 9783740..6874079 100644 --- a/lib/src/swiper.dart +++ b/lib/src/swiper.dart @@ -1,10 +1,7 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter_page_indicator/flutter_page_indicator.dart'; -import 'package:flutter_swiper/flutter_swiper.dart'; import 'dart:async'; -import 'package:transformer_page_view/transformer_page_view.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_swiper/flutter_swiper.dart'; part 'custom_layout.dart'; @@ -18,9 +15,6 @@ const int kDefaultAutoplayDelayMs = 3000; /// Default auto play transition duration (in millisecond) const int kDefaultAutoplayTransactionDuration = 300; -const int kMaxValue = 2000000000; -const int kMiddleValue = 1000000000; - enum SwiperLayout { DEFAULT, STACK, TINDER, CUSTOM } class Swiper extends StatefulWidget { diff --git a/lib/src/swiper_controller.dart b/lib/src/swiper_controller.dart index a659500..c527915 100644 --- a/lib/src/swiper_controller.dart +++ b/lib/src/swiper_controller.dart @@ -1,5 +1,5 @@ import 'package:flutter_swiper/src/swiper_plugin.dart'; -import 'package:transformer_page_view/transformer_page_view.dart'; +import 'package:flutter_swiper/src/transformer_page_view/transformer_page_view.dart'; class SwiperController extends IndexController { // Autoplay is started diff --git a/lib/src/swiper_pagination.dart b/lib/src/swiper_pagination.dart index a866de2..ae847e1 100644 --- a/lib/src/swiper_pagination.dart +++ b/lib/src/swiper_pagination.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; -import 'package:flutter_page_indicator/flutter_page_indicator.dart'; - class FractionPaginationBuilder extends SwiperPlugin { ///color ,if set null , will be Theme.of(context).scaffoldBackgroundColor final Color color; diff --git a/lib/src/swiper_plugin.dart b/lib/src/swiper_plugin.dart index 5c9fb9a..f54a2eb 100644 --- a/lib/src/swiper_plugin.dart +++ b/lib/src/swiper_plugin.dart @@ -1,5 +1,4 @@ import 'package:flutter/widgets.dart'; -import 'package:flutter_page_indicator/flutter_page_indicator.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; /// plugin to display swiper components diff --git a/lib/src/transformer_page_view/index_controller.dart b/lib/src/transformer_page_view/index_controller.dart new file mode 100644 index 0000000..d3f6a51 --- /dev/null +++ b/lib/src/transformer_page_view/index_controller.dart @@ -0,0 +1,47 @@ +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; + +class IndexController extends ChangeNotifier { + static const int NEXT = 1; + static const int PREVIOUS = -1; + static const int MOVE = 0; + + Completer _completer; + + int index; + bool animation; + int event; + + Future move(int index, {bool animation: true}) { + this.animation = animation ?? true; + this.index = index; + this.event = MOVE; + _completer = new Completer(); + notifyListeners(); + return _completer.future; + } + + Future next({bool animation: true}) { + this.event = NEXT; + this.animation = animation ?? true; + _completer = new Completer(); + notifyListeners(); + return _completer.future; + } + + Future previous({bool animation: true}) { + this.event = PREVIOUS; + this.animation = animation ?? true; + _completer = new Completer(); + notifyListeners(); + return _completer.future; + } + + void complete() { + if (!_completer.isCompleted) { + _completer.complete(); + } + } +} \ No newline at end of file diff --git a/lib/src/transformer_page_view/parallax.dart b/lib/src/transformer_page_view/parallax.dart new file mode 100644 index 0000000..c7c95ea --- /dev/null +++ b/lib/src/transformer_page_view/parallax.dart @@ -0,0 +1,145 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_swiper/src/transformer_page_view/transformer_page_view.dart'; + +typedef void PaintCallback(Canvas canvas, Size siz); + +class ColorPainter extends CustomPainter { + final Paint _paint; + final TransformInfo info; + final List colors; + + ColorPainter(this._paint, this.info, this.colors); + + @override + void paint(Canvas canvas, Size size) { + int index = info.fromIndex; + _paint.color = colors[index]; + canvas.drawRect( + new Rect.fromLTWH(0.0, 0.0, size.width, size.height), _paint); + if (info.done) { + return; + } + int alpha; + int color; + double opacity; + double position = info.position; + if (info.forward) { + if (index < colors.length - 1) { + color = colors[index + 1].value & 0x00ffffff; + opacity = (position <= 0 + ? (-position / info.viewportFraction) + : 1 - position / info.viewportFraction); + if (opacity > 1) { + opacity -= 1.0; + } + if (opacity < 0) { + opacity += 1.0; + } + alpha = (0xff * opacity).toInt(); + + _paint.color = new Color((alpha << 24) | color); + canvas.drawRect( + new Rect.fromLTWH(0.0, 0.0, size.width, size.height), _paint); + } + } else { + if (index > 0) { + color = colors[index - 1].value & 0x00ffffff; + opacity = (position > 0 + ? position / info.viewportFraction + : (1 + position / info.viewportFraction)); + if (opacity > 1) { + opacity -= 1.0; + } + if (opacity < 0) { + opacity += 1.0; + } + alpha = (0xff * opacity).toInt(); + + _paint.color = new Color((alpha << 24) | color); + canvas.drawRect( + new Rect.fromLTWH(0.0, 0.0, size.width, size.height), _paint); + } + } + } + + @override + bool shouldRepaint(ColorPainter oldDelegate) { + return oldDelegate.info != info; + } +} + +class _ParallaxColorState extends State { + Paint paint = new Paint(); + + @override + Widget build(BuildContext context) { + return new CustomPaint( + painter: new ColorPainter(paint, widget.info, widget.colors), + child: widget.child, + ); + } +} + +class ParallaxColor extends StatefulWidget { + final Widget child; + + final List colors; + + final TransformInfo info; + + ParallaxColor({ + @required this.colors, + @required this.info, + @required this.child, + }); + + @override + State createState() { + return new _ParallaxColorState(); + } +} + +class ParallaxContainer extends StatelessWidget { + final Widget child; + final double position; + final double translationFactor; + final double opacityFactor; + + ParallaxContainer( + {@required this.child, + @required this.position, + this.translationFactor: 100.0, + this.opacityFactor: 1.0}) + : assert(position != null), + assert(translationFactor != null); + + @override + Widget build(BuildContext context) { + return Opacity( + opacity: (1 - position.abs()).clamp(0.0, 1.0) * opacityFactor, + child: new Transform.translate( + offset: new Offset(position * translationFactor, 0.0), + child: child, + ), + ); + } +} + +class ParallaxImage extends StatelessWidget { + final Image image; + final double imageFactor; + + ParallaxImage.asset(String name, {double position, this.imageFactor: 0.3}) + : assert(imageFactor != null), + image = Image.asset(name, + fit: BoxFit.cover, + alignment: FractionalOffset( + 0.5 + position * imageFactor, + 0.5, + )); + + @override + Widget build(BuildContext context) { + return image; + } +} \ No newline at end of file diff --git a/lib/src/transformer_page_view/transformer_page_view.dart b/lib/src/transformer_page_view/transformer_page_view.dart new file mode 100644 index 0000000..09d19fc --- /dev/null +++ b/lib/src/transformer_page_view/transformer_page_view.dart @@ -0,0 +1,622 @@ +library transformer_page_view; + +import 'package:flutter/widgets.dart'; +import 'package:flutter_swiper/src/transformer_page_view/index_controller.dart'; +export 'package:flutter_swiper/src/transformer_page_view/index_controller.dart'; +export 'package:flutter_swiper/src/transformer_page_view/parallax.dart'; + +/// +/// NOTICE:: +/// +/// In order to make package smaller,currently we're not supporting any build-in page transformers +/// You can find build in transforms here: +/// +/// +/// +const int kMaxValue = 2000000000; +const int kMiddleValue = 1000000000; + +/// Default auto play transition duration (in millisecond) +const int kDefaultTransactionDuration = 300; + +class TransformInfo { + /// The `width` of the `TransformerPageView` + final double width; + + /// The `height` of the `TransformerPageView` + final double height; + + /// The `position` of the widget pass to [PageTransformer.transform] + /// A `position` describes how visible the widget is. + /// The widget in the center of the screen' which is full visible, position is 0.0. + /// The widge in the left ,may be hidden, of the screen's position is less than 0.0, -1.0 when out of the screen. + /// The widge in the right ,may be hidden, of the screen's position is greater than 0.0, 1.0 when out of the screen + /// + /// + final double position; + + /// The `index` of the widget pass to [PageTransformer.transform] + final int index; + + /// The `activeIndex` of the PageView + final int activeIndex; + + /// The `activeIndex` of the PageView, from user start to swipe + /// It will change when user end drag + final int fromIndex; + + /// Next `index` is greater than this `index` + final bool forward; + + /// User drag is done. + final bool done; + + /// Same as [TransformerPageView.viewportFraction] + final double viewportFraction; + + /// Copy from [TransformerPageView.scrollDirection] + final Axis scrollDirection; + + TransformInfo( + {this.index, + this.position, + this.width, + this.height, + this.activeIndex, + this.fromIndex, + this.forward, + this.done, + this.viewportFraction, + this.scrollDirection}); +} + +abstract class PageTransformer { + /// + final bool reverse; + + PageTransformer({this.reverse: false}); + + /// Return a transformed widget, based on child and TransformInfo + Widget transform(Widget child, TransformInfo info); +} + +typedef Widget PageTransformerBuilderCallback(Widget child, TransformInfo info); + +class PageTransformerBuilder extends PageTransformer { + final PageTransformerBuilderCallback builder; + + PageTransformerBuilder({bool reverse: false, @required this.builder}) + : assert(builder != null), + super(reverse: reverse); + + @override + Widget transform(Widget child, TransformInfo info) { + return builder(child, info); + } +} + +class TransformerPageController extends PageController { + final bool loop; + final int itemCount; + final bool reverse; + + TransformerPageController({ + int initialPage = 0, + bool keepPage = true, + double viewportFraction = 1.0, + this.loop: false, + this.itemCount, + this.reverse: false, + }) : super( + initialPage: TransformerPageController._getRealIndexFromRenderIndex( + initialPage ?? 0, loop, itemCount, reverse), + keepPage: keepPage, + viewportFraction: viewportFraction); + + int getRenderIndexFromRealIndex(num index) { + return _getRenderIndexFromRealIndex(index, loop, itemCount, reverse); + } + + int getRealItemCount() { + if (itemCount == 0) return 0; + return loop ? itemCount + kMaxValue : itemCount; + } + + static _getRenderIndexFromRealIndex( + num index, bool loop, int itemCount, bool reverse) { + if (itemCount == 0) return 0; + int renderIndex; + if (loop) { + renderIndex = index - kMiddleValue; + renderIndex = renderIndex % itemCount; + if (renderIndex < 0) { + renderIndex += itemCount; + } + } else { + renderIndex = index; + } + if (reverse) { + renderIndex = itemCount - renderIndex - 1; + } + + return renderIndex; + } + + double get realPage { + double page; + if (position.maxScrollExtent == null || position.minScrollExtent == null) { + page = 0.0; + } else { + page = super.page; + } + + return page; + } + + static _getRenderPageFromRealPage( + double page, bool loop, int itemCount, bool reverse) { + double renderPage; + if (loop) { + renderPage = page - kMiddleValue; + renderPage = renderPage % itemCount; + if (renderPage < 0) { + renderPage += itemCount; + } + } else { + renderPage = page; + } + if (reverse) { + renderPage = itemCount - renderPage - 1; + } + + return renderPage; + } + + double get page { + return loop + ? _getRenderPageFromRealPage(realPage, loop, itemCount, reverse) + : realPage; + } + + int getRealIndexFromRenderIndex(num index) { + return _getRealIndexFromRenderIndex(index, loop, itemCount, reverse); + } + + static int _getRealIndexFromRenderIndex( + num index, bool loop, int itemCount, bool reverse) { + int result = reverse ? (itemCount - index - 1) : index; + if (loop) { + result += kMiddleValue; + } + return result; + } +} + +class TransformerPageView extends StatefulWidget { + /// Create a `transformed` widget base on the widget that has been passed to the [PageTransformer.transform]. + /// See [TransformInfo] + /// + final PageTransformer transformer; + + /// Same as [PageView.scrollDirection] + /// + /// Defaults to [Axis.horizontal]. + final Axis scrollDirection; + + /// Same as [PageView.physics] + final ScrollPhysics physics; + + /// Set to false to disable page snapping, useful for custom scroll behavior. + /// Same as [PageView.pageSnapping] + final bool pageSnapping; + + /// Called whenever the page in the center of the viewport changes. + /// Same as [PageView.onPageChanged] + final ValueChanged onPageChanged; + + final IndexedWidgetBuilder itemBuilder; + + // See [IndexController.mode],[IndexController.next],[IndexController.previous] + final IndexController controller; + + /// Animation duration + final Duration duration; + + /// Animation curve + final Curve curve; + + final TransformerPageController pageController; + + /// Set true to open infinity loop mode. + final bool loop; + + /// This value is only valid when `pageController` is not set, + final int itemCount; + + /// This value is only valid when `pageController` is not set, + final double viewportFraction; + + /// If not set, it is controlled by this widget. + final int index; + + /// Creates a scrollable list that works page by page using widgets that are + /// created on demand. + /// + /// This constructor is appropriate for page views with a large (or infinite) + /// number of children because the builder is called only for those children + /// that are actually visible. + /// + /// Providing a non-null [itemCount] lets the [PageView] compute the maximum + /// scroll extent. + /// + /// [itemBuilder] will be called only with indices greater than or equal to + /// zero and less than [itemCount]. + TransformerPageView({ + Key key, + this.index, + Duration duration, + this.curve: Curves.ease, + this.viewportFraction: 1.0, + this.loop: false, + this.scrollDirection = Axis.horizontal, + this.physics, + this.pageSnapping = true, + this.onPageChanged, + this.controller, + this.transformer, + this.itemBuilder, + this.pageController, + @required this.itemCount, + }) : assert(itemCount != null), + assert(itemCount == 0 || itemBuilder != null || transformer != null), + this.duration = + duration ?? new Duration(milliseconds: kDefaultTransactionDuration), + super(key: key); + + factory TransformerPageView.children( + {Key key, + int index, + Duration duration, + Curve curve: Curves.ease, + double viewportFraction: 1.0, + bool loop: false, + Axis scrollDirection = Axis.horizontal, + ScrollPhysics physics, + bool pageSnapping = true, + ValueChanged onPageChanged, + IndexController controller, + PageTransformer transformer, + @required List children, + TransformerPageController pageController}) { + assert(children != null); + return new TransformerPageView( + itemCount: children.length, + itemBuilder: (BuildContext context, int index) { + return children[index]; + }, + pageController: pageController, + transformer: transformer, + pageSnapping: pageSnapping, + key: key, + index: index, + duration: duration, + curve: curve, + viewportFraction: viewportFraction, + scrollDirection: scrollDirection, + physics: physics, + onPageChanged: onPageChanged, + controller: controller, + ); + } + + @override + State createState() { + return new _TransformerPageViewState(); + } + + static int getRealIndexFromRenderIndex( + {bool reverse, int index, int itemCount, bool loop}) { + int initPage = reverse ? (itemCount - index - 1) : index; + if (loop) { + initPage += kMiddleValue; + } + return initPage; + } + + static PageController createPageController( + {bool reverse, + int index, + int itemCount, + bool loop, + double viewportFraction}) { + return new PageController( + initialPage: getRealIndexFromRenderIndex( + reverse: reverse, index: index, itemCount: itemCount, loop: loop), + viewportFraction: viewportFraction); + } +} + +class _TransformerPageViewState extends State { + Size _size; + int _activeIndex; + double _currentPixels; + bool _done = false; + + ///This value will not change until user end drag. + int _fromIndex; + + PageTransformer _transformer; + + TransformerPageController _pageController; + + Widget _buildItemNormal(BuildContext context, int index) { + int renderIndex = _pageController.getRenderIndexFromRealIndex(index); + Widget child = widget.itemBuilder(context, renderIndex); + return child; + } + + Widget _buildItem(BuildContext context, int index) { + return new AnimatedBuilder( + animation: _pageController, + builder: (BuildContext c, Widget w) { + int renderIndex = _pageController.getRenderIndexFromRealIndex(index); + Widget child; + if (widget.itemBuilder != null) { + child = widget.itemBuilder(context, renderIndex); + } + if (child == null) { + child = new Container(); + } + if (_size == null) { + return child ?? new Container(); + } + + double position; + + double page = _pageController.realPage; + + if (_transformer.reverse) { + position = page - index; + } else { + position = index - page; + } + position *= widget.viewportFraction; + + TransformInfo info = new TransformInfo( + index: renderIndex, + width: _size.width, + height: _size.height, + position: position.clamp(-1.0, 1.0), + activeIndex: + _pageController.getRenderIndexFromRealIndex(_activeIndex), + fromIndex: _fromIndex, + forward: _pageController.position.pixels - _currentPixels >= 0, + done: _done, + scrollDirection: widget.scrollDirection, + viewportFraction: widget.viewportFraction); + return _transformer.transform(child, info); + }); + } + + double _calcCurrentPixels() { + _currentPixels = _pageController.getRenderIndexFromRealIndex(_activeIndex) * + _pageController.position.viewportDimension * + widget.viewportFraction; + + // print("activeIndex:$_activeIndex , pix:$_currentPixels"); + + return _currentPixels; + } + + @override + Widget build(BuildContext context) { + IndexedWidgetBuilder builder = + _transformer == null ? _buildItemNormal : _buildItem; + Widget child = new PageView.builder( + itemBuilder: builder, + itemCount: _pageController.getRealItemCount(), + onPageChanged: _onIndexChanged, + controller: _pageController, + scrollDirection: widget.scrollDirection, + physics: widget.physics, + pageSnapping: widget.pageSnapping, + reverse: _pageController.reverse, + ); + if (_transformer == null) { + return child; + } + return new NotificationListener( + onNotification: (ScrollNotification notification) { + if (notification is ScrollStartNotification) { + _calcCurrentPixels(); + _done = false; + _fromIndex = _activeIndex; + } else if (notification is ScrollEndNotification) { + _calcCurrentPixels(); + _fromIndex = _activeIndex; + _done = true; + } + + return false; + }, + child: child); + } + + void _onIndexChanged(int index) { + _activeIndex = index; + if (widget.onPageChanged != null) { + widget.onPageChanged(_pageController.getRenderIndexFromRealIndex(index)); + } + } + + void _onGetSize(_) { + Size size; + if (context == null) { + onGetSize(size); + return; + } + RenderObject renderObject = context.findRenderObject(); + if (renderObject != null) { + Rect bounds = renderObject.paintBounds; + if (bounds != null) { + size = bounds.size; + } + } + _calcCurrentPixels(); + onGetSize(size); + } + + void onGetSize(Size size) { + if(mounted){ + setState(() { + _size = size; + }); + } + + } + + @override + void initState() { + _transformer = widget.transformer; + // int index = widget.index ?? 0; + _pageController = widget.pageController; + if (_pageController == null) { + _pageController = new TransformerPageController( + initialPage: widget.index, + itemCount: widget.itemCount, + loop: widget.loop, + reverse: + widget.transformer == null ? false : widget.transformer.reverse); + } + // int initPage = _getRealIndexFromRenderIndex(index); + // _pageController = new PageController(initialPage: initPage,viewportFraction: widget.viewportFraction); + _fromIndex = _activeIndex = _pageController.initialPage; + + _controller = getNotifier(); + if (_controller != null) { + _controller.addListener(onChangeNotifier); + } + super.initState(); + } + + @override + void didUpdateWidget(TransformerPageView oldWidget) { + _transformer = widget.transformer; + int index = widget.index ?? 0; + bool created = false; + if (_pageController != widget.pageController) { + if (widget.pageController != null) { + _pageController = widget.pageController; + } else { + created = true; + _pageController = new TransformerPageController( + initialPage: widget.index, + itemCount: widget.itemCount, + loop: widget.loop, + reverse: widget.transformer == null + ? false + : widget.transformer.reverse); + } + } + + if (_pageController.getRenderIndexFromRealIndex(_activeIndex) != index) { + _fromIndex = _activeIndex = _pageController.initialPage; + if (!created) { + int initPage = _pageController.getRealIndexFromRenderIndex(index); + _pageController.animateToPage(initPage, + duration: widget.duration, curve: widget.curve); + } + } + if (_transformer != null) + WidgetsBinding.instance.addPostFrameCallback(_onGetSize); + + if (_controller != getNotifier()) { + if (_controller != null) { + _controller.removeListener(onChangeNotifier); + } + _controller = getNotifier(); + if (_controller != null) { + _controller.addListener(onChangeNotifier); + } + } + super.didUpdateWidget(oldWidget); + } + + @override + void didChangeDependencies() { + if (_transformer != null) + WidgetsBinding.instance.addPostFrameCallback(_onGetSize); + super.didChangeDependencies(); + } + + ChangeNotifier getNotifier() { + return widget.controller; + } + + int _calcNextIndex(bool next) { + int currentIndex = _activeIndex; + if (_pageController.reverse) { + if (next) { + currentIndex--; + } else { + currentIndex++; + } + } else { + if (next) { + currentIndex++; + } else { + currentIndex--; + } + } + + if (!_pageController.loop) { + if (currentIndex >= _pageController.itemCount) { + currentIndex = 0; + } else if (currentIndex < 0) { + currentIndex = _pageController.itemCount - 1; + } + } + + return currentIndex; + } + + void onChangeNotifier() { + int event = widget.controller.event; + int index; + switch (event) { + case IndexController.MOVE: + { + index = _pageController + .getRealIndexFromRenderIndex(widget.controller.index); + } + break; + case IndexController.PREVIOUS: + case IndexController.NEXT: + { + index = _calcNextIndex(event == IndexController.NEXT); + } + break; + default: + //ignore this event + return; + } + if (widget.controller.animation) { + _pageController + .animateToPage(index, + duration: widget.duration, curve: widget.curve ?? Curves.ease) + .whenComplete(widget.controller.complete); + } else { + _pageController.jumpToPage(index); + widget.controller.complete(); + } + } + + ChangeNotifier _controller; + + void dispose() { + super.dispose(); + if (_controller != null) { + _controller.removeListener(onChangeNotifier); + } + } +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 86f253d..18b893b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,46 +1,60 @@ # Generated by pub -# See https://www.dartlang.org/tools/pub/glossary#lockfile +# See https://dart.dev/tools/pub/glossary#lockfile packages: async: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.5.0-nullsafety.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.1.0-nullsafety.1" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.0-nullsafety.1" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0-nullsafety.3" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.2.0-nullsafety.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_page_indicator: - dependency: "direct main" - description: - name: flutter_page_indicator - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.0.3" flutter_test: dependency: "direct dev" description: flutter @@ -50,30 +64,23 @@ packages: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.12.3+1" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.3" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.6.2" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" + version: "1.8.0-nullsafety.1" sky_engine: dependency: transitive description: flutter @@ -83,65 +90,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.4.1" + version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.6.8" + version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.2.1" - transformer_page_view: - dependency: "direct main" - description: - name: transformer_page_view - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.1.5" + version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.3" sdks: - dart: ">=2.0.0 <3.0.0" + dart: ">=2.10.0-110 <2.11.0" flutter: ">=0.1.4 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 17ed711..222054b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,9 +8,6 @@ dependencies: flutter: sdk: flutter - transformer_page_view: ^0.1.6 - flutter_page_indicator: ^0.0.3 - environment: sdk: ">=2.0.0-dev.48.0 <3.0.0" flutter: ">=0.1.4 <3.0.0" From adcfb7e80de65807553d21b7801655d23f34d031 Mon Sep 17 00:00:00 2001 From: Kiat Stanley Date: Fri, 21 Jan 2022 12:47:13 +0700 Subject: [PATCH 2/2] Upgrade to null-safety --- example/.gitignore | 43 ++- example/.metadata | 6 +- example/analysis_options.yaml | 29 ++ example/android/.gitignore | 19 +- example/android/app/build.gradle | 39 +- .../android/app/src/debug/AndroidManifest.xml | 7 + .../android/app/src/main/AndroidManifest.xml | 37 +- .../com/example/example/MainActivity.java | 14 - .../com/example/example/MainActivity.kt | 6 + .../res/drawable-v21/launch_background.xml | 12 + .../app/src/main/res/values-night/styles.xml | 18 + .../app/src/main/res/values/styles.xml | 12 +- .../app/src/profile/AndroidManifest.xml | 7 + example/android/build.gradle | 8 +- example/android/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 18 +- example/ios/.gitignore | 66 ++-- example/ios/Flutter/AppFrameworkInfo.plist | 6 +- example/ios/Runner.xcodeproj/project.pbxproj | 183 +++++---- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 14 +- .../xcshareddata/WorkspaceSettings.xcsettings | 4 +- example/ios/Runner/AppDelegate.h | 6 - example/ios/Runner/AppDelegate.m | 12 - example/ios/Runner/AppDelegate.swift | 13 + .../Icon-App-1024x1024@1x.png | Bin 11112 -> 10932 bytes .../Runner/Base.lproj/LaunchScreen.storyboard | 22 +- example/ios/Runner/Base.lproj/Main.storyboard | 14 +- example/ios/Runner/Info.plist | 16 +- example/ios/Runner/Runner-Bridging-Header.h | 1 + example/ios/Runner/main.m | 9 - example/lib/InnerSwiper.dart | 23 +- example/lib/listener_test.dart | 2 +- example/lib/main.dart | 6 +- example/lib/src/ExampleCustom.dart | 70 ++-- .../lib/src/ExampleSwiperInScrollView.dart | 10 +- example/lib/src/forms/form_widget.dart | 8 +- example/pubspec.lock | 42 +-- example/pubspec.yaml | 3 + example/web/favicon.png | Bin 0 -> 917 bytes example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes example/web/index.html | 104 ++++++ example/web/manifest.json | 35 ++ lib/src/custom_layout.dart | 87 ++--- .../flutter_page_indicator.dart | 40 +- lib/src/swiper.dart | 349 +++++++++--------- lib/src/swiper_control.dart | 12 +- lib/src/swiper_controller.dart | 8 +- lib/src/swiper_pagination.dart | 32 +- lib/src/swiper_plugin.dart | 24 +- .../index_controller.dart | 14 +- lib/src/transformer_page_view/parallax.dart | 21 +- .../transformer_page_view.dart | 215 +++++------ pubspec.lock | 40 +- pubspec.yaml | 2 +- 61 files changed, 998 insertions(+), 812 deletions(-) create mode 100644 example/analysis_options.yaml create mode 100644 example/android/app/src/debug/AndroidManifest.xml delete mode 100644 example/android/app/src/main/java/com/example/example/MainActivity.java create mode 100644 example/android/app/src/main/kotlin/com/example/example/MainActivity.kt create mode 100644 example/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 example/android/app/src/main/res/values-night/styles.xml create mode 100644 example/android/app/src/profile/AndroidManifest.xml create mode 100644 example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 example/ios/Runner/AppDelegate.h delete mode 100644 example/ios/Runner/AppDelegate.m create mode 100644 example/ios/Runner/AppDelegate.swift create mode 100644 example/ios/Runner/Runner-Bridging-Header.h delete mode 100644 example/ios/Runner/main.m create mode 100644 example/web/favicon.png create mode 100644 example/web/icons/Icon-192.png create mode 100644 example/web/icons/Icon-512.png create mode 100644 example/web/icons/Icon-maskable-192.png create mode 100644 example/web/icons/Icon-maskable-512.png create mode 100644 example/web/index.html create mode 100644 example/web/manifest.json diff --git a/example/.gitignore b/example/.gitignore index dee655c..0fa6b67 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,9 +1,46 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp .DS_Store -.dart_tool/ +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies .packages +.pub-cache/ .pub/ +/build/ -build/ +# Web related +lib/generated_plugin_registrant.dart -.flutter-plugins +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/example/.metadata b/example/.metadata index 8cab361..fd70cab 100644 --- a/example/.metadata +++ b/example/.metadata @@ -4,5 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 44b7e7d3f42f050a79712daab253af06e9daf530 - channel: beta + revision: 77d935af4db863f6abd0b9c31c7e6df2a13de57b + channel: stable + +project_type: app diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml new file mode 100644 index 0000000..61b6c4d --- /dev/null +++ b/example/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/example/android/.gitignore b/example/android/.gitignore index 65b7315..6f56801 100644 --- a/example/android/.gitignore +++ b/example/android/.gitignore @@ -1,10 +1,13 @@ -*.iml -*.class -.gradle +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat /local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 595a771..5fe3c92 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -11,24 +11,43 @@ if (flutterRoot == null) { throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion flutter.compileSdkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } - lintOptions { - disable 'InvalidPackage' + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.example" - minSdkVersion 16 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName } buildTypes { @@ -45,7 +64,5 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..c208884 --- /dev/null +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 1b515f8..3f41384 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,39 +1,34 @@ - - - - - - - + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> + + diff --git a/example/android/app/src/main/java/com/example/example/MainActivity.java b/example/android/app/src/main/java/com/example/example/MainActivity.java deleted file mode 100644 index a313e78..0000000 --- a/example/android/app/src/main/java/com/example/example/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.example; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt new file mode 100644 index 0000000..e793a00 --- /dev/null +++ b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/example/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/android/app/src/main/res/values-night/styles.xml b/example/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..3db14bb --- /dev/null +++ b/example/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml index 00fa441..d460d1e 100644 --- a/example/android/app/src/main/res/values/styles.xml +++ b/example/android/app/src/main/res/values/styles.xml @@ -1,8 +1,18 @@ - + + diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..c208884 --- /dev/null +++ b/example/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/example/android/build.gradle b/example/android/build.gradle index 4476887..24047dc 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,18 +1,20 @@ buildscript { + ext.kotlin_version = '1.3.50' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:4.1.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 8bd86f6..94adc3a 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index aa901e1..bc6a58a 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 5a2f14f..44e62bc 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,15 +1,11 @@ include ':app' -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } -} +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/example/ios/.gitignore b/example/ios/.gitignore index 2a8c8b6..7a7f987 100644 --- a/example/ios/.gitignore +++ b/example/ios/.gitignore @@ -1,44 +1,34 @@ -.idea/ -.vagrant/ -.sconsign.dblite -.svn/ - -.DS_Store -*.swp -profile - -DerivedData/ -build/ -GeneratedPluginRegistrant.h -GeneratedPluginRegistrant.m - -.generated/ - -*.pbxuser +**/dgph *.mode1v3 *.mode2v3 +*.moved-aside +*.pbxuser *.perspectivev3 - -!default.pbxuser +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. !default.mode1v3 !default.mode2v3 +!default.pbxuser !default.perspectivev3 - -xcuserdata - -*.moved-aside - -*.pyc -*sync/ -Icon? -.tags* - -/Flutter/app.flx -/Flutter/app.zip -/Flutter/flutter_assets/ -/Flutter/App.framework -/Flutter/Flutter.framework -/Flutter/Generated.xcconfig -/ServiceDefinitions.json - -Pods/ diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 6c2de80..8d4492f 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -20,11 +20,7 @@ ???? CFBundleVersion 1.0 - UIRequiredDeviceCapabilities - - arm64 - MinimumOSVersion - 8.0 + 9.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index fd76eac..6edd238 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,25 +3,16 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; - 9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - D57DA1A0215230B4005D4B7F /* MyLaunch.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D57DA19F215230B4005D4B7F /* MyLaunch.jpg */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -31,8 +22,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -42,22 +31,17 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D57DA19F215230B4005D4B7F /* MyLaunch.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = MyLaunch.jpg; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,8 +49,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,10 +58,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 2D5378251FAA1A9400D5DBA9 /* flutter_assets */, - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -90,7 +69,6 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( - D57DA19F215230B4005D4B7F /* MyLaunch.jpg */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, @@ -108,27 +86,18 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 97C146F21CF9000F007C117D /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -158,18 +127,18 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0910; - ORGANIZATIONNAME = "The Chromium Authors"; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 23T2HFANR5; + LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -191,12 +160,8 @@ buildActionMask = 2147483647; files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, - D57DA1A0215230B4005D4B7F /* MyLaunch.jpg in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -216,7 +181,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -239,8 +204,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m in Sources */, + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -267,9 +231,79 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -281,12 +315,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -313,7 +349,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -323,7 +359,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -335,12 +370,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -361,9 +398,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -373,24 +413,20 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { - ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 23T2HFANR5; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.example.example; PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = 1; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -399,24 +435,19 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ARCHS = arm64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 23T2HFANR5; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = com.example.example; PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = 1; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -429,6 +460,7 @@ buildConfigurations = ( 97C147031CF9000F007C117D /* Debug */, 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -438,6 +470,7 @@ buildConfigurations = ( 97C147061CF9000F007C117D /* Debug */, 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a1..919434a 100644 --- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 1263ac8..c87d15a 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - - BuildSystemType - Original + PreviewsEnabled + diff --git a/example/ios/Runner/AppDelegate.h b/example/ios/Runner/AppDelegate.h deleted file mode 100644 index cf210d2..0000000 --- a/example/ios/Runner/AppDelegate.h +++ /dev/null @@ -1,6 +0,0 @@ -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@end diff --git a/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m deleted file mode 100644 index 112becd..0000000 --- a/example/ios/Runner/AppDelegate.m +++ /dev/null @@ -1,12 +0,0 @@ -#include "AppDelegate.h" -#include "GeneratedPluginRegistrant.h" - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [GeneratedPluginRegistrant registerWithRegistry:self]; - // Override point for customization after application launch. - return [super application:application didFinishLaunchingWithOptions:launchOptions]; -} - -@end diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..70693e4 --- /dev/null +++ b/example/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 3d43d11e66f4de3da27ed045ca4fe38ad8b48094..dc9ada4725e9b0ddb1deab583e5b5102493aa332 100644 GIT binary patch literal 10932 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 P-1+_A+?hGkL;m(J7kc&K diff --git a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard index e30dfce..f2e259c 100644 --- a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -1,12 +1,8 @@ - - - - - + + - - + @@ -18,19 +14,15 @@ - - - + - - - - + + @@ -40,6 +32,6 @@ - + diff --git a/example/ios/Runner/Base.lproj/Main.storyboard b/example/ios/Runner/Base.lproj/Main.storyboard index 5e371ac..f3c2851 100644 --- a/example/ios/Runner/Base.lproj/Main.storyboard +++ b/example/ios/Runner/Base.lproj/Main.storyboard @@ -1,12 +1,8 @@ - - - - - + + - - + @@ -18,9 +14,9 @@ - + - + diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index ccd04df..27491e8 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -3,7 +3,9 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Example CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -15,24 +17,22 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + $(FLUTTER_BUILD_NAME) CFBundleSignature ???? CFBundleVersion - 1 + $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS UILaunchStoryboardName LaunchScreen UIMainStoryboardFile Main - UIRequiredDeviceCapabilities - - arm64 - UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad @@ -42,6 +42,6 @@ UIInterfaceOrientationLandscapeRight UIViewControllerBasedStatusBarAppearance - + diff --git a/example/ios/Runner/Runner-Bridging-Header.h b/example/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/example/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/example/ios/Runner/main.m b/example/ios/Runner/main.m deleted file mode 100644 index 0ccc450..0000000 --- a/example/ios/Runner/main.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/example/lib/InnerSwiper.dart b/example/lib/InnerSwiper.dart index 20a9cb8..23641c7 100644 --- a/example/lib/InnerSwiper.dart +++ b/example/lib/InnerSwiper.dart @@ -20,23 +20,14 @@ class InnerSwiper extends StatefulWidget { } class _InnerSwiperState extends State { - SwiperController controller; + SwiperController controller = new SwiperController(); - List autoplayes; - - List controllers; - - @override - void initState() { - controller = new SwiperController(); - autoplayes = [] - ..length = 10 - ..fillRange(0, 10, false); - controllers = [] - ..length = 10 - ..fillRange(0, 10, new SwiperController()); - super.initState(); - } + List autoplayes = [] + ..length = 10 + ..fillRange(0, 10, false); + List controllers = [] + ..length = 10 + ..fillRange(0, 10, new SwiperController()); @override Widget build(BuildContext context) { diff --git a/example/lib/listener_test.dart b/example/lib/listener_test.dart index a4fe22f..2ff0ab7 100644 --- a/example/lib/listener_test.dart +++ b/example/lib/listener_test.dart @@ -18,7 +18,7 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatefulWidget { - MyHomePage({Key key, this.title}) : super(key: key); + MyHomePage({Key? key, required this.title}) : super(key: key); final String title; diff --git a/example/lib/main.dart b/example/lib/main.dart index 7396f17..3e7f1d4 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -36,7 +36,7 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatefulWidget { - MyHomePage({Key key, this.title}) : super(key: key); + MyHomePage({Key? key, required this.title}) : super(key: key); final String title; @@ -315,11 +315,11 @@ class ExamplePhone extends StatelessWidget { } class ScaffoldWidget extends StatelessWidget { - final Widget child; + final Widget? child; final String title; final List actions; - ScaffoldWidget({this.child, this.title, this.actions}); + ScaffoldWidget({this.child, required this.title, this.actions = const []}); @override Widget build(BuildContext context) { diff --git a/example/lib/src/ExampleCustom.dart b/example/lib/src/ExampleCustom.dart index e31a81c..c41fb45 100644 --- a/example/lib/src/ExampleCustom.dart +++ b/example/lib/src/ExampleCustom.dart @@ -12,37 +12,42 @@ class ExampleCustom extends StatefulWidget { class _ExampleCustomState extends State { //properties want to custom - int _itemCount; + int _itemCount = 3; - bool _loop; + bool _loop = true; - bool _autoplay; + bool _autoplay = false; - int _autoplayDely; + int _autoplayDely = 3000; - double _padding; + double _padding = 0.0; - bool _outer; + bool _outer = false; - double _radius; + double _radius = 10.0; - double _viewportFraction; + double _viewportFraction = 0.8; - SwiperLayout _layout; + SwiperLayout _layout = SwiperLayout.TINDER; - int _currentIndex; + int _currentIndex = 0; - double _scale; + double _scale = 0.8; - Axis _scrollDirection; + Axis _scrollDirection = Axis.horizontal; - Curve _curve; + Curve _curve = Curves.ease; - double _fade; + double _fade = 1; - bool _autoplayDisableOnInteraction; + bool _autoplayDisableOnInteraction = false; - CustomLayoutOption customLayoutOption; + CustomLayoutOption customLayoutOption = new CustomLayoutOption(startIndex: -1, stateCount: 3) + .addRotate([-25.0 / 180, 0.0, 25.0 / 180]).addTranslate([ + new Offset(-350.0, 0.0), + new Offset(0.0, 0.0), + new Offset(350.0, 0.0) + ]); Widget _buildItem(BuildContext context, int index) { return ClipRRect( @@ -65,33 +70,6 @@ class _ExampleCustomState extends State { super.didUpdateWidget(oldWidget); } - @override - void initState() { - customLayoutOption = new CustomLayoutOption(startIndex: -1, stateCount: 3) - .addRotate([-25.0 / 180, 0.0, 25.0 / 180]).addTranslate([ - new Offset(-350.0, 0.0), - new Offset(0.0, 0.0), - new Offset(350.0, 0.0) - ]); - _fade = 1.0; - _currentIndex = 0; - _curve = Curves.ease; - _scale = 0.8; - _controller = new SwiperController(); - _layout = SwiperLayout.TINDER; - _radius = 10.0; - _padding = 0.0; - _loop = true; - _itemCount = 3; - _autoplay = false; - _autoplayDely = 3000; - _viewportFraction = 0.8; - _outer = false; - _scrollDirection = Axis.horizontal; - _autoplayDisableOnInteraction = false; - super.initState(); - } - // maintain the index Widget buildSwiper() { @@ -137,7 +115,7 @@ class _ExampleCustomState extends State { ); } - SwiperController _controller; + SwiperController _controller = new SwiperController(); TextEditingController numberController = new TextEditingController(); @override Widget build(BuildContext context) { @@ -182,7 +160,7 @@ class _ExampleCustomState extends State { ), new FormWidget( label: "layout", - child: new FormSelect( + child: new FormSelect( placeholder: "Select layout", value: _layout, values: [ @@ -313,7 +291,7 @@ class _ExampleCustomState extends State { new FormWidget( label: "curve", - child: new FormSelect( + child: new FormSelect( placeholder: "Select curve", value: _layout, values: [ diff --git a/example/lib/src/ExampleSwiperInScrollView.dart b/example/lib/src/ExampleSwiperInScrollView.dart index 7d7d663..8fc14e4 100644 --- a/example/lib/src/ExampleSwiperInScrollView.dart +++ b/example/lib/src/ExampleSwiperInScrollView.dart @@ -10,11 +10,11 @@ class ExampleSwiperInScrollView extends StatefulWidget { class _ExampleState extends State with TickerProviderStateMixin { - AnimationController controller; - Animation _animation10; - Animation _animation11; - Animation _animation12; - Animation _animation13; + late AnimationController controller; + late Animation _animation10; + late Animation _animation11; + late Animation _animation12; + late Animation _animation13; _ExampleState(); diff --git a/example/lib/src/forms/form_widget.dart b/example/lib/src/forms/form_widget.dart index 2cba7de..6869292 100644 --- a/example/lib/src/forms/form_widget.dart +++ b/example/lib/src/forms/form_widget.dart @@ -4,9 +4,9 @@ import 'package:flutter/cupertino.dart'; class FormWidget extends StatelessWidget { final String label; - final Widget child; + final Widget? child; - FormWidget({this.label, this.child}); + FormWidget({required this.label, this.child}); @override Widget build(BuildContext context) { @@ -29,7 +29,7 @@ class FormSelect extends StatefulWidget { final List values; final dynamic value; - FormSelect({this.placeholder, this.valueChanged, this.value, this.values}); + FormSelect({required this.placeholder, required this.valueChanged, this.value, this.values = const []}); @override State createState() { @@ -116,7 +116,7 @@ class NumberPad extends StatelessWidget { final num min; final ValueChanged onChangeValue; - NumberPad({this.number, this.step, this.onChangeValue, this.max, this.min}); + NumberPad({required this.number, required this.step, required this.onChangeValue, required this.max, required this.min}); void onAdd() { onChangeValue(number + step > max ? max : number + step); diff --git a/example/pubspec.lock b/example/pubspec.lock index 8266d7e..128d5b6 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,42 +7,42 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.8.2" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.3.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -80,28 +80,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.11" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.7.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" percent_indicator: dependency: "direct main" description: name: percent_indicator url: "https://pub.dartlang.org" source: hosted - version: "2.1.9+1" + version: "4.0.0" sky_engine: dependency: transitive description: flutter @@ -113,56 +113,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.4.3" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.1" sdks: - dart: ">=2.10.0-110 <2.11.0" - flutter: ">=0.1.4 <3.0.0" + dart: ">=2.14.0 <3.0.0" + flutter: ">=0.1.4" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 48d87fa..6018618 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,9 @@ name: example description: A new Flutter project. +environment: + sdk: '>=2.12.0 <3.0.0' + dependencies: flutter: sdk: flutter diff --git a/example/web/favicon.png b/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-192.png b/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 zcmZ`-2T+sGz6~)*FVZ`aW+(v>MIm&M-g^@e2u-B-DoB?qO+b1Tq<5uCCv>ESfRum& zp%X;f!~1{tzL__3=gjVJ=j=J>+nMj%ncXj1Q(b|Ckbw{Y0FWpt%4y%$uD=Z*c-x~o zE;IoE;xa#7Ll5nj-e4CuXB&G*IM~D21rCP$*xLXAK8rIMCSHuSu%bL&S3)8YI~vyp@KBu9Ph7R_pvKQ@xv>NQ`dZp(u{Z8K3yOB zn7-AR+d2JkW)KiGx0hosml;+eCXp6+w%@STjFY*CJ?udJ64&{BCbuebcuH;}(($@@ znNlgBA@ZXB)mcl9nbX#F!f_5Z=W>0kh|UVWnf!At4V*LQP%*gPdCXd6P@J4Td;!Ur z<2ZLmwr(NG`u#gDEMP19UcSzRTL@HsK+PnIXbVBT@oHm53DZr?~V(0{rsalAfwgo zEh=GviaqkF;}F_5-yA!1u3!gxaR&Mj)hLuj5Q-N-@Lra{%<4ONja8pycD90&>yMB` zchhd>0CsH`^|&TstH-8+R`CfoWqmTTF_0?zDOY`E`b)cVi!$4xA@oO;SyOjJyP^_j zx^@Gdf+w|FW@DMdOi8=4+LJl$#@R&&=UM`)G!y%6ZzQLoSL%*KE8IO0~&5XYR9 z&N)?goEiWA(YoRfT{06&D6Yuu@Qt&XVbuW@COb;>SP9~aRc+z`m`80pB2o%`#{xD@ zI3RAlukL5L>px6b?QW1Ac_0>ew%NM!XB2(H+1Y3AJC?C?O`GGs`331Nd4ZvG~bMo{lh~GeL zSL|tT*fF-HXxXYtfu5z+T5Mx9OdP7J4g%@oeC2FaWO1D{=NvL|DNZ}GO?O3`+H*SI z=grGv=7dL{+oY0eJFGO!Qe(e2F?CHW(i!!XkGo2tUvsQ)I9ev`H&=;`N%Z{L zO?vV%rDv$y(@1Yj@xfr7Kzr<~0{^T8wM80xf7IGQF_S-2c0)0D6b0~yD7BsCy+(zL z#N~%&e4iAwi4F$&dI7x6cE|B{f@lY5epaDh=2-(4N05VO~A zQT3hanGy_&p+7Fb^I#ewGsjyCEUmSCaP6JDB*=_()FgQ(-pZ28-{qx~2foO4%pM9e z*_63RT8XjgiaWY|*xydf;8MKLd{HnfZ2kM%iq}fstImB-K6A79B~YoPVa@tYN@T_$ zea+9)<%?=Fl!kd(Y!G(-o}ko28hg2!MR-o5BEa_72uj7Mrc&{lRh3u2%Y=Xk9^-qa zBPWaD=2qcuJ&@Tf6ue&)4_V*45=zWk@Z}Q?f5)*z)-+E|-yC4fs5CE6L_PH3=zI8p z*Z3!it{1e5_^(sF*v=0{`U9C741&lub89gdhKp|Y8CeC{_{wYK-LSbp{h)b~9^j!s z7e?Y{Z3pZv0J)(VL=g>l;<}xk=T*O5YR|hg0eg4u98f2IrA-MY+StQIuK-(*J6TRR z|IM(%uI~?`wsfyO6Tgmsy1b3a)j6M&-jgUjVg+mP*oTKdHg?5E`!r`7AE_#?Fc)&a z08KCq>Gc=ne{PCbRvs6gVW|tKdcE1#7C4e`M|j$C5EYZ~Y=jUtc zj`+?p4ba3uy7><7wIokM79jPza``{Lx0)zGWg;FW1^NKY+GpEi=rHJ+fVRGfXO zPHV52k?jxei_!YYAw1HIz}y8ZMwdZqU%ESwMn7~t zdI5%B;U7RF=jzRz^NuY9nM)&<%M>x>0(e$GpU9th%rHiZsIT>_qp%V~ILlyt^V`=d z!1+DX@ah?RnB$X!0xpTA0}lN@9V-ePx>wQ?-xrJr^qDlw?#O(RsXeAvM%}rg0NT#t z!CsT;-vB=B87ShG`GwO;OEbeL;a}LIu=&@9cb~Rsx(ZPNQ!NT7H{@j0e(DiLea>QD zPmpe90gEKHEZ8oQ@6%E7k-Ptn#z)b9NbD@_GTxEhbS+}Bb74WUaRy{w;E|MgDAvHw zL)ycgM7mB?XVh^OzbC?LKFMotw3r@i&VdUV%^Efdib)3@soX%vWCbnOyt@Y4swW925@bt45y0HY3YI~BnnzZYrinFy;L?2D3BAL`UQ zEj))+f>H7~g8*VuWQ83EtGcx`hun$QvuurSMg3l4IP8Fe`#C|N6mbYJ=n;+}EQm;< z!!N=5j1aAr_uEnnzrEV%_E|JpTb#1p1*}5!Ce!R@d$EtMR~%9# zd;h8=QGT)KMW2IKu_fA_>p_und#-;Q)p%%l0XZOXQicfX8M~7?8}@U^ihu;mizj)t zgV7wk%n-UOb z#!P5q?Ex+*Kx@*p`o$q8FWL*E^$&1*!gpv?Za$YO~{BHeGY*5%4HXUKa_A~~^d z=E*gf6&+LFF^`j4$T~dR)%{I)T?>@Ma?D!gi9I^HqvjPc3-v~=qpX1Mne@*rzT&Xw zQ9DXsSV@PqpEJO-g4A&L{F&;K6W60D!_vs?Vx!?w27XbEuJJP&);)^+VF1nHqHBWu z^>kI$M9yfOY8~|hZ9WB!q-9u&mKhEcRjlf2nm_@s;0D#c|@ED7NZE% zzR;>P5B{o4fzlfsn3CkBK&`OSb-YNrqx@N#4CK!>bQ(V(D#9|l!e9(%sz~PYk@8zt zPN9oK78&-IL_F zhsk1$6p;GqFbtB^ZHHP+cjMvA0(LqlskbdYE_rda>gvQLTiqOQ1~*7lg%z*&p`Ry& zRcG^DbbPj_jOKHTr8uk^15Boj6>hA2S-QY(W-6!FIq8h$<>MI>PYYRenQDBamO#Fv zAH5&ImqKBDn0v5kb|8i0wFhUBJTpT!rB-`zK)^SNnRmLraZcPYK7b{I@+}wXVdW-{Ps17qdRA3JatEd?rPV z4@}(DAMf5EqXCr4-B+~H1P#;t@O}B)tIJ(W6$LrK&0plTmnPpb1TKn3?f?Kk``?D+ zQ!MFqOX7JbsXfQrz`-M@hq7xlfNz;_B{^wbpG8des56x(Q)H)5eLeDwCrVR}hzr~= zM{yXR6IM?kXxauLza#@#u?Y|o;904HCqF<8yT~~c-xyRc0-vxofnxG^(x%>bj5r}N zyFT+xnn-?B`ohA>{+ZZQem=*Xpqz{=j8i2TAC#x-m;;mo{{sLB_z(UoAqD=A#*juZ zCv=J~i*O8;F}A^Wf#+zx;~3B{57xtoxC&j^ie^?**T`WT2OPRtC`xj~+3Kprn=rVM zVJ|h5ux%S{dO}!mq93}P+h36mZ5aZg1-?vhL$ke1d52qIiXSE(llCr5i=QUS?LIjc zV$4q=-)aaR4wsrQv}^shL5u%6;`uiSEs<1nG^?$kl$^6DL z43CjY`M*p}ew}}3rXc7Xck@k41jx}c;NgEIhKZ*jsBRZUP-x2cm;F1<5$jefl|ppO zmZd%%?gMJ^g9=RZ^#8Mf5aWNVhjAS^|DQO+q$)oeob_&ZLFL(zur$)); zU19yRm)z<4&4-M}7!9+^Wl}Uk?`S$#V2%pQ*SIH5KI-mn%i;Z7-)m$mN9CnI$G7?# zo`zVrUwoSL&_dJ92YhX5TKqaRkfPgC4=Q&=K+;_aDs&OU0&{WFH}kKX6uNQC6%oUH z2DZa1s3%Vtk|bglbxep-w)PbFG!J17`<$g8lVhqD2w;Z0zGsh-r zxZ13G$G<48leNqR!DCVt9)@}(zMI5w6Wo=N zpP1*3DI;~h2WDWgcKn*f!+ORD)f$DZFwgKBafEZmeXQMAsq9sxP9A)7zOYnkHT9JU zRA`umgmP9d6=PHmFIgx=0$(sjb>+0CHG)K@cPG{IxaJ&Ueo8)0RWgV9+gO7+Bl1(F z7!BslJ2MP*PWJ;x)QXbR$6jEr5q3 z(3}F@YO_P1NyTdEXRLU6fp?9V2-S=E+YaeLL{Y)W%6`k7$(EW8EZSA*(+;e5@jgD^I zaJQ2|oCM1n!A&-8`;#RDcZyk*+RPkn_r8?Ak@agHiSp*qFNX)&i21HE?yuZ;-C<3C zwJGd1lx5UzViP7sZJ&|LqH*mryb}y|%AOw+v)yc`qM)03qyyrqhX?ub`Cjwx2PrR! z)_z>5*!*$x1=Qa-0uE7jy0z`>|Ni#X+uV|%_81F7)b+nf%iz=`fF4g5UfHS_?PHbr zB;0$bK@=di?f`dS(j{l3-tSCfp~zUuva+=EWxJcRfp(<$@vd(GigM&~vaYZ0c#BTs z3ijkxMl=vw5AS&DcXQ%eeKt!uKvh2l3W?&3=dBHU=Gz?O!40S&&~ei2vg**c$o;i89~6DVns zG>9a*`k5)NI9|?W!@9>rzJ;9EJ=YlJTx1r1BA?H`LWijk(rTax9(OAu;q4_wTj-yj z1%W4GW&K4T=uEGb+E!>W0SD_C0RR91 literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-512.png b/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-maskable-192.png b/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/example/web/icons/Icon-maskable-512.png b/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/example/web/index.html b/example/web/index.html new file mode 100644 index 0000000..b6b9dd2 --- /dev/null +++ b/example/web/index.html @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + example + + + + + + + diff --git a/example/web/manifest.json b/example/web/manifest.json new file mode 100644 index 0000000..096edf8 --- /dev/null +++ b/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "example", + "short_name": "example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/lib/src/custom_layout.dart b/lib/src/custom_layout.dart index 8ce77f2..e417fb0 100644 --- a/lib/src/custom_layout.dart +++ b/lib/src/custom_layout.dart @@ -2,12 +2,12 @@ part of 'swiper.dart'; abstract class _CustomLayoutStateBase extends State with SingleTickerProviderStateMixin { - double _swiperWidth; - double _swiperHeight; - Animation _animation; - AnimationController _animationController; - int _startIndex; - int _animationCount; + late double _swiperWidth; + late double _swiperHeight; + late Animation _animation; + late AnimationController _animationController; + late int _startIndex; + int? _animationCount; @override void initState() { @@ -17,7 +17,7 @@ abstract class _CustomLayoutStateBase extends State } _createAnimationController(); - widget.controller.addListener(_onController); + widget.controller?.addListener(_onController); super.initState(); } @@ -29,7 +29,7 @@ abstract class _CustomLayoutStateBase extends State @override void didChangeDependencies() { - WidgetsBinding.instance.addPostFrameCallback(_getSize); + WidgetsBinding.instance?.addPostFrameCallback(_getSize); super.didChangeDependencies(); } @@ -39,8 +39,8 @@ abstract class _CustomLayoutStateBase extends State @mustCallSuper void afterRender() { - RenderObject renderObject = context.findRenderObject(); - Size size = renderObject.paintBounds.size; + RenderObject? renderObject = context.findRenderObject(); + Size size = renderObject!.paintBounds.size; _swiperWidth = size.width; _swiperHeight = size.height; setState(() {}); @@ -49,8 +49,8 @@ abstract class _CustomLayoutStateBase extends State @override void didUpdateWidget(T oldWidget) { if (widget.controller != oldWidget.controller) { - oldWidget.controller.removeListener(_onController); - widget.controller.addListener(_onController); + oldWidget.controller?.removeListener(_onController); + widget.controller?.addListener(_onController); } if (widget.loop != oldWidget.loop) { @@ -72,8 +72,8 @@ abstract class _CustomLayoutStateBase extends State @override void dispose() { - widget.controller.removeListener(_onController); - _animationController?.dispose(); + widget.controller?.removeListener(_onController); + _animationController.dispose(); super.dispose(); } @@ -85,12 +85,12 @@ abstract class _CustomLayoutStateBase extends State ); } - Widget _buildAnimation(BuildContext context, Widget w) { + Widget _buildAnimation(BuildContext context, Widget? w) { List list = []; double animationValue = _animation.value; - for (int i = 0; i < _animationCount; ++i) { + for (int i = 0; i < (_animationCount ?? 0); ++i) { int realIndex = _currentIndex + i + _startIndex; realIndex = realIndex % widget.itemCount; if (realIndex < 0) { @@ -115,19 +115,16 @@ abstract class _CustomLayoutStateBase extends State @override Widget build(BuildContext context) { - if (_animationCount == null) { - return new Container(); - } return new AnimatedBuilder( animation: _animationController, builder: _buildAnimation); } - double _currentValue; - double _currentPos; + late double _currentValue; + late double _currentPos; bool _lockScroll = false; - void _move(double position, {int nextIndex}) async { + void _move(double position, {int? nextIndex}) async { if (_lockScroll) return; try { _lockScroll = true; @@ -170,7 +167,7 @@ abstract class _CustomLayoutStateBase extends State } void _onController() { - switch (widget.controller.event) { + switch (widget.controller?.event) { case IndexController.PREVIOUS: int prevIndex = _prevIndex(); if (prevIndex == _currentIndex) return; @@ -282,13 +279,13 @@ Offset _getOffsetValue(List values, double animationValue, int index) { abstract class TransformBuilder { List values; - TransformBuilder({this.values}); + TransformBuilder({this.values = const []}); Widget build(int i, double animationValue, Widget widget); } class ScaleTransformBuilder extends TransformBuilder { final Alignment alignment; - ScaleTransformBuilder({List values, this.alignment: Alignment.center}) + ScaleTransformBuilder({List values = const [], this.alignment: Alignment.center}) : super(values: values); Widget build(int i, double animationValue, Widget widget) { @@ -298,7 +295,7 @@ class ScaleTransformBuilder extends TransformBuilder { } class OpacityTransformBuilder extends TransformBuilder { - OpacityTransformBuilder({List values}) : super(values: values); + OpacityTransformBuilder({List values = const []}) : super(values: values); Widget build(int i, double animationValue, Widget widget) { double v = _getValue(values, animationValue, i); @@ -310,7 +307,7 @@ class OpacityTransformBuilder extends TransformBuilder { } class RotateTransformBuilder extends TransformBuilder { - RotateTransformBuilder({List values}) : super(values: values); + RotateTransformBuilder({List values = const []}) : super(values: values); Widget build(int i, double animationValue, Widget widget) { double v = _getValue(values, animationValue, i); @@ -322,7 +319,7 @@ class RotateTransformBuilder extends TransformBuilder { } class TranslateTransformBuilder extends TransformBuilder { - TranslateTransformBuilder({List values}) : super(values: values); + TranslateTransformBuilder({List values = const []}) : super(values: values); @override Widget build(int i, double animationValue, Widget widget) { @@ -339,8 +336,7 @@ class CustomLayoutOption { final int startIndex; final int stateCount; - CustomLayoutOption({this.stateCount, this.startIndex}) - : assert(startIndex != null, stateCount != null); + CustomLayoutOption({required this.stateCount, required this.startIndex}); CustomLayoutOption addOpacity(List values) { builders.add(new OpacityTransformBuilder(values: values)); @@ -368,21 +364,20 @@ class _CustomLayoutSwiper extends _SubSwiper { final CustomLayoutOption option; _CustomLayoutSwiper( - {this.option, - double itemWidth, - bool loop, - double itemHeight, - ValueChanged onIndexChanged, - Key key, - IndexedWidgetBuilder itemBuilder, - Curve curve, - int duration, - int index, - int itemCount, - Axis scrollDirection, - SwiperController controller}) - : assert(option != null), - super( + {required this.option, + double? itemWidth, + required bool loop, + double? itemHeight, + required ValueChanged onIndexChanged, + Key? key, + required IndexedWidgetBuilder itemBuilder, + required Curve curve, + required int duration, + required int index, + required int itemCount, + required Axis scrollDirection, + required SwiperController? controller}) + : super( loop: loop, onIndexChanged: onIndexChanged, itemWidth: itemWidth, @@ -424,7 +419,7 @@ class _CustomLayoutState extends _CustomLayoutStateBase<_CustomLayoutSwiper> { Widget child = new SizedBox( width: widget.itemWidth ?? double.infinity, height: widget.itemHeight ?? double.infinity, - child: widget.itemBuilder(context, realIndex)); + child: widget.itemBuilder?.call(context, realIndex)); for (int i = builders.length - 1; i >= 0; --i) { TransformBuilder builder = builders[i]; diff --git a/lib/src/flutter_page_indicator/flutter_page_indicator.dart b/lib/src/flutter_page_indicator/flutter_page_indicator.dart index 67b03da..d7b61af 100644 --- a/lib/src/flutter_page_indicator/flutter_page_indicator.dart +++ b/lib/src/flutter_page_indicator/flutter_page_indicator.dart @@ -122,12 +122,12 @@ class _ScalePainter extends _BasePainter { : radius + ((index + 1) * (size + space)); double progress = page - index; - _paint.color = Color.lerp(widget.activeColor, widget.color, progress); + _paint.color = Color.lerp(widget.activeColor, widget.color, progress)!; //last canvas.drawCircle(new Offset(radius + (index * (size + space)), radius), lerp(radius, radius * widget.scale, progress), _paint); //first - _paint.color = Color.lerp(widget.color, widget.activeColor, progress); + _paint.color = Color.lerp(widget.color, widget.activeColor, progress)!; canvas.drawCircle(new Offset(secondOffset, radius), lerp(radius * widget.scale, radius, progress), _paint); } @@ -153,12 +153,12 @@ class _ColorPainter extends _BasePainter { ? radius : radius + ((index + 1) * (size + space)); - _paint.color = Color.lerp(widget.activeColor, widget.color, progress); + _paint.color = Color.lerp(widget.activeColor, widget.color, progress)!; //left canvas.drawCircle( new Offset(radius + (index * (size + space)), radius), radius, _paint); //right - _paint.color = Color.lerp(widget.color, widget.activeColor, progress); + _paint.color = Color.lerp(widget.color, widget.activeColor, progress)!; canvas.drawCircle(new Offset(secondOffset, radius), radius, _paint); } } @@ -218,22 +218,22 @@ class _PageIndicatorState extends State { switch (widget.layout) { case PageIndicatorLayout.NONE: return new _NonePainter( - widget, widget.controller.page ?? 0.0, index, _paint); + widget, widget.controller?.page ?? 0.0, index, _paint); case PageIndicatorLayout.SLIDE: return new _SlidePainter( - widget, widget.controller.page ?? 0.0, index, _paint); + widget, widget.controller?.page ?? 0.0, index, _paint); case PageIndicatorLayout.WARM: return new _WarmPainter( - widget, widget.controller.page ?? 0.0, index, _paint); + widget, widget.controller?.page ?? 0.0, index, _paint); case PageIndicatorLayout.COLOR: return new _ColorPainter( - widget, widget.controller.page ?? 0.0, index, _paint); + widget, widget.controller?.page ?? 0.0, index, _paint); case PageIndicatorLayout.SCALE: return new _ScalePainter( - widget, widget.controller.page ?? 0.0, index, _paint); + widget, widget.controller?.page ?? 0.0, index, _paint); case PageIndicatorLayout.DROP: return new _DropPainter( - widget, widget.controller.page ?? 0.0, index, _paint); + widget, widget.controller?.page ?? 0.0, index, _paint); default: throw new Exception("Not a valid layout"); } @@ -262,7 +262,7 @@ class _PageIndicatorState extends State { } void _onController() { - double page = widget.controller.page ?? 0.0; + double page = widget.controller?.page ?? 0.0; index = page.floor(); setState(() {}); @@ -270,22 +270,22 @@ class _PageIndicatorState extends State { @override void initState() { - widget.controller.addListener(_onController); + widget.controller?.addListener(_onController); super.initState(); } @override void didUpdateWidget(PageIndicator oldWidget) { if (widget.controller != oldWidget.controller) { - oldWidget.controller.removeListener(_onController); - widget.controller.addListener(_onController); + oldWidget.controller?.removeListener(_onController); + widget.controller?.addListener(_onController); } super.didUpdateWidget(oldWidget); } @override void dispose() { - widget.controller.removeListener(_onController); + widget.controller?.removeListener(_onController); super.dispose(); } } @@ -324,15 +324,15 @@ class PageIndicator extends StatefulWidget { // Only valid when layout==PageIndicatorLayout.drop final double dropHeight; - final PageController controller; + final PageController? controller; final double activeSize; PageIndicator( - {Key key, + {Key? key, this.size: 20.0, this.space: 5.0, - this.count, + required this.count, this.activeSize: 20.0, this.controller, this.color: Colors.white30, @@ -340,9 +340,7 @@ class PageIndicator extends StatefulWidget { this.activeColor: Colors.white, this.scale: 0.6, this.dropHeight: 20.0}) - : assert(count != null), - assert(controller != null), - super(key: key); + : super(key: key); @override State createState() { diff --git a/lib/src/swiper.dart b/lib/src/swiper.dart index 6874079..5ea0ff8 100644 --- a/lib/src/swiper.dart +++ b/lib/src/swiper.dart @@ -22,27 +22,27 @@ class Swiper extends StatefulWidget { final bool outer; /// Inner item height, this property is valid if layout=STACK or layout=TINDER or LAYOUT=CUSTOM, - final double itemHeight; + final double? itemHeight; /// Inner item width, this property is valid if layout=STACK or layout=TINDER or LAYOUT=CUSTOM, - final double itemWidth; + final double? itemWidth; // height of the inside container,this property is valid when outer=true,otherwise the inside container size is controlled by parent widget - final double containerHeight; + final double? containerHeight; // width of the inside container,this property is valid when outer=true,otherwise the inside container size is controlled by parent widget - final double containerWidth; + final double? containerWidth; /// Build item on index - final IndexedWidgetBuilder itemBuilder; + final IndexedWidgetBuilder? itemBuilder; /// Support transform like Android PageView did /// `itemBuilder` and `transformItemBuilder` must have one not null - final PageTransformer transformer; + final PageTransformer? transformer; /// count of the display items final int itemCount; - final ValueChanged onIndexChanged; + final ValueChanged? onIndexChanged; ///auto play config final bool autoplay; @@ -68,24 +68,24 @@ class Swiper extends StatefulWidget { ///Index number of initial slide. ///If not set , the `Swiper` is 'uncontrolled', which means manage index by itself ///If set , the `Swiper` is 'controlled', which means the index is fully managed by parent widget. - final int index; + final int? index; ///Called when tap - final SwiperOnTap onTap; + final SwiperOnTap? onTap; ///The swiper pagination plugin - final SwiperPlugin pagination; + final SwiperPlugin? pagination; ///the swiper control button plugin - final SwiperPlugin control; + final SwiperPlugin? control; ///other plugins, you can custom your own plugin final List plugins; /// - final SwiperController controller; + final SwiperController? controller; - final ScrollPhysics physics; + final ScrollPhysics? physics; /// final double viewportFraction; @@ -94,13 +94,13 @@ class Swiper extends StatefulWidget { final SwiperLayout layout; /// this value is valid when layout == SwiperLayout.CUSTOM - final CustomLayoutOption customLayoutOption; + final CustomLayoutOption? customLayoutOption; // This value is valid when viewportFraction is set and < 1.0 - final double scale; + final double? scale; // This value is valid when viewportFraction is set and < 1.0 - final double fade; + final double? fade; final PageIndicatorLayout indicatorLayout; @@ -110,7 +110,7 @@ class Swiper extends StatefulWidget { /// this.transformer, - @required this.itemCount, + required this.itemCount, this.autoplay: false, this.layout: SwiperLayout.DEFAULT, this.autoplayDelay: kDefaultAutoplayDelayMs, @@ -124,9 +124,9 @@ class Swiper extends StatefulWidget { this.curve: Curves.ease, this.scrollDirection: Axis.horizontal, this.pagination, - this.plugins, + this.plugins: const [], this.physics, - Key key, + Key? key, this.controller, this.customLayoutOption, @@ -153,36 +153,34 @@ class Swiper extends StatefulWidget { super(key: key); factory Swiper.children({ - List children, + required List children, bool autoplay: false, - PageTransformer transformer, + PageTransformer? transformer, int autoplayDelay: kDefaultAutoplayDelayMs, bool reverse: false, bool autoplayDisableOnInteraction: true, int duration: kDefaultAutoplayTransactionDuration, - ValueChanged onIndexChanged, - int index, - SwiperOnTap onTap, + ValueChanged? onIndexChanged, + int? index, + SwiperOnTap? onTap, bool loop: true, Curve curve: Curves.ease, Axis scrollDirection: Axis.horizontal, - SwiperPlugin pagination, - SwiperPlugin control, - List plugins, - SwiperController controller, - Key key, - CustomLayoutOption customLayoutOption, - ScrollPhysics physics, - double containerHeight, - double containerWidth, + SwiperPlugin? pagination, + SwiperPlugin? control, + List plugins = const [], + SwiperController? controller, + Key? key, + CustomLayoutOption? customLayoutOption, + ScrollPhysics? physics, + double? containerHeight, + double? containerWidth, double viewportFraction: 1.0, - double itemHeight, - double itemWidth, + double? itemHeight, + double? itemWidth, bool outer: false, double scale: 1.0, }) { - assert(children != null, "children must not be null"); - return new Swiper( transformer: transformer, customLayoutOption: customLayoutOption, @@ -216,32 +214,32 @@ class Swiper extends StatefulWidget { } factory Swiper.list({ - PageTransformer transformer, - List list, - CustomLayoutOption customLayoutOption, - SwiperDataBuilder builder, + PageTransformer? transformer, + required List list, + CustomLayoutOption? customLayoutOption, + required SwiperDataBuilder builder, bool autoplay: false, int autoplayDelay: kDefaultAutoplayDelayMs, bool reverse: false, bool autoplayDisableOnInteraction: true, int duration: kDefaultAutoplayTransactionDuration, - ValueChanged onIndexChanged, - int index, - SwiperOnTap onTap, + ValueChanged? onIndexChanged, + int? index, + SwiperOnTap? onTap, bool loop: true, Curve curve: Curves.ease, Axis scrollDirection: Axis.horizontal, - SwiperPlugin pagination, - SwiperPlugin control, - List plugins, - SwiperController controller, - Key key, - ScrollPhysics physics, - double containerHeight, - double containerWidth, + SwiperPlugin? pagination, + SwiperPlugin? control, + List plugins: const [], + SwiperController? controller, + Key? key, + ScrollPhysics? physics, + double? containerHeight, + double? containerWidth, double viewportFraction: 1.0, - double itemHeight, - double itemWidth, + double? itemHeight, + double? itemWidth, bool outer: false, double scale: 1.0, }) { @@ -284,23 +282,22 @@ class Swiper extends StatefulWidget { } abstract class _SwiperTimerMixin extends State { - Timer _timer; + Timer? _timer; - SwiperController _controller; + SwiperController? _controller; @override void initState() { - _controller = widget.controller; - if (_controller == null) { + if (widget.controller == null) { _controller = new SwiperController(); } - _controller.addListener(_onController); + _controller?.addListener(_onController); _handleAutoplay(); super.initState(); } void _onController() { - switch (_controller.event) { + switch (_controller?.event) { case SwiperController.START_AUTOPLAY: { if (_timer == null) { @@ -322,9 +319,9 @@ abstract class _SwiperTimerMixin extends State { void didUpdateWidget(Swiper oldWidget) { if (_controller != oldWidget.controller) { if (oldWidget.controller != null) { - oldWidget.controller.removeListener(_onController); - _controller = oldWidget.controller; - _controller.addListener(_onController); + oldWidget.controller!.removeListener(_onController); + _controller = oldWidget.controller!; + _controller?.addListener(_onController); } } _handleAutoplay(); @@ -333,17 +330,15 @@ abstract class _SwiperTimerMixin extends State { @override void dispose() { - if (_controller != null) { - _controller.removeListener(_onController); - // _controller.dispose(); - } + _controller?.removeListener(_onController); + // _controller?.dispose(); _stopAutoplay(); super.dispose(); } bool _autoplayEnabled() { - return _controller.autoplay ?? widget.autoplay; + return _controller?.autoplay ?? false; } void _handleAutoplay() { @@ -361,29 +356,29 @@ abstract class _SwiperTimerMixin extends State { } void _onTimer(Timer timer) { - _controller.next(animation: true); + _controller?.next(animation: true); } void _stopAutoplay() { if (_timer != null) { - _timer.cancel(); + _timer!.cancel(); _timer = null; } } } class _SwiperState extends _SwiperTimerMixin { - int _activeIndex; + late int _activeIndex; - TransformerPageController _pageController; + TransformerPageController? _pageController; Widget _wrapTap(BuildContext context, int index) { return new GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { - this.widget.onTap(index); + widget.onTap?.call(index); }, - child: widget.itemBuilder(context, index), + child: widget.itemBuilder?.call(context, index), ); } @@ -392,18 +387,18 @@ class _SwiperState extends _SwiperTimerMixin { _activeIndex = widget.index ?? 0; if (_isPageViewLayout()) { _pageController = new TransformerPageController( - initialPage: widget.index, + initialPage: widget.index ?? 0, loop: widget.loop, itemCount: widget.itemCount, reverse: - widget.transformer == null ? false : widget.transformer.reverse, + widget.transformer == null ? false : widget.transformer!.reverse, viewportFraction: widget.viewportFraction); } super.initState(); } bool _isPageViewLayout() { - return widget.layout == null || widget.layout == SwiperLayout.DEFAULT; + return widget.layout == SwiperLayout.DEFAULT; } @override @@ -412,20 +407,19 @@ class _SwiperState extends _SwiperTimerMixin { } bool _getReverse(Swiper widget) => - widget.transformer == null ? false : widget.transformer.reverse; + widget.transformer == null ? false : widget.transformer!.reverse; @override void didUpdateWidget(Swiper oldWidget) { super.didUpdateWidget(oldWidget); if (_isPageViewLayout()) { - if (_pageController == null || - (widget.index != oldWidget.index || + if ((widget.index != oldWidget.index || widget.loop != oldWidget.loop || widget.itemCount != oldWidget.itemCount || widget.viewportFraction != oldWidget.viewportFraction || _getReverse(widget) != _getReverse(oldWidget))) { _pageController = new TransformerPageController( - initialPage: widget.index, + initialPage: widget.index ?? 0, loop: widget.loop, itemCount: widget.itemCount, reverse: _getReverse(widget), @@ -434,14 +428,12 @@ class _SwiperState extends _SwiperTimerMixin { } else { scheduleMicrotask(() { // So that we have a chance to do `removeListener` in child widgets. - if (_pageController != null) { - _pageController.dispose(); - _pageController = null; - } + _pageController?.dispose(); + _pageController = null; }); } if (widget.index != null && widget.index != _activeIndex) { - _activeIndex = widget.index; + _activeIndex = widget.index!; } } @@ -450,12 +442,12 @@ class _SwiperState extends _SwiperTimerMixin { _activeIndex = index; }); if (widget.onIndexChanged != null) { - widget.onIndexChanged(index); + widget.onIndexChanged!(index); } } Widget _buildSwiper() { - IndexedWidgetBuilder itemBuilder; + IndexedWidgetBuilder? itemBuilder; if (widget.onTap != null) { itemBuilder = _wrapTap; } else { @@ -477,7 +469,7 @@ class _SwiperState extends _SwiperTimerMixin { scrollDirection: widget.scrollDirection, ); } else if (_isPageViewLayout()) { - PageTransformer transformer = widget.transformer; + PageTransformer? transformer = widget.transformer; if (widget.scale != null || widget.fade != null) { transformer = new ScaleAndFadeTransformer(scale: widget.scale, fade: widget.fade); @@ -521,9 +513,9 @@ class _SwiperState extends _SwiperTimerMixin { return new _TinderSwiper( loop: widget.loop, itemWidth: widget.itemWidth, - itemHeight: widget.itemHeight, + itemHeight: widget.itemHeight!, itemCount: widget.itemCount, - itemBuilder: itemBuilder, + itemBuilder: itemBuilder!, index: _activeIndex, curve: widget.curve, duration: widget.duration, @@ -534,11 +526,11 @@ class _SwiperState extends _SwiperTimerMixin { } else if (widget.layout == SwiperLayout.CUSTOM) { return new _CustomLayoutSwiper( loop: widget.loop, - option: widget.customLayoutOption, + option: widget.customLayoutOption!, itemWidth: widget.itemWidth, itemHeight: widget.itemHeight, itemCount: widget.itemCount, - itemBuilder: itemBuilder, + itemBuilder: itemBuilder!, index: _activeIndex, curve: widget.curve, duration: widget.duration, @@ -551,7 +543,7 @@ class _SwiperState extends _SwiperTimerMixin { } } - SwiperPluginConfig _ensureConfig(SwiperPluginConfig config) { + SwiperPluginConfig _ensureConfig(SwiperPluginConfig? config) { if (config == null) { config = new SwiperPluginConfig( outer: widget.outer, @@ -568,7 +560,7 @@ class _SwiperState extends _SwiperTimerMixin { } List _ensureListForStack( - Widget swiper, List listForStack, Widget widget) { + Widget swiper, List? listForStack, Widget widget) { if (listForStack == null) { listForStack = [swiper, widget]; } else { @@ -580,46 +572,40 @@ class _SwiperState extends _SwiperTimerMixin { @override Widget build(BuildContext context) { Widget swiper = _buildSwiper(); - List listForStack; - SwiperPluginConfig config; + List? listForStack; + SwiperPluginConfig? config; if (widget.control != null) { //Stack config = _ensureConfig(config); listForStack = _ensureListForStack( - swiper, listForStack, widget.control.build(context, config)); + swiper, listForStack, widget.control!.build(context, config)); } - if (widget.plugins != null) { - config = _ensureConfig(config); - for (SwiperPlugin plugin in widget.plugins) { - listForStack = _ensureListForStack( - swiper, listForStack, plugin.build(context, config)); - } + config = _ensureConfig(config); + for (SwiperPlugin plugin in widget.plugins) { + listForStack = _ensureListForStack( + swiper, listForStack, plugin.build(context, config)); } if (widget.pagination != null) { config = _ensureConfig(config); if (widget.outer) { return _buildOuterPagination( - widget.pagination, + widget.pagination!, listForStack == null ? swiper : new Stack(children: listForStack), config); } else { listForStack = _ensureListForStack( - swiper, listForStack, widget.pagination.build(context, config)); + swiper, listForStack, widget.pagination!.build(context, config)); } } - if (listForStack != null) { - return new Stack( - children: listForStack, - ); - } - - return swiper; + return new Stack( + children: listForStack ?? [], + ); } Widget _buildOuterPagination( - SwiperPagination pagination, Widget swiper, SwiperPluginConfig config) { + SwiperPlugin pagination, Widget swiper, SwiperPluginConfig config) { List list = []; //Only support bottom yet! if (widget.containerHeight != null || widget.containerWidth != null) { @@ -642,31 +628,31 @@ class _SwiperState extends _SwiperTimerMixin { } abstract class _SubSwiper extends StatefulWidget { - final IndexedWidgetBuilder itemBuilder; + final IndexedWidgetBuilder? itemBuilder; final int itemCount; final int index; final ValueChanged onIndexChanged; - final SwiperController controller; + final SwiperController? controller; final int duration; final Curve curve; - final double itemWidth; - final double itemHeight; + final double? itemWidth; + final double? itemHeight; final bool loop; final Axis scrollDirection; _SubSwiper( - {Key key, - this.loop, + {Key? key, + required this.loop, this.itemHeight, this.itemWidth, - this.duration, - this.curve, + required this.duration, + required this.curve, this.itemBuilder, - this.controller, - this.index, - this.itemCount, + required this.controller, + required this.index, + required this.itemCount, this.scrollDirection: Axis.horizontal, - this.onIndexChanged}) + required this.onIndexChanged}) : super(key: key); @override @@ -684,20 +670,19 @@ abstract class _SubSwiper extends StatefulWidget { class _TinderSwiper extends _SubSwiper { _TinderSwiper({ - Key key, - Curve curve, - int duration, - SwiperController controller, - ValueChanged onIndexChanged, - double itemHeight, - double itemWidth, - IndexedWidgetBuilder itemBuilder, - int index, - bool loop, - int itemCount, - Axis scrollDirection, - }) : assert(itemWidth != null && itemHeight != null), - super( + Key? key, + required Curve curve, + required int duration, + required SwiperController? controller, + required ValueChanged onIndexChanged, + required double itemHeight, + double? itemWidth, + required IndexedWidgetBuilder itemBuilder, + required int index, + required bool loop, + required int itemCount, + required Axis scrollDirection, + }) : super( loop: loop, key: key, itemWidth: itemWidth, @@ -719,18 +704,18 @@ class _TinderSwiper extends _SubSwiper { class _StackSwiper extends _SubSwiper { _StackSwiper({ - Key key, - Curve curve, - int duration, - SwiperController controller, - ValueChanged onIndexChanged, - double itemHeight, - double itemWidth, - IndexedWidgetBuilder itemBuilder, - int index, - bool loop, - int itemCount, - Axis scrollDirection, + Key? key, + required Curve curve, + required int duration, + required SwiperController? controller, + required ValueChanged onIndexChanged, + double? itemHeight, + double? itemWidth, + IndexedWidgetBuilder? itemBuilder, + required int index, + required bool loop, + required int itemCount, + required Axis scrollDirection, }) : super( loop: loop, key: key, @@ -752,14 +737,14 @@ class _StackSwiper extends _SubSwiper { } class _TinderState extends _CustomLayoutStateBase<_TinderSwiper> { - List scales; - List offsetsX; - List offsetsY; - List opacity; - List rotates; + late List scales; + late List offsetsX; + late List offsetsY; + late List opacity; + late List rotates; double getOffsetY(double scale) { - return widget.itemHeight - widget.itemHeight * scale; + return widget.itemHeight! - widget.itemHeight! * scale; } @override @@ -835,7 +820,7 @@ class _TinderState extends _CustomLayoutStateBase<_TinderSwiper> { child: new SizedBox( width: widget.itemWidth ?? double.infinity, height: widget.itemHeight ?? double.infinity, - child: widget.itemBuilder(context, realIndex), + child: widget.itemBuilder?.call(context, realIndex), ), ), ), @@ -845,9 +830,9 @@ class _TinderState extends _CustomLayoutStateBase<_TinderSwiper> { } class _StackViewState extends _CustomLayoutStateBase<_StackSwiper> { - List scales; - List offsets; - List opacity; + late List scales; + late List offsets; + late List opacity; @override void didChangeDependencies() { super.didChangeDependencies(); @@ -855,10 +840,10 @@ class _StackViewState extends _CustomLayoutStateBase<_StackSwiper> { void _updateValues() { if (widget.scrollDirection == Axis.horizontal) { - double space = (_swiperWidth - widget.itemWidth) / 2; + double space = (_swiperWidth - widget.itemWidth!) / 2; offsets = [-space, -space / 3 * 2, -space / 3, 0.0, _swiperWidth]; } else { - double space = (_swiperHeight - widget.itemHeight) / 2; + double space = (_swiperHeight - widget.itemHeight!) / 2; offsets = [-space, -space / 3 * 2, -space / 3, 0.0, _swiperHeight]; } } @@ -909,7 +894,7 @@ class _StackViewState extends _CustomLayoutStateBase<_StackSwiper> { child: new SizedBox( width: widget.itemWidth ?? double.infinity, height: widget.itemHeight ?? double.infinity, - child: widget.itemBuilder(context, realIndex), + child: widget.itemBuilder?.call(context, realIndex), ), ), ), @@ -921,32 +906,28 @@ class ScaleAndFadeTransformer extends PageTransformer { final double _scale; final double _fade; - ScaleAndFadeTransformer({double fade: 0.3, double scale: 0.8}) - : _fade = fade, - _scale = scale; + ScaleAndFadeTransformer({double? fade: 0.3, double? scale: 0.8}) + : _fade = fade ?? 0.3, + _scale = scale ?? 0.8; @override Widget transform(Widget item, TransformInfo info) { double position = info.position; Widget child = item; - if (_scale != null) { - double scaleFactor = (1 - position.abs()) * (1 - _scale); - double scale = _scale + scaleFactor; + double scaleFactor = (1 - position.abs()) * (1 - _scale); + double scale = _scale + scaleFactor; - child = new Transform.scale( - scale: scale, - child: item, - ); - } + child = new Transform.scale( + scale: scale, + child: item, + ); - if (_fade != null) { - double fadeFactor = (1 - position.abs()) * (1 - _fade); - double opacity = _fade + fadeFactor; - child = new Opacity( - opacity: opacity, - child: child, - ); - } + double fadeFactor = (1 - position.abs()) * (1 - _fade); + double opacity = _fade + fadeFactor; + child = new Opacity( + opacity: opacity, + child: child, + ); return child; } diff --git a/lib/src/swiper_control.dart b/lib/src/swiper_control.dart index 158b460..239395b 100644 --- a/lib/src/swiper_control.dart +++ b/lib/src/swiper_control.dart @@ -12,15 +12,15 @@ class SwiperControl extends SwiperPlugin { final double size; ///Icon normal color, The theme's [ThemeData.primaryColor] by default. - final Color color; + final Color? color; ///if set loop=false on Swiper, this color will be used when swiper goto the last slide. ///The theme's [ThemeData.disabledColor] by default. - final Color disableColor; + final Color? disableColor; final EdgeInsetsGeometry padding; - final Key key; + final Key? key; const SwiperControl( {this.iconPrevious: Icons.arrow_back_ios, @@ -37,9 +37,9 @@ class SwiperControl extends SwiperPlugin { behavior: HitTestBehavior.opaque, onTap: () { if (previous) { - config.controller.previous(animation: true); + config.controller?.previous(animation: true); } else { - config.controller.next(animation: true); + config.controller?.next(animation: true); } }, child: Padding( @@ -64,7 +64,7 @@ class SwiperControl extends SwiperPlugin { Color prevColor; Color nextColor; - if (config.loop) { + if (config.loop ?? false) { prevColor = nextColor = color; } else { bool next = config.activeIndex < config.itemCount - 1; diff --git a/lib/src/swiper_controller.dart b/lib/src/swiper_controller.dart index c527915..dc178fe 100644 --- a/lib/src/swiper_controller.dart +++ b/lib/src/swiper_controller.dart @@ -16,15 +16,13 @@ class SwiperController extends IndexController { static const int BUILD = 5; // available when `event` == SwiperController.BUILD - SwiperPluginConfig config; + SwiperPluginConfig? config; // available when `event` == SwiperController.SWIPE // this value is PageViewController.pos - double pos; + double? pos; - int index; - bool animation; - bool autoplay; + bool autoplay = false; SwiperController(); diff --git a/lib/src/swiper_pagination.dart b/lib/src/swiper_pagination.dart index ae847e1..5b929ea 100644 --- a/lib/src/swiper_pagination.dart +++ b/lib/src/swiper_pagination.dart @@ -3,10 +3,10 @@ import 'package:flutter_swiper/flutter_swiper.dart'; class FractionPaginationBuilder extends SwiperPlugin { ///color ,if set null , will be Theme.of(context).scaffoldBackgroundColor - final Color color; + final Color? color; ///color when active,if set null , will be Theme.of(context).primaryColor - final Color activeColor; + final Color? activeColor; ////font size final double fontSize; @@ -14,7 +14,7 @@ class FractionPaginationBuilder extends SwiperPlugin { ///font size when active final double activeFontSize; - final Key key; + final Key? key; const FractionPaginationBuilder( {this.color, @@ -69,10 +69,10 @@ class FractionPaginationBuilder extends SwiperPlugin { class RectSwiperPaginationBuilder extends SwiperPlugin { ///color when current index,if set null , will be Theme.of(context).primaryColor - final Color activeColor; + final Color? activeColor; ///,if set null , will be Theme.of(context).scaffoldBackgroundColor - final Color color; + final Color? color; ///Size of the rect when activate final Size activeSize; @@ -83,7 +83,7 @@ class RectSwiperPaginationBuilder extends SwiperPlugin { /// Space between rects final double space; - final Key key; + final Key? key; const RectSwiperPaginationBuilder( {this.activeColor, @@ -141,10 +141,10 @@ class RectSwiperPaginationBuilder extends SwiperPlugin { class DotSwiperPaginationBuilder extends SwiperPlugin { ///color when current index,if set null , will be Theme.of(context).primaryColor - final Color activeColor; + final Color? activeColor; ///,if set null , will be Theme.of(context).scaffoldBackgroundColor - final Color color; + final Color? color; ///Size of the dot when activate final double activeSize; @@ -155,7 +155,7 @@ class DotSwiperPaginationBuilder extends SwiperPlugin { /// Space between dots final double space; - final Key key; + final Key? key; const DotSwiperPaginationBuilder( {this.activeColor, @@ -171,8 +171,8 @@ class DotSwiperPaginationBuilder extends SwiperPlugin { print( "The itemCount is too big, we suggest use FractionPaginationBuilder instead of DotSwiperPaginationBuilder in this sitituation"); } - Color activeColor = this.activeColor; - Color color = this.color; + Color? activeColor = this.activeColor; + Color? color = this.color; if (activeColor == null || color == null) { ThemeData themeData = Theme.of(context); @@ -185,7 +185,7 @@ class DotSwiperPaginationBuilder extends SwiperPlugin { return new PageIndicator( count: config.itemCount, controller: config.pageController, - layout: config.indicatorLayout, + layout: config.indicatorLayout ?? PageIndicatorLayout.SLIDE, size: size, activeColor: activeColor, color: color, @@ -235,7 +235,7 @@ typedef Widget SwiperPaginationBuilder( class SwiperCustomPagination extends SwiperPlugin { final SwiperPaginationBuilder builder; - SwiperCustomPagination({@required this.builder}) : assert(builder != null); + SwiperCustomPagination({required this.builder}); @override Widget build(BuildContext context, SwiperPluginConfig config) { @@ -254,7 +254,7 @@ class SwiperPagination extends SwiperPlugin { /// Alignment.bottomCenter by default when scrollDirection== Axis.horizontal /// Alignment.centerRight by default when scrollDirection== Axis.vertical - final Alignment alignment; + final Alignment? alignment; /// Distance between pagination and the container final EdgeInsetsGeometry margin; @@ -262,7 +262,7 @@ class SwiperPagination extends SwiperPlugin { /// Build the widet final SwiperPlugin builder; - final Key key; + final Key? key; const SwiperPagination( {this.alignment, @@ -279,7 +279,7 @@ class SwiperPagination extends SwiperPlugin { margin: margin, child: this.builder.build(context, config), ); - if (!config.outer) { + if (!(config.outer ?? false)) { child = new Align( key: key, alignment: alignment, diff --git a/lib/src/swiper_plugin.dart b/lib/src/swiper_plugin.dart index f54a2eb..562ef7d 100644 --- a/lib/src/swiper_plugin.dart +++ b/lib/src/swiper_plugin.dart @@ -12,26 +12,24 @@ abstract class SwiperPlugin { class SwiperPluginConfig { final int activeIndex; final int itemCount; - final PageIndicatorLayout indicatorLayout; + final PageIndicatorLayout? indicatorLayout; final Axis scrollDirection; - final bool loop; - final bool outer; - final PageController pageController; - final SwiperController controller; - final SwiperLayout layout; + final bool? loop; + final bool? outer; + final PageController? pageController; + final SwiperController? controller; + final SwiperLayout? layout; const SwiperPluginConfig( - {this.activeIndex, - this.itemCount, + {required this.activeIndex, + required this.itemCount, this.indicatorLayout, this.outer, - this.scrollDirection, - this.controller, + required this.scrollDirection, + required this.controller, this.pageController, this.layout, - this.loop}) - : assert(scrollDirection != null), - assert(controller != null); + this.loop}); } class SwiperPluginView extends StatelessWidget { diff --git a/lib/src/transformer_page_view/index_controller.dart b/lib/src/transformer_page_view/index_controller.dart index d3f6a51..1896ccb 100644 --- a/lib/src/transformer_page_view/index_controller.dart +++ b/lib/src/transformer_page_view/index_controller.dart @@ -8,13 +8,13 @@ class IndexController extends ChangeNotifier { static const int PREVIOUS = -1; static const int MOVE = 0; - Completer _completer; + late Completer _completer; - int index; - bool animation; - int event; + late int index; + late bool animation; + late int event; - Future move(int index, {bool animation: true}) { + Future move(int index, {bool? animation: true}) { this.animation = animation ?? true; this.index = index; this.event = MOVE; @@ -23,7 +23,7 @@ class IndexController extends ChangeNotifier { return _completer.future; } - Future next({bool animation: true}) { + Future next({bool? animation: true}) { this.event = NEXT; this.animation = animation ?? true; _completer = new Completer(); @@ -31,7 +31,7 @@ class IndexController extends ChangeNotifier { return _completer.future; } - Future previous({bool animation: true}) { + Future previous({bool? animation: true}) { this.event = PREVIOUS; this.animation = animation ?? true; _completer = new Completer(); diff --git a/lib/src/transformer_page_view/parallax.dart b/lib/src/transformer_page_view/parallax.dart index c7c95ea..2ea5f75 100644 --- a/lib/src/transformer_page_view/parallax.dart +++ b/lib/src/transformer_page_view/parallax.dart @@ -88,9 +88,9 @@ class ParallaxColor extends StatefulWidget { final TransformInfo info; ParallaxColor({ - @required this.colors, - @required this.info, - @required this.child, + required this.colors, + required this.info, + required this.child, }); @override @@ -100,18 +100,16 @@ class ParallaxColor extends StatefulWidget { } class ParallaxContainer extends StatelessWidget { - final Widget child; + final Widget? child; final double position; final double translationFactor; final double opacityFactor; ParallaxContainer( - {@required this.child, - @required this.position, + {this.child, + required this.position, this.translationFactor: 100.0, - this.opacityFactor: 1.0}) - : assert(position != null), - assert(translationFactor != null); + this.opacityFactor: 1.0}); @override Widget build(BuildContext context) { @@ -129,9 +127,8 @@ class ParallaxImage extends StatelessWidget { final Image image; final double imageFactor; - ParallaxImage.asset(String name, {double position, this.imageFactor: 0.3}) - : assert(imageFactor != null), - image = Image.asset(name, + ParallaxImage.asset(String name, {required double position, this.imageFactor: 0.3}) + : image = Image.asset(name, fit: BoxFit.cover, alignment: FractionalOffset( 0.5 + position * imageFactor, diff --git a/lib/src/transformer_page_view/transformer_page_view.dart b/lib/src/transformer_page_view/transformer_page_view.dart index 09d19fc..1508969 100644 --- a/lib/src/transformer_page_view/transformer_page_view.dart +++ b/lib/src/transformer_page_view/transformer_page_view.dart @@ -58,16 +58,16 @@ class TransformInfo { final Axis scrollDirection; TransformInfo( - {this.index, - this.position, - this.width, - this.height, - this.activeIndex, - this.fromIndex, - this.forward, - this.done, - this.viewportFraction, - this.scrollDirection}); + {required this.index, + required this.position, + required this.width, + required this.height, + required this.activeIndex, + required this.fromIndex, + required this.forward, + required this.done, + required this.viewportFraction, + required this.scrollDirection}); } abstract class PageTransformer { @@ -85,9 +85,8 @@ typedef Widget PageTransformerBuilderCallback(Widget child, TransformInfo info); class PageTransformerBuilder extends PageTransformer { final PageTransformerBuilderCallback builder; - PageTransformerBuilder({bool reverse: false, @required this.builder}) - : assert(builder != null), - super(reverse: reverse); + PageTransformerBuilder({bool reverse: false, required this.builder}) + : super(reverse: reverse); @override Widget transform(Widget child, TransformInfo info) { @@ -105,15 +104,15 @@ class TransformerPageController extends PageController { bool keepPage = true, double viewportFraction = 1.0, this.loop: false, - this.itemCount, + required this.itemCount, this.reverse: false, }) : super( initialPage: TransformerPageController._getRealIndexFromRenderIndex( - initialPage ?? 0, loop, itemCount, reverse), + initialPage, loop, itemCount, reverse), keepPage: keepPage, viewportFraction: viewportFraction); - int getRenderIndexFromRealIndex(num index) { + int getRenderIndexFromRealIndex(int index) { return _getRenderIndexFromRealIndex(index, loop, itemCount, reverse); } @@ -123,7 +122,7 @@ class TransformerPageController extends PageController { } static _getRenderIndexFromRealIndex( - num index, bool loop, int itemCount, bool reverse) { + int index, bool loop, int itemCount, bool reverse) { if (itemCount == 0) return 0; int renderIndex; if (loop) { @@ -142,20 +141,14 @@ class TransformerPageController extends PageController { return renderIndex; } - double get realPage { - double page; - if (position.maxScrollExtent == null || position.minScrollExtent == null) { - page = 0.0; - } else { - page = super.page; - } - - return page; + double? get realPage { + return super.page; } static _getRenderPageFromRealPage( - double page, bool loop, int itemCount, bool reverse) { + double? page, bool loop, int itemCount, bool reverse) { double renderPage; + page ??= 0; if (loop) { renderPage = page - kMiddleValue; renderPage = renderPage % itemCount; @@ -178,12 +171,12 @@ class TransformerPageController extends PageController { : realPage; } - int getRealIndexFromRenderIndex(num index) { + int getRealIndexFromRenderIndex(int index) { return _getRealIndexFromRenderIndex(index, loop, itemCount, reverse); } static int _getRealIndexFromRenderIndex( - num index, bool loop, int itemCount, bool reverse) { + int index, bool loop, int itemCount, bool reverse) { int result = reverse ? (itemCount - index - 1) : index; if (loop) { result += kMiddleValue; @@ -196,7 +189,7 @@ class TransformerPageView extends StatefulWidget { /// Create a `transformed` widget base on the widget that has been passed to the [PageTransformer.transform]. /// See [TransformInfo] /// - final PageTransformer transformer; + final PageTransformer? transformer; /// Same as [PageView.scrollDirection] /// @@ -204,7 +197,7 @@ class TransformerPageView extends StatefulWidget { final Axis scrollDirection; /// Same as [PageView.physics] - final ScrollPhysics physics; + final ScrollPhysics? physics; /// Set to false to disable page snapping, useful for custom scroll behavior. /// Same as [PageView.pageSnapping] @@ -212,12 +205,12 @@ class TransformerPageView extends StatefulWidget { /// Called whenever the page in the center of the viewport changes. /// Same as [PageView.onPageChanged] - final ValueChanged onPageChanged; + final ValueChanged? onPageChanged; - final IndexedWidgetBuilder itemBuilder; + final IndexedWidgetBuilder? itemBuilder; // See [IndexController.mode],[IndexController.next],[IndexController.previous] - final IndexController controller; + final IndexController? controller; /// Animation duration final Duration duration; @@ -225,7 +218,7 @@ class TransformerPageView extends StatefulWidget { /// Animation curve final Curve curve; - final TransformerPageController pageController; + final TransformerPageController? pageController; /// Set true to open infinity loop mode. final bool loop; @@ -237,7 +230,7 @@ class TransformerPageView extends StatefulWidget { final double viewportFraction; /// If not set, it is controlled by this widget. - final int index; + final int? index; /// Creates a scrollable list that works page by page using widgets that are /// created on demand. @@ -252,9 +245,9 @@ class TransformerPageView extends StatefulWidget { /// [itemBuilder] will be called only with indices greater than or equal to /// zero and less than [itemCount]. TransformerPageView({ - Key key, + Key? key, this.index, - Duration duration, + this.duration: const Duration(milliseconds: kDefaultTransactionDuration), this.curve: Curves.ease, this.viewportFraction: 1.0, this.loop: false, @@ -262,33 +255,29 @@ class TransformerPageView extends StatefulWidget { this.physics, this.pageSnapping = true, this.onPageChanged, - this.controller, + required this.controller, this.transformer, this.itemBuilder, this.pageController, - @required this.itemCount, - }) : assert(itemCount != null), - assert(itemCount == 0 || itemBuilder != null || transformer != null), - this.duration = - duration ?? new Duration(milliseconds: kDefaultTransactionDuration), + required this.itemCount, + }) : assert(itemCount == 0 || itemBuilder != null || transformer != null), super(key: key); factory TransformerPageView.children( - {Key key, - int index, - Duration duration, + {Key? key, + int? index, + Duration? duration, Curve curve: Curves.ease, double viewportFraction: 1.0, bool loop: false, Axis scrollDirection = Axis.horizontal, - ScrollPhysics physics, + ScrollPhysics? physics, bool pageSnapping = true, - ValueChanged onPageChanged, - IndexController controller, - PageTransformer transformer, - @required List children, - TransformerPageController pageController}) { - assert(children != null); + ValueChanged? onPageChanged, + required IndexController controller, + PageTransformer? transformer, + required List children, + TransformerPageController? pageController}) { return new TransformerPageView( itemCount: children.length, itemBuilder: (BuildContext context, int index) { @@ -299,7 +288,7 @@ class TransformerPageView extends StatefulWidget { pageSnapping: pageSnapping, key: key, index: index, - duration: duration, + duration: duration ?? const Duration(milliseconds: kDefaultTransactionDuration), curve: curve, viewportFraction: viewportFraction, scrollDirection: scrollDirection, @@ -315,7 +304,7 @@ class TransformerPageView extends StatefulWidget { } static int getRealIndexFromRenderIndex( - {bool reverse, int index, int itemCount, bool loop}) { + {required bool reverse, required int index, required int itemCount, required bool loop}) { int initPage = reverse ? (itemCount - index - 1) : index; if (loop) { initPage += kMiddleValue; @@ -324,11 +313,11 @@ class TransformerPageView extends StatefulWidget { } static PageController createPageController( - {bool reverse, - int index, - int itemCount, - bool loop, - double viewportFraction}) { + {required bool reverse, + required int index, + required int itemCount, + required bool loop, + required double viewportFraction}) { return new PageController( initialPage: getRealIndexFromRenderIndex( reverse: reverse, index: index, itemCount: itemCount, loop: loop), @@ -337,45 +326,42 @@ class TransformerPageView extends StatefulWidget { } class _TransformerPageViewState extends State { - Size _size; - int _activeIndex; - double _currentPixels; + Size? _size; + late int _activeIndex; + late double _currentPixels; bool _done = false; ///This value will not change until user end drag. - int _fromIndex; + late int _fromIndex; - PageTransformer _transformer; + PageTransformer? _transformer; - TransformerPageController _pageController; + late TransformerPageController _pageController; Widget _buildItemNormal(BuildContext context, int index) { int renderIndex = _pageController.getRenderIndexFromRealIndex(index); - Widget child = widget.itemBuilder(context, renderIndex); - return child; + Widget? child = widget.itemBuilder?.call(context, renderIndex); + return child ?? Container(); } Widget _buildItem(BuildContext context, int index) { return new AnimatedBuilder( animation: _pageController, - builder: (BuildContext c, Widget w) { + builder: (BuildContext c, Widget? w) { int renderIndex = _pageController.getRenderIndexFromRealIndex(index); - Widget child; + late Widget child; if (widget.itemBuilder != null) { - child = widget.itemBuilder(context, renderIndex); - } - if (child == null) { - child = new Container(); + child = widget.itemBuilder?.call(context, renderIndex) ?? Container(); } if (_size == null) { - return child ?? new Container(); + return child; } double position; - double page = _pageController.realPage; + double page = _pageController.realPage ?? 0; - if (_transformer.reverse) { + if (_transformer!.reverse) { position = page - index; } else { position = index - page; @@ -384,8 +370,8 @@ class _TransformerPageViewState extends State { TransformInfo info = new TransformInfo( index: renderIndex, - width: _size.width, - height: _size.height, + width: _size!.width, + height: _size!.height, position: position.clamp(-1.0, 1.0), activeIndex: _pageController.getRenderIndexFromRealIndex(_activeIndex), @@ -394,7 +380,7 @@ class _TransformerPageViewState extends State { done: _done, scrollDirection: widget.scrollDirection, viewportFraction: widget.viewportFraction); - return _transformer.transform(child, info); + return _transformer!.transform(child, info); }); } @@ -444,29 +430,21 @@ class _TransformerPageViewState extends State { void _onIndexChanged(int index) { _activeIndex = index; - if (widget.onPageChanged != null) { - widget.onPageChanged(_pageController.getRenderIndexFromRealIndex(index)); - } + widget.onPageChanged?.call(_pageController.getRenderIndexFromRealIndex(index)); } void _onGetSize(_) { - Size size; - if (context == null) { - onGetSize(size); - return; - } - RenderObject renderObject = context.findRenderObject(); + Size? size; + RenderObject? renderObject = context.findRenderObject(); if (renderObject != null) { Rect bounds = renderObject.paintBounds; - if (bounds != null) { - size = bounds.size; - } + size = bounds.size; } _calcCurrentPixels(); onGetSize(size); } - void onGetSize(Size size) { + void onGetSize(Size? size) { if(mounted){ setState(() { _size = size; @@ -479,22 +457,19 @@ class _TransformerPageViewState extends State { void initState() { _transformer = widget.transformer; // int index = widget.index ?? 0; - _pageController = widget.pageController; - if (_pageController == null) { - _pageController = new TransformerPageController( - initialPage: widget.index, - itemCount: widget.itemCount, - loop: widget.loop, - reverse: - widget.transformer == null ? false : widget.transformer.reverse); - } + _pageController = widget.pageController ??TransformerPageController( + initialPage: widget.index ?? 0, + itemCount: widget.itemCount, + loop: widget.loop, + reverse: + widget.transformer == null ? false : widget.transformer!.reverse); // int initPage = _getRealIndexFromRenderIndex(index); // _pageController = new PageController(initialPage: initPage,viewportFraction: widget.viewportFraction); _fromIndex = _activeIndex = _pageController.initialPage; _controller = getNotifier(); if (_controller != null) { - _controller.addListener(onChangeNotifier); + _controller!.addListener(onChangeNotifier); } super.initState(); } @@ -506,16 +481,16 @@ class _TransformerPageViewState extends State { bool created = false; if (_pageController != widget.pageController) { if (widget.pageController != null) { - _pageController = widget.pageController; + _pageController = widget.pageController!; } else { created = true; _pageController = new TransformerPageController( - initialPage: widget.index, + initialPage: widget.index ?? 0, itemCount: widget.itemCount, loop: widget.loop, reverse: widget.transformer == null ? false - : widget.transformer.reverse); + : widget.transformer!.reverse); } } @@ -528,15 +503,15 @@ class _TransformerPageViewState extends State { } } if (_transformer != null) - WidgetsBinding.instance.addPostFrameCallback(_onGetSize); + WidgetsBinding.instance?.addPostFrameCallback(_onGetSize); if (_controller != getNotifier()) { if (_controller != null) { - _controller.removeListener(onChangeNotifier); + _controller!.removeListener(onChangeNotifier); } _controller = getNotifier(); if (_controller != null) { - _controller.addListener(onChangeNotifier); + _controller!.addListener(onChangeNotifier); } } super.didUpdateWidget(oldWidget); @@ -545,11 +520,11 @@ class _TransformerPageViewState extends State { @override void didChangeDependencies() { if (_transformer != null) - WidgetsBinding.instance.addPostFrameCallback(_onGetSize); + WidgetsBinding.instance?.addPostFrameCallback(_onGetSize); super.didChangeDependencies(); } - ChangeNotifier getNotifier() { + ChangeNotifier? getNotifier() { return widget.controller; } @@ -581,13 +556,13 @@ class _TransformerPageViewState extends State { } void onChangeNotifier() { - int event = widget.controller.event; + int? event = widget.controller?.event; int index; switch (event) { case IndexController.MOVE: { index = _pageController - .getRealIndexFromRenderIndex(widget.controller.index); + .getRealIndexFromRenderIndex(widget.controller!.index); } break; case IndexController.PREVIOUS: @@ -600,23 +575,23 @@ class _TransformerPageViewState extends State { //ignore this event return; } - if (widget.controller.animation) { + if (widget.controller?.animation ?? false) { _pageController .animateToPage(index, - duration: widget.duration, curve: widget.curve ?? Curves.ease) - .whenComplete(widget.controller.complete); + duration: widget.duration, curve: widget.curve) + .whenComplete(widget.controller!.complete); } else { _pageController.jumpToPage(index); - widget.controller.complete(); + widget.controller?.complete(); } } - ChangeNotifier _controller; + ChangeNotifier? _controller; void dispose() { super.dispose(); if (_controller != null) { - _controller.removeListener(onChangeNotifier); + _controller?.removeListener(onChangeNotifier); } } } \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 18b893b..3a832ae 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,49 +7,49 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.8.2" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.3.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -66,21 +66,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.11" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.7.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -92,56 +92,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.4.3" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.1" sdks: - dart: ">=2.10.0-110 <2.11.0" - flutter: ">=0.1.4 <3.0.0" + dart: ">=2.14.0 <3.0.0" + flutter: ">=0.1.4" diff --git a/pubspec.yaml b/pubspec.yaml index 222054b..6a8c35e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ dependencies: sdk: flutter environment: - sdk: ">=2.0.0-dev.48.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' flutter: ">=0.1.4 <3.0.0" dev_dependencies: