Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

## [0.6.0] #64

Merged
merged 1 commit into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [0.6.0]

* Issues:
Fix issue about strange behaviour at slide out page

## [0.5.9]

* Add HeroBuilderForSlidingPage call back to fix strange hero animation
Expand Down
4 changes: 2 additions & 2 deletions lib/src/extended_image.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'dart:io';
import 'dart:io' show File;
import 'dart:typed_data';

import 'package:extended_image/src/extended_image_border_painter.dart';
Expand Down Expand Up @@ -934,7 +934,7 @@ class _ExtendedImageState extends State<ExtendedImage>
}

Widget _getIndicator(BuildContext context) {
return Platform.isIOS
return Theme.of(context).platform == TargetPlatform.iOS
? CupertinoActivityIndicator(
animating: true,
radius: 16.0,
Expand Down
27 changes: 14 additions & 13 deletions lib/src/gesture/extended_image_gesture.dart
Original file line number Diff line number Diff line change
Expand Up @@ -323,19 +323,6 @@ class _ExtendedImageGestureState extends State<ExtendedImageGesture>
gestureDetails: _gestureDetails,
);

image = GestureDetector(
onScaleStart: _handleScaleStart,
onScaleUpdate: _handleScaleUpdate,
onScaleEnd: _handleScaleEnd,
onDoubleTap: _handleDoubleTap,
child: image,
);

image = Listener(
child: image,
onPointerDown: _handlePointerDown,
);

if (widget.extendedImageSlidePageState != null) {
image = widget.extendedImageState.imageWidget?.heroBuilderForSlidingPage
?.call(image) ??
Expand All @@ -353,6 +340,20 @@ class _ExtendedImageGestureState extends State<ExtendedImageGesture>
}
}

image = GestureDetector(
onScaleStart: _handleScaleStart,
onScaleUpdate: _handleScaleUpdate,
onScaleEnd: _handleScaleEnd,
onDoubleTap: _handleDoubleTap,
child: image,
);

image = Listener(
child: image,
onPointerDown: _handlePointerDown,
);


return image;
}

Expand Down
51 changes: 43 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.10"
args:
dependency: transitive
description:
name: args
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.5.2"
async:
dependency: transitive
description:
name: async
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.0"
version: "2.3.0"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -42,7 +56,7 @@ packages:
name: crypto
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.6"
version: "2.1.3"
extended_image_library:
dependency: "direct main"
description:
Expand Down Expand Up @@ -81,6 +95,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.3"
image:
dependency: transitive
description:
name: image
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.4"
matcher:
dependency: transitive
description:
Expand All @@ -94,14 +115,14 @@ packages:
name: meta
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.6"
version: "1.1.7"
path:
dependency: transitive
description:
name: path
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.2"
version: "1.6.4"
path_provider:
dependency: transitive
description:
Expand All @@ -115,14 +136,21 @@ packages:
name: pedantic
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
version: "1.8.0+1"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.0"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.3"
version: "2.0.5"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -155,7 +183,7 @@ packages:
name: string_scanner
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
version: "1.0.5"
term_glyph:
dependency: transitive
description:
Expand Down Expand Up @@ -184,6 +212,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.8"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.5.0"
sdks:
dart: ">=2.2.2 <3.0.0"
dart: ">=2.4.0 <3.0.0"
flutter: ">=0.1.4 <2.0.0"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: extended_image
description: Official extension image, support placeholder(loading)/ failed state, cache network, zoom/pan, photo view, slide out page, editor(crop,rotate,flip), painting etc.
version: 0.5.9
version: 0.6.0
author: zmtzawqlp <[email protected]>
homepage: https://github.com/fluttercandies/extended_image

Expand Down