π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Pinch editor layers normally with a finger on a corner
r4khul6956d32981a0
diff --git a/mobile/apps/photos/changes/image-editor-corner-pinch.md b/mobile/apps/photos/changes/image-editor-corner-pinch.mdnew file mode 100644index 0000000000..f2db805a01--- /dev/null+++ b/mobile/apps/photos/changes/image-editor-corner-pinch.md@@ -0,0 +1 @@+- Fixed text and drawings jumping in the photo editor when you pinch with a finger on a corner.diff --git a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_layer_selection.dart b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_layer_selection.dartindex f2fa5673e3..b78c9bd020 100644--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_layer_selection.dart+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_layer_selection.dart@@ -20,6 +20,7 @@ const _textEditorWidthInset = 34.0;LayerInteractionConfigs imageEditorLayerInteractionConfigs(BuildContext context,ValueGetter<ProImageEditorState?> editor,+ ImageEditorLayerScaleRotate scaleRotate,) {final colors = context.componentColors;final strings = context.strings;@@ -40,8 +41,12 @@ LayerInteractionConfigs imageEditorLayerInteractionConfigs(builder: (_) => _LayerSelection(info: info,colors: colors,- onScaleRotateDown: interactions.scaleRotateDown,- onScaleRotateUp: interactions.scaleRotateUp,+ onScaleRotateDown: (event) => scaleRotate.onHandleDown(+ event,+ interactions.scaleRotateDown,+ interactions.scaleRotateUp,+ ),+ onScaleRotateEnd: scaleRotate.onHandleEnd,actions: [if (layer.isTextLayer ||(layer is PaintLayer && !layer.item.isCensorArea))@@ -82,6 +87,39 @@ LayerInteractionConfigs imageEditorLayerInteractionConfigs();}+class ImageEditorLayerScaleRotate {+ int? _pointer;+ VoidCallback? _release;++ void onHandleDown(+ PointerDownEvent event,+ ValueChanged<PointerDownEvent> scaleRotateDown,+ ValueChanged<PointerUpEvent> scaleRotateUp,+ ) {+ _end();+ _pointer = event.pointer;+ _release = () => scaleRotateUp(+ PointerUpEvent(pointer: event.pointer, position: event.position),+ );+ scaleRotateDown(event);+ }++ void onHandleEnd(PointerEvent event) {+ if (event.pointer == _pointer) _end();+ }++ void onScaleStart(ScaleStartDetails details) {+ if (details.pointerCount > 1) _end();+ }++ void _end() {+ final release = _release;+ _pointer = null;+ _release = null;+ release?.call();+ }+}+class ImageEditorLayerDoubleTap {ImageEditorLayerDoubleTap(this.editor, {DateTime Function()? now}): now = now ?? DateTime.now;@@ -296,14 +334,14 @@ class _LayerSelection extends StatelessWidget {required this.info,required this.colors,required this.onScaleRotateDown,- required this.onScaleRotateUp,+ required this.onScaleRotateEnd,required this.actions,});final OverlayChildLayoutInfo info;final ColorTokens colors;final ValueChanged<PointerDownEvent> onScaleRotateDown;- final ValueChanged<PointerUpEvent> onScaleRotateUp;+ final ValueChanged<PointerEvent> onScaleRotateEnd;final List<Widget> actions;@override@@ -366,7 +404,7 @@ class _LayerSelection extends StatelessWidget {child: Listener(behavior: HitTestBehavior.translucent,onPointerDown: onScaleRotateDown,- onPointerUp: onScaleRotateUp,+ onPointerUp: onScaleRotateEnd,child: const IgnorePointer(child: SizedBox.expand()),),),diff --git a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dartindex 0948d0ff28..45217c5da8 100644--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart@@ -62,6 +62,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {late final _layerDoubleTap = ImageEditorLayerDoubleTap(() => editorKey.currentState,);+ final _layerScaleRotate = ImageEditorLayerScaleRotate();SubEditor? _activeSubEditor;final _logger = Logger("ImageEditor");@@ -287,6 +288,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {onOpenSubEditor: (editor) => _activeSubEditor = editor,onLayerTapDown: _layerDoubleTap.onLayerDown,onLayerTapUp: _layerDoubleTap.onLayerUp,+ onScaleStart: _layerScaleRotate.onScaleStart,onCreateTextLayer: () =>imageEditorCreateTextLayer(() => editorKey.currentState),onEndCloseSubEditor: (editor) {@@ -326,6 +328,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {layerInteraction: imageEditorLayerInteractionConfigs(context,() => editorKey.currentState,+ _layerScaleRotate,),theme: ThemeData(scaffoldBackgroundColor: colors.backgroundBase,diff --git a/mobile/apps/photos/test/ui/tools/editor/image_editor_text_test.dart b/mobile/apps/photos/test/ui/tools/editor/image_editor_text_test.dartindex ad813d0f2d..7368358567 100644--- a/mobile/apps/photos/test/ui/tools/editor/image_editor_text_test.dart+++ b/mobile/apps/photos/test/ui/tools/editor/image_editor_text_test.dart@@ -194,6 +194,48 @@ void main() {expect(find.bySubtype<TextEditor>(), findsNothing);});+ for (final cornerFirst in [true, false]) {+ testWidgets(+ 'pinching text with one finger on a corner scales it like a pinch '+ '(${cornerFirst ? 'corner' : 'text'} touched first)',+ (tester) async {+ final editor = await _openEditor(tester);+ await _tap(tester, find.text('Done'));+ final rect = tester.getRect(+ find.byKey(editor.activeLayers.single.keyInternalSize),+ );+ final corner = rect.topRight + const Offset(6, -6);+ final anchor = rect.centerLeft + const Offset(8, 0);+ Offset cornerAt(double spread) => anchor + (corner - anchor) * spread;+ final first = await tester.startGesture(cornerFirst ? corner : anchor);+ if (cornerFirst) {+ expect(+ editor.layerInteractionManager.rotateScaleLayerSizeHelper,+ isNotNull,+ );+ }+ final second = await tester.startGesture(cornerFirst ? anchor : corner);+ final cornerGesture = cornerFirst ? first : second;+ var spread = 1.0;+ for (var i = 0; i < 10 && !editor.isLayerBeingTransformed; i++) {+ spread += 0.1;+ await cornerGesture.moveTo(cornerAt(spread));+ await tester.pump();+ }+ final startScale = editor.activeLayers.single.scale;+ await cornerGesture.moveTo(cornerAt(spread * 1.5));+ await tester.pump();++ final layer = editor.activeLayers.single;+ expect(layer.scale, closeTo(startScale * 1.5, 0.05));+ expect(layer.rotation, closeTo(0, 0.01));+ await first.up();+ await second.up();+ await tester.pumpAndSettle();+ },+ );+ }+testWidgets('typed text remains visible after rotating to landscape', (tester,) async {@@ -220,6 +262,7 @@ Future<ProImageEditorState> _openEditor(final key = GlobalKey<ProImageEditorState>();SubEditor? activeSubEditor;final doubleTap = ImageEditorLayerDoubleTap(() => key.currentState, now: now);+ final scaleRotate = ImageEditorLayerScaleRotate();await tester.pumpWidget(MaterialApp(theme: darkThemeData,@@ -243,6 +286,7 @@ Future<ProImageEditorState> _openEditor(onOpenSubEditor: (editor) => activeSubEditor = editor,onLayerTapDown: doubleTap.onLayerDown,onLayerTapUp: doubleTap.onLayerUp,+ onScaleStart: scaleRotate.onScaleStart,onCreateTextLayer: () =>imageEditorCreateTextLayer(() => key.currentState),),@@ -256,6 +300,7 @@ Future<ProImageEditorState> _openEditor(layerInteraction: imageEditorLayerInteractionConfigs(context,() => key.currentState,+ scaleRotate,),textEditor: imageEditorTextConfigs(context),mainEditor: MainEditorConfigs(