diff --git a/api/lib/src/models/tool.dart b/api/lib/src/models/tool.dart index 6d27c870c225..22e3dd167ec5 100644 --- a/api/lib/src/models/tool.dart +++ b/api/lib/src/models/tool.dart @@ -176,5 +176,10 @@ sealed class Tool with _$Tool { @Default(SurfaceTexture.pattern()) SurfaceTexture texture, }) = TextureTool; + factory Tool.eyeDropper({ + @Default('') String name, + @Default('') String displayIcon, + }) = EyeDropperTool; + factory Tool.fromJson(Map json) => _$ToolFromJson(json); } diff --git a/api/lib/src/models/tool.freezed.dart b/api/lib/src/models/tool.freezed.dart index 02d742281284..2a3e2f325ba6 100644 --- a/api/lib/src/models/tool.freezed.dart +++ b/api/lib/src/models/tool.freezed.dart @@ -54,6 +54,8 @@ Tool _$ToolFromJson(Map json) { return AssetTool.fromJson(json); case 'texture': return TextureTool.fromJson(json); + case 'eyeDropper': + return EyeDropperTool.fromJson(json); default: throw CheckedFromJsonException( @@ -135,6 +137,7 @@ mixin _$Tool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -201,6 +204,7 @@ mixin _$Tool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -267,6 +271,7 @@ mixin _$Tool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) => throw _privateConstructorUsedError; @@ -291,6 +296,7 @@ mixin _$Tool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -314,6 +320,7 @@ mixin _$Tool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -337,6 +344,7 @@ mixin _$Tool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) => throw _privateConstructorUsedError; @@ -533,6 +541,7 @@ class _$SelectToolImpl extends SelectTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return select(name, displayIcon, mode); } @@ -602,6 +611,7 @@ class _$SelectToolImpl extends SelectTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return select?.call(name, displayIcon, mode); } @@ -671,6 +681,7 @@ class _$SelectToolImpl extends SelectTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (select != null) { @@ -701,6 +712,7 @@ class _$SelectToolImpl extends SelectTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return select(this); } @@ -727,6 +739,7 @@ class _$SelectToolImpl extends SelectTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return select?.call(this); } @@ -753,6 +766,7 @@ class _$SelectToolImpl extends SelectTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (select != null) { @@ -929,6 +943,7 @@ class _$HandToolImpl extends HandTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return hand(name, displayIcon); } @@ -998,6 +1013,7 @@ class _$HandToolImpl extends HandTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return hand?.call(name, displayIcon); } @@ -1067,6 +1083,7 @@ class _$HandToolImpl extends HandTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (hand != null) { @@ -1097,6 +1114,7 @@ class _$HandToolImpl extends HandTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return hand(this); } @@ -1123,6 +1141,7 @@ class _$HandToolImpl extends HandTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return hand?.call(this); } @@ -1149,6 +1168,7 @@ class _$HandToolImpl extends HandTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (hand != null) { @@ -1358,6 +1378,7 @@ class _$ImportToolImpl extends ImportTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return import(name, displayIcon, elements, areas); } @@ -1427,6 +1448,7 @@ class _$ImportToolImpl extends ImportTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return import?.call(name, displayIcon, elements, areas); } @@ -1496,6 +1518,7 @@ class _$ImportToolImpl extends ImportTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (import != null) { @@ -1526,6 +1549,7 @@ class _$ImportToolImpl extends ImportTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return import(this); } @@ -1552,6 +1576,7 @@ class _$ImportToolImpl extends ImportTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return import?.call(this); } @@ -1578,6 +1603,7 @@ class _$ImportToolImpl extends ImportTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (import != null) { @@ -1756,6 +1782,7 @@ class _$UndoToolImpl extends UndoTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return undo(name, displayIcon); } @@ -1825,6 +1852,7 @@ class _$UndoToolImpl extends UndoTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return undo?.call(name, displayIcon); } @@ -1894,6 +1922,7 @@ class _$UndoToolImpl extends UndoTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (undo != null) { @@ -1924,6 +1953,7 @@ class _$UndoToolImpl extends UndoTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return undo(this); } @@ -1950,6 +1980,7 @@ class _$UndoToolImpl extends UndoTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return undo?.call(this); } @@ -1976,6 +2007,7 @@ class _$UndoToolImpl extends UndoTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (undo != null) { @@ -2149,6 +2181,7 @@ class _$RedoToolImpl extends RedoTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return redo(name, displayIcon); } @@ -2218,6 +2251,7 @@ class _$RedoToolImpl extends RedoTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return redo?.call(name, displayIcon); } @@ -2287,6 +2321,7 @@ class _$RedoToolImpl extends RedoTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (redo != null) { @@ -2317,6 +2352,7 @@ class _$RedoToolImpl extends RedoTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return redo(this); } @@ -2343,6 +2379,7 @@ class _$RedoToolImpl extends RedoTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return redo?.call(this); } @@ -2369,6 +2406,7 @@ class _$RedoToolImpl extends RedoTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (redo != null) { @@ -2607,6 +2645,7 @@ class _$LabelToolImpl extends LabelTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return label( name, displayIcon, mode, zoomDependent, foreground, styleSheet, scale); @@ -2677,6 +2716,7 @@ class _$LabelToolImpl extends LabelTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return label?.call( name, displayIcon, mode, zoomDependent, foreground, styleSheet, scale); @@ -2747,6 +2787,7 @@ class _$LabelToolImpl extends LabelTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (label != null) { @@ -2778,6 +2819,7 @@ class _$LabelToolImpl extends LabelTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return label(this); } @@ -2804,6 +2846,7 @@ class _$LabelToolImpl extends LabelTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return label?.call(this); } @@ -2830,6 +2873,7 @@ class _$LabelToolImpl extends LabelTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (label != null) { @@ -3039,6 +3083,7 @@ class _$PenToolImpl extends PenTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return pen(name, displayIcon, zoomDependent, property); } @@ -3108,6 +3153,7 @@ class _$PenToolImpl extends PenTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return pen?.call(name, displayIcon, zoomDependent, property); } @@ -3177,6 +3223,7 @@ class _$PenToolImpl extends PenTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (pen != null) { @@ -3207,6 +3254,7 @@ class _$PenToolImpl extends PenTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return pen(this); } @@ -3233,6 +3281,7 @@ class _$PenToolImpl extends PenTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return pen?.call(this); } @@ -3259,6 +3308,7 @@ class _$PenToolImpl extends PenTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (pen != null) { @@ -3448,6 +3498,7 @@ class _$EraserToolImpl extends EraserTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return eraser(name, displayIcon, strokeWidth); } @@ -3517,6 +3568,7 @@ class _$EraserToolImpl extends EraserTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return eraser?.call(name, displayIcon, strokeWidth); } @@ -3586,6 +3638,7 @@ class _$EraserToolImpl extends EraserTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (eraser != null) { @@ -3616,6 +3669,7 @@ class _$EraserToolImpl extends EraserTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return eraser(this); } @@ -3642,6 +3696,7 @@ class _$EraserToolImpl extends EraserTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return eraser?.call(this); } @@ -3668,6 +3723,7 @@ class _$EraserToolImpl extends EraserTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (eraser != null) { @@ -3858,6 +3914,7 @@ class _$PathEraserToolImpl extends PathEraserTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return pathEraser(name, displayIcon, strokeWidth); } @@ -3927,6 +3984,7 @@ class _$PathEraserToolImpl extends PathEraserTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return pathEraser?.call(name, displayIcon, strokeWidth); } @@ -3996,6 +4054,7 @@ class _$PathEraserToolImpl extends PathEraserTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (pathEraser != null) { @@ -4026,6 +4085,7 @@ class _$PathEraserToolImpl extends PathEraserTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return pathEraser(this); } @@ -4052,6 +4112,7 @@ class _$PathEraserToolImpl extends PathEraserTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return pathEraser?.call(this); } @@ -4078,6 +4139,7 @@ class _$PathEraserToolImpl extends PathEraserTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (pathEraser != null) { @@ -4266,6 +4328,7 @@ class _$LayerToolImpl extends LayerTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return layer(name, displayIcon, strokeWidth); } @@ -4335,6 +4398,7 @@ class _$LayerToolImpl extends LayerTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return layer?.call(name, displayIcon, strokeWidth); } @@ -4404,6 +4468,7 @@ class _$LayerToolImpl extends LayerTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (layer != null) { @@ -4434,6 +4499,7 @@ class _$LayerToolImpl extends LayerTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return layer(this); } @@ -4460,6 +4526,7 @@ class _$LayerToolImpl extends LayerTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return layer?.call(this); } @@ -4486,6 +4553,7 @@ class _$LayerToolImpl extends LayerTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (layer != null) { @@ -4707,6 +4775,7 @@ class _$AreaToolImpl extends AreaTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return area(name, displayIcon, constrainedWidth, constrainedHeight, constrainedAspectRatio, askForName); @@ -4777,6 +4846,7 @@ class _$AreaToolImpl extends AreaTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return area?.call(name, displayIcon, constrainedWidth, constrainedHeight, constrainedAspectRatio, askForName); @@ -4847,6 +4917,7 @@ class _$AreaToolImpl extends AreaTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (area != null) { @@ -4878,6 +4949,7 @@ class _$AreaToolImpl extends AreaTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return area(this); } @@ -4904,6 +4976,7 @@ class _$AreaToolImpl extends AreaTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return area?.call(this); } @@ -4930,6 +5003,7 @@ class _$AreaToolImpl extends AreaTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (area != null) { @@ -5157,6 +5231,7 @@ class _$LaserToolImpl extends LaserTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return laser(name, displayIcon, duration, strokeWidth, thinning, color); } @@ -5226,6 +5301,7 @@ class _$LaserToolImpl extends LaserTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return laser?.call( name, displayIcon, duration, strokeWidth, thinning, color); @@ -5296,6 +5372,7 @@ class _$LaserToolImpl extends LaserTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (laser != null) { @@ -5326,6 +5403,7 @@ class _$LaserToolImpl extends LaserTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return laser(this); } @@ -5352,6 +5430,7 @@ class _$LaserToolImpl extends LaserTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return laser?.call(this); } @@ -5378,6 +5457,7 @@ class _$LaserToolImpl extends LaserTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (laser != null) { @@ -5615,6 +5695,7 @@ class _$ShapeToolImpl extends ShapeTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return shape(name, displayIcon, zoomDependent, constrainedWidth, constrainedHeight, constrainedAspectRatio, property); @@ -5685,6 +5766,7 @@ class _$ShapeToolImpl extends ShapeTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return shape?.call(name, displayIcon, zoomDependent, constrainedWidth, constrainedHeight, constrainedAspectRatio, property); @@ -5755,6 +5837,7 @@ class _$ShapeToolImpl extends ShapeTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (shape != null) { @@ -5786,6 +5869,7 @@ class _$ShapeToolImpl extends ShapeTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return shape(this); } @@ -5812,6 +5896,7 @@ class _$ShapeToolImpl extends ShapeTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return shape?.call(this); } @@ -5838,6 +5923,7 @@ class _$ShapeToolImpl extends ShapeTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (shape != null) { @@ -6044,6 +6130,7 @@ class _$StampToolImpl extends StampTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return stamp(name, displayIcon, component); } @@ -6113,6 +6200,7 @@ class _$StampToolImpl extends StampTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return stamp?.call(name, displayIcon, component); } @@ -6182,6 +6270,7 @@ class _$StampToolImpl extends StampTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (stamp != null) { @@ -6212,6 +6301,7 @@ class _$StampToolImpl extends StampTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return stamp(this); } @@ -6238,6 +6328,7 @@ class _$StampToolImpl extends StampTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return stamp?.call(this); } @@ -6264,6 +6355,7 @@ class _$StampToolImpl extends StampTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (stamp != null) { @@ -6443,6 +6535,7 @@ class _$PresentationToolImpl extends PresentationTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return presentation(name, displayIcon); } @@ -6512,6 +6605,7 @@ class _$PresentationToolImpl extends PresentationTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return presentation?.call(name, displayIcon); } @@ -6581,6 +6675,7 @@ class _$PresentationToolImpl extends PresentationTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (presentation != null) { @@ -6611,6 +6706,7 @@ class _$PresentationToolImpl extends PresentationTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return presentation(this); } @@ -6637,6 +6733,7 @@ class _$PresentationToolImpl extends PresentationTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return presentation?.call(this); } @@ -6663,6 +6760,7 @@ class _$PresentationToolImpl extends PresentationTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (presentation != null) { @@ -6848,6 +6946,7 @@ class _$SpacerToolImpl extends SpacerTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return spacer(name, displayIcon, axis); } @@ -6917,6 +7016,7 @@ class _$SpacerToolImpl extends SpacerTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return spacer?.call(name, displayIcon, axis); } @@ -6986,6 +7086,7 @@ class _$SpacerToolImpl extends SpacerTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (spacer != null) { @@ -7016,6 +7117,7 @@ class _$SpacerToolImpl extends SpacerTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return spacer(this); } @@ -7042,6 +7144,7 @@ class _$SpacerToolImpl extends SpacerTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return spacer?.call(this); } @@ -7068,6 +7171,7 @@ class _$SpacerToolImpl extends SpacerTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (spacer != null) { @@ -7247,6 +7351,7 @@ class _$FullScreenToolImpl extends FullScreenTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return fullSceen(name, displayIcon); } @@ -7316,6 +7421,7 @@ class _$FullScreenToolImpl extends FullScreenTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return fullSceen?.call(name, displayIcon); } @@ -7385,6 +7491,7 @@ class _$FullScreenToolImpl extends FullScreenTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (fullSceen != null) { @@ -7415,6 +7522,7 @@ class _$FullScreenToolImpl extends FullScreenTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return fullSceen(this); } @@ -7441,6 +7549,7 @@ class _$FullScreenToolImpl extends FullScreenTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return fullSceen?.call(this); } @@ -7467,6 +7576,7 @@ class _$FullScreenToolImpl extends FullScreenTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (fullSceen != null) { @@ -7652,6 +7762,7 @@ class _$AssetToolImpl extends AssetTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return asset(name, displayIcon, importType); } @@ -7721,6 +7832,7 @@ class _$AssetToolImpl extends AssetTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return asset?.call(name, displayIcon, importType); } @@ -7790,6 +7902,7 @@ class _$AssetToolImpl extends AssetTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (asset != null) { @@ -7820,6 +7933,7 @@ class _$AssetToolImpl extends AssetTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return asset(this); } @@ -7846,6 +7960,7 @@ class _$AssetToolImpl extends AssetTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return asset?.call(this); } @@ -7872,6 +7987,7 @@ class _$AssetToolImpl extends AssetTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (asset != null) { @@ -8113,6 +8229,7 @@ class _$TextureToolImpl extends TextureTool { double constrainedAspectRatio, SurfaceTexture texture) texture, + required TResult Function(String name, String displayIcon) eyeDropper, }) { return texture(name, displayIcon, zoomDependent, constrainedWidth, constrainedHeight, constrainedAspectRatio, this.texture); @@ -8183,6 +8300,7 @@ class _$TextureToolImpl extends TextureTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult? Function(String name, String displayIcon)? eyeDropper, }) { return texture?.call(name, displayIcon, zoomDependent, constrainedWidth, constrainedHeight, constrainedAspectRatio, this.texture); @@ -8253,6 +8371,7 @@ class _$TextureToolImpl extends TextureTool { double constrainedAspectRatio, SurfaceTexture texture)? texture, + TResult Function(String name, String displayIcon)? eyeDropper, required TResult orElse(), }) { if (texture != null) { @@ -8284,6 +8403,7 @@ class _$TextureToolImpl extends TextureTool { required TResult Function(FullScreenTool value) fullSceen, required TResult Function(AssetTool value) asset, required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, }) { return texture(this); } @@ -8310,6 +8430,7 @@ class _$TextureToolImpl extends TextureTool { TResult? Function(FullScreenTool value)? fullSceen, TResult? Function(AssetTool value)? asset, TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, }) { return texture?.call(this); } @@ -8336,6 +8457,7 @@ class _$TextureToolImpl extends TextureTool { TResult Function(FullScreenTool value)? fullSceen, TResult Function(AssetTool value)? asset, TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, required TResult orElse(), }) { if (texture != null) { @@ -8380,3 +8502,405 @@ abstract class TextureTool extends Tool { _$$TextureToolImplCopyWith<_$TextureToolImpl> get copyWith => throw _privateConstructorUsedError; } + +/// @nodoc +abstract class _$$EyeDropperToolImplCopyWith<$Res> + implements $ToolCopyWith<$Res> { + factory _$$EyeDropperToolImplCopyWith(_$EyeDropperToolImpl value, + $Res Function(_$EyeDropperToolImpl) then) = + __$$EyeDropperToolImplCopyWithImpl<$Res>; + @override + @useResult + $Res call({String name, String displayIcon}); +} + +/// @nodoc +class __$$EyeDropperToolImplCopyWithImpl<$Res> + extends _$ToolCopyWithImpl<$Res, _$EyeDropperToolImpl> + implements _$$EyeDropperToolImplCopyWith<$Res> { + __$$EyeDropperToolImplCopyWithImpl( + _$EyeDropperToolImpl _value, $Res Function(_$EyeDropperToolImpl) _then) + : super(_value, _then); + + @pragma('vm:prefer-inline') + @override + $Res call({ + Object? name = null, + Object? displayIcon = null, + }) { + return _then(_$EyeDropperToolImpl( + name: null == name + ? _value.name + : name // ignore: cast_nullable_to_non_nullable + as String, + displayIcon: null == displayIcon + ? _value.displayIcon + : displayIcon // ignore: cast_nullable_to_non_nullable + as String, + )); + } +} + +/// @nodoc +@JsonSerializable() +class _$EyeDropperToolImpl extends EyeDropperTool { + _$EyeDropperToolImpl( + {this.name = '', this.displayIcon = '', final String? $type}) + : $type = $type ?? 'eyeDropper', + super._(); + + factory _$EyeDropperToolImpl.fromJson(Map json) => + _$$EyeDropperToolImplFromJson(json); + + @override + @JsonKey() + final String name; + @override + @JsonKey() + final String displayIcon; + + @JsonKey(name: 'type') + final String $type; + + @override + String toString() { + return 'Tool.eyeDropper(name: $name, displayIcon: $displayIcon)'; + } + + @JsonKey(ignore: true) + @override + @pragma('vm:prefer-inline') + _$$EyeDropperToolImplCopyWith<_$EyeDropperToolImpl> get copyWith => + __$$EyeDropperToolImplCopyWithImpl<_$EyeDropperToolImpl>( + this, _$identity); + + @override + @optionalTypeArgs + TResult when({ + required TResult Function(String name, String displayIcon, SelectMode mode) + select, + required TResult Function(String name, String displayIcon) hand, + required TResult Function(String name, String displayIcon, + List elements, List areas) + import, + required TResult Function(String name, String displayIcon) undo, + required TResult Function(String name, String displayIcon) redo, + required TResult Function( + String name, + String displayIcon, + LabelMode mode, + bool zoomDependent, + int foreground, + PackAssetLocation styleSheet, + double scale) + label, + required TResult Function(String name, String displayIcon, + bool zoomDependent, PenProperty property) + pen, + required TResult Function( + String name, String displayIcon, double strokeWidth) + eraser, + required TResult Function( + String name, String displayIcon, double strokeWidth) + pathEraser, + required TResult Function( + String name, String displayIcon, double strokeWidth) + layer, + required TResult Function( + String name, + String displayIcon, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + bool askForName) + area, + required TResult Function(String name, String displayIcon, double duration, + double strokeWidth, double thinning, int color) + laser, + required TResult Function( + String name, + String displayIcon, + bool zoomDependent, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + ShapeProperty property) + shape, + required TResult Function( + String name, String displayIcon, PackAssetLocation component) + stamp, + required TResult Function(String name, String displayIcon) presentation, + required TResult Function(String name, String displayIcon, Axis2D axis) + spacer, + required TResult Function(String name, String displayIcon) fullSceen, + required TResult Function( + String name, String displayIcon, ImportType importType) + asset, + required TResult Function( + String name, + String displayIcon, + bool zoomDependent, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + SurfaceTexture texture) + texture, + required TResult Function(String name, String displayIcon) eyeDropper, + }) { + return eyeDropper(name, displayIcon); + } + + @override + @optionalTypeArgs + TResult? whenOrNull({ + TResult? Function(String name, String displayIcon, SelectMode mode)? select, + TResult? Function(String name, String displayIcon)? hand, + TResult? Function(String name, String displayIcon, + List elements, List areas)? + import, + TResult? Function(String name, String displayIcon)? undo, + TResult? Function(String name, String displayIcon)? redo, + TResult? Function( + String name, + String displayIcon, + LabelMode mode, + bool zoomDependent, + int foreground, + PackAssetLocation styleSheet, + double scale)? + label, + TResult? Function(String name, String displayIcon, bool zoomDependent, + PenProperty property)? + pen, + TResult? Function(String name, String displayIcon, double strokeWidth)? + eraser, + TResult? Function(String name, String displayIcon, double strokeWidth)? + pathEraser, + TResult? Function(String name, String displayIcon, double strokeWidth)? + layer, + TResult? Function( + String name, + String displayIcon, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + bool askForName)? + area, + TResult? Function(String name, String displayIcon, double duration, + double strokeWidth, double thinning, int color)? + laser, + TResult? Function( + String name, + String displayIcon, + bool zoomDependent, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + ShapeProperty property)? + shape, + TResult? Function( + String name, String displayIcon, PackAssetLocation component)? + stamp, + TResult? Function(String name, String displayIcon)? presentation, + TResult? Function(String name, String displayIcon, Axis2D axis)? spacer, + TResult? Function(String name, String displayIcon)? fullSceen, + TResult? Function(String name, String displayIcon, ImportType importType)? + asset, + TResult? Function( + String name, + String displayIcon, + bool zoomDependent, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + SurfaceTexture texture)? + texture, + TResult? Function(String name, String displayIcon)? eyeDropper, + }) { + return eyeDropper?.call(name, displayIcon); + } + + @override + @optionalTypeArgs + TResult maybeWhen({ + TResult Function(String name, String displayIcon, SelectMode mode)? select, + TResult Function(String name, String displayIcon)? hand, + TResult Function(String name, String displayIcon, List elements, + List areas)? + import, + TResult Function(String name, String displayIcon)? undo, + TResult Function(String name, String displayIcon)? redo, + TResult Function( + String name, + String displayIcon, + LabelMode mode, + bool zoomDependent, + int foreground, + PackAssetLocation styleSheet, + double scale)? + label, + TResult Function(String name, String displayIcon, bool zoomDependent, + PenProperty property)? + pen, + TResult Function(String name, String displayIcon, double strokeWidth)? + eraser, + TResult Function(String name, String displayIcon, double strokeWidth)? + pathEraser, + TResult Function(String name, String displayIcon, double strokeWidth)? + layer, + TResult Function( + String name, + String displayIcon, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + bool askForName)? + area, + TResult Function(String name, String displayIcon, double duration, + double strokeWidth, double thinning, int color)? + laser, + TResult Function( + String name, + String displayIcon, + bool zoomDependent, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + ShapeProperty property)? + shape, + TResult Function( + String name, String displayIcon, PackAssetLocation component)? + stamp, + TResult Function(String name, String displayIcon)? presentation, + TResult Function(String name, String displayIcon, Axis2D axis)? spacer, + TResult Function(String name, String displayIcon)? fullSceen, + TResult Function(String name, String displayIcon, ImportType importType)? + asset, + TResult Function( + String name, + String displayIcon, + bool zoomDependent, + double constrainedWidth, + double constrainedHeight, + double constrainedAspectRatio, + SurfaceTexture texture)? + texture, + TResult Function(String name, String displayIcon)? eyeDropper, + required TResult orElse(), + }) { + if (eyeDropper != null) { + return eyeDropper(name, displayIcon); + } + return orElse(); + } + + @override + @optionalTypeArgs + TResult map({ + required TResult Function(SelectTool value) select, + required TResult Function(HandTool value) hand, + required TResult Function(ImportTool value) import, + required TResult Function(UndoTool value) undo, + required TResult Function(RedoTool value) redo, + required TResult Function(LabelTool value) label, + required TResult Function(PenTool value) pen, + required TResult Function(EraserTool value) eraser, + required TResult Function(PathEraserTool value) pathEraser, + required TResult Function(LayerTool value) layer, + required TResult Function(AreaTool value) area, + required TResult Function(LaserTool value) laser, + required TResult Function(ShapeTool value) shape, + required TResult Function(StampTool value) stamp, + required TResult Function(PresentationTool value) presentation, + required TResult Function(SpacerTool value) spacer, + required TResult Function(FullScreenTool value) fullSceen, + required TResult Function(AssetTool value) asset, + required TResult Function(TextureTool value) texture, + required TResult Function(EyeDropperTool value) eyeDropper, + }) { + return eyeDropper(this); + } + + @override + @optionalTypeArgs + TResult? mapOrNull({ + TResult? Function(SelectTool value)? select, + TResult? Function(HandTool value)? hand, + TResult? Function(ImportTool value)? import, + TResult? Function(UndoTool value)? undo, + TResult? Function(RedoTool value)? redo, + TResult? Function(LabelTool value)? label, + TResult? Function(PenTool value)? pen, + TResult? Function(EraserTool value)? eraser, + TResult? Function(PathEraserTool value)? pathEraser, + TResult? Function(LayerTool value)? layer, + TResult? Function(AreaTool value)? area, + TResult? Function(LaserTool value)? laser, + TResult? Function(ShapeTool value)? shape, + TResult? Function(StampTool value)? stamp, + TResult? Function(PresentationTool value)? presentation, + TResult? Function(SpacerTool value)? spacer, + TResult? Function(FullScreenTool value)? fullSceen, + TResult? Function(AssetTool value)? asset, + TResult? Function(TextureTool value)? texture, + TResult? Function(EyeDropperTool value)? eyeDropper, + }) { + return eyeDropper?.call(this); + } + + @override + @optionalTypeArgs + TResult maybeMap({ + TResult Function(SelectTool value)? select, + TResult Function(HandTool value)? hand, + TResult Function(ImportTool value)? import, + TResult Function(UndoTool value)? undo, + TResult Function(RedoTool value)? redo, + TResult Function(LabelTool value)? label, + TResult Function(PenTool value)? pen, + TResult Function(EraserTool value)? eraser, + TResult Function(PathEraserTool value)? pathEraser, + TResult Function(LayerTool value)? layer, + TResult Function(AreaTool value)? area, + TResult Function(LaserTool value)? laser, + TResult Function(ShapeTool value)? shape, + TResult Function(StampTool value)? stamp, + TResult Function(PresentationTool value)? presentation, + TResult Function(SpacerTool value)? spacer, + TResult Function(FullScreenTool value)? fullSceen, + TResult Function(AssetTool value)? asset, + TResult Function(TextureTool value)? texture, + TResult Function(EyeDropperTool value)? eyeDropper, + required TResult orElse(), + }) { + if (eyeDropper != null) { + return eyeDropper(this); + } + return orElse(); + } + + @override + Map toJson() { + return _$$EyeDropperToolImplToJson( + this, + ); + } +} + +abstract class EyeDropperTool extends Tool { + factory EyeDropperTool({final String name, final String displayIcon}) = + _$EyeDropperToolImpl; + EyeDropperTool._() : super._(); + + factory EyeDropperTool.fromJson(Map json) = + _$EyeDropperToolImpl.fromJson; + + @override + String get name; + @override + String get displayIcon; + @override + @JsonKey(ignore: true) + _$$EyeDropperToolImplCopyWith<_$EyeDropperToolImpl> get copyWith => + throw _privateConstructorUsedError; +} diff --git a/api/lib/src/models/tool.g.dart b/api/lib/src/models/tool.g.dart index 4f1f72a34641..9fff9f1062d5 100644 --- a/api/lib/src/models/tool.g.dart +++ b/api/lib/src/models/tool.g.dart @@ -377,3 +377,18 @@ Map _$$TextureToolImplToJson(_$TextureToolImpl instance) => 'texture': instance.texture.toJson(), 'type': instance.$type, }; + +_$EyeDropperToolImpl _$$EyeDropperToolImplFromJson(Map json) => + _$EyeDropperToolImpl( + name: json['name'] as String? ?? '', + displayIcon: json['displayIcon'] as String? ?? '', + $type: json['type'] as String?, + ); + +Map _$$EyeDropperToolImplToJson( + _$EyeDropperToolImpl instance) => + { + 'name': instance.name, + 'displayIcon': instance.displayIcon, + 'type': instance.$type, + }; diff --git a/app/lib/handlers/eye_dropper.dart b/app/lib/handlers/eye_dropper.dart new file mode 100644 index 000000000000..ef43f7a614ef --- /dev/null +++ b/app/lib/handlers/eye_dropper.dart @@ -0,0 +1,32 @@ +part of 'handler.dart'; + +class EyeDropperHandler extends Handler { + EyeDropperHandler(super.data); + + @override + void onTapUp(TapUpDetails details, EventContext context) async { + final globalPos = + context.getCameraTransform().localToGlobal(details.localPosition); + final state = context.getState(); + if (state == null) return; + final data = await context.getCurrentIndexCubit().render( + state.data, + state.page, + state.info, + width: 1, + height: 1, + x: globalPos.dx, + y: globalPos.dy, + ); + if (data == null) return; + final image = img.Image.fromBytes(width: 1, height: 1, bytes: data.buffer); + final pixel = image.getPixel(0, 0); + final color = pixel.r.toInt() << 24 | + pixel.g.toInt() << 16 | + pixel.b.toInt() << 8 | + pixel.a.toInt(); + Clipboard.setData(ClipboardData( + text: '#${color.toRadixString(16).padLeft(8, '0').toUpperCase()}', + )); + } +} diff --git a/app/lib/handlers/handler.dart b/app/lib/handlers/handler.dart index def8d6ea7b3c..72417ddc5211 100644 --- a/app/lib/handlers/handler.dart +++ b/app/lib/handlers/handler.dart @@ -27,6 +27,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:image/image.dart' as img; import 'package:lw_sysinfo/lw_sysinfo.dart'; import 'package:phosphor_flutter/phosphor_flutter.dart'; import 'package:share_plus/share_plus.dart'; @@ -62,6 +63,7 @@ part 'laser.dart'; part 'layer.dart'; part 'path_eraser.dart'; part 'pen.dart'; +part 'eye_dropper.dart'; part 'presentation.dart'; part 'redo.dart'; part 'select.dart'; @@ -238,6 +240,7 @@ abstract class Handler { fullSceen: (value) => FullScreenHandler(value), texture: (value) => TextureHandler(value), asset: (value) => AssetHandler(value), + eyeDropper: (value) => EyeDropperHandler(value), ); } diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb index 18556314bf0c..757349297a3e 100644 --- a/app/lib/l10n/app_en.arb +++ b/app/lib/l10n/app_en.arb @@ -552,5 +552,6 @@ "stop": "Stop", "refresh": "Refresh", "print": "Print", - "dav": "DAV" + "dav": "DAV", + "eyeDropper": "Eye dropper" } diff --git a/app/lib/visualizer/tool.dart b/app/lib/visualizer/tool.dart index 874e6b1009c5..33e14600c6f2 100644 --- a/app/lib/visualizer/tool.dart +++ b/app/lib/visualizer/tool.dart @@ -35,6 +35,7 @@ extension ToolVisualizer on Tool { presentation: (_) => loc.presentation, fullSceen: (_) => loc.fullScreen, asset: (tool) => tool.importType.getLocalizedName(context), + eyeDropper: (_) => loc.eyeDropper, ); } @@ -73,6 +74,7 @@ extension ToolVisualizer on Tool { presentation: (_) => PhosphorIcons.presentation, fullSceen: (_) => PhosphorIcons.arrowsOut, asset: (tool) => tool.importType.icon, + eyeDropper: (_) => PhosphorIcons.eyedropper, ); List get help { diff --git a/app/pubspec.lock b/app/pubspec.lock index b79f77ef76ed..f93581375146 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -516,10 +516,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: bfc7cc3c75fe1282e8ce2e056d8fd1533f1a6848b65c379b4a5e7a9b623d3371 + sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.0.9" flutter_test: dependency: "direct dev" description: flutter @@ -624,7 +624,7 @@ packages: source: hosted version: "2.3.2" image: - dependency: transitive + dependency: "direct main" description: name: image sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 00d0892cf8b3..54f9f572b430 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: sdk: flutter butterfly_api: path: ../api - flutter_svg: ^2.0.8 + flutter_svg: ^2.0.9 flutter_bloc: ^8.1.3 intl: ^0.18.0 path_provider: ^2.1.1 @@ -81,6 +81,7 @@ dependencies: dynamic_color: ^1.6.8 popover: ^0.2.8+2 markdown: ^7.1.1 + image: ^4.1.3 dev_dependencies: flutter_native_splash: ^2.3.5 #flutter_launcher_icons: ^0.11.0 diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 40c89e210adc..cc555f478a15 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -1511,7 +1511,7 @@ packages: babel-plugin-polyfill-corejs2: 0.4.6(@babel/core@7.23.2) babel-plugin-polyfill-corejs3: 0.8.6(@babel/core@7.23.2) babel-plugin-polyfill-regenerator: 0.5.3(@babel/core@7.23.2) - core-js-compat: 3.33.1 + core-js-compat: 3.33.2 semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -1565,7 +1565,7 @@ packages: resolution: {integrity: sha512-54cIh74Z1rp4oIjsHjqN+WM4fMyCBYe+LpZ9jWm51CZ1fbH3SkAzQD/3XLoNkjbJ7YEmjobLXyvQrFypRHOrXw==} engines: {node: '>=6.9.0'} dependencies: - core-js-pure: 3.33.1 + core-js-pure: 3.33.2 regenerator-runtime: 0.14.0 dev: false @@ -1693,7 +1693,7 @@ packages: combine-promises: 1.2.0 commander: 5.1.0 copy-webpack-plugin: 11.0.0(webpack@5.89.0) - core-js: 3.33.1 + core-js: 3.33.2 css-loader: 6.8.1(webpack@5.89.0) css-minimizer-webpack-plugin: 4.2.2(clean-css@5.3.2)(webpack@5.89.0) cssnano: 5.1.15(postcss@8.4.31) @@ -2133,7 +2133,7 @@ packages: '@docusaurus/utils-validation': 2.4.3(@docusaurus/types@2.4.3)(@swc/core@1.3.95) babel-loader: 8.3.0(@babel/core@7.23.2)(webpack@5.89.0) clsx: 1.2.1 - core-js: 3.33.1 + core-js: 3.33.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) terser-webpack-plugin: 5.3.9(@swc/core@1.3.95)(webpack@5.89.0) @@ -2511,7 +2511,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.5 '@types/istanbul-reports': 3.0.3 - '@types/node': 20.8.9 + '@types/node': 20.8.10 '@types/yargs': 17.0.29 chalk: 4.1.2 dev: false @@ -2986,51 +2986,51 @@ packages: resolution: {integrity: sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==} dependencies: '@types/connect': 3.4.37 - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/bonjour@3.5.12: resolution: {integrity: sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/connect-history-api-fallback@1.5.2: resolution: {integrity: sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==} dependencies: '@types/express-serve-static-core': 4.17.39 - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/connect@3.4.37: resolution: {integrity: sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/eslint-scope@3.7.6: resolution: {integrity: sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==} dependencies: '@types/eslint': 8.44.6 - '@types/estree': 1.0.3 + '@types/estree': 1.0.4 /@types/eslint@8.44.6: resolution: {integrity: sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==} dependencies: - '@types/estree': 1.0.3 + '@types/estree': 1.0.4 '@types/json-schema': 7.0.14 /@types/estree@0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} dev: false - /@types/estree@1.0.3: - resolution: {integrity: sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==} + /@types/estree@1.0.4: + resolution: {integrity: sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==} /@types/express-serve-static-core@4.17.39: resolution: {integrity: sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 '@types/qs': 6.9.9 '@types/range-parser': 1.2.6 '@types/send': 0.17.3 @@ -3065,7 +3065,7 @@ packages: /@types/http-proxy@1.17.13: resolution: {integrity: sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/istanbul-lib-coverage@2.0.5: @@ -3090,7 +3090,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/mdast@3.0.14: @@ -3110,15 +3110,15 @@ packages: /@types/node-forge@1.3.8: resolution: {integrity: sha512-vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/node@17.0.45: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false - /@types/node@20.8.9: - resolution: {integrity: sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==} + /@types/node@20.8.10: + resolution: {integrity: sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==} dependencies: undici-types: 5.26.5 @@ -3175,13 +3175,13 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/responselike@1.0.2: resolution: {integrity: sha512-/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/retry@0.12.0: @@ -3201,7 +3201,7 @@ packages: resolution: {integrity: sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==} dependencies: '@types/mime': 1.3.4 - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/serve-index@1.9.3: @@ -3215,13 +3215,13 @@ packages: dependencies: '@types/http-errors': 2.0.3 '@types/mime': 3.0.3 - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/sockjs@0.3.35: resolution: {integrity: sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/trusted-types@2.0.5: @@ -3235,7 +3235,7 @@ packages: /@types/ws@8.5.8: resolution: {integrity: sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 dev: false /@types/yargs-parser@21.0.2: @@ -3575,7 +3575,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.22.1 - caniuse-lite: 1.0.30001557 + caniuse-lite: 1.0.30001559 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -3653,7 +3653,7 @@ packages: dependencies: '@babel/core': 7.23.2 '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.2) - core-js-compat: 3.33.1 + core-js-compat: 3.33.2 transitivePeerDependencies: - supports-color dev: false @@ -3779,8 +3779,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001557 - electron-to-chromium: 1.4.569 + caniuse-lite: 1.0.30001559 + electron-to-chromium: 1.4.572 node-releases: 2.0.13 update-browserslist-db: 1.0.13(browserslist@4.22.1) @@ -3849,13 +3849,13 @@ packages: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} dependencies: browserslist: 4.22.1 - caniuse-lite: 1.0.30001557 + caniuse-lite: 1.0.30001559 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 dev: false - /caniuse-lite@1.0.30001557: - resolution: {integrity: sha512-91oR7hLNUP3gG6MLU+n96em322a8Xzes8wWdBKhLgUoiJsAF5irZnxSUCbc+qUZXNnPCfUwLOi9ZCZpkvjQajw==} + /caniuse-lite@1.0.30001559: + resolution: {integrity: sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==} /ccount@1.1.0: resolution: {integrity: sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==} @@ -4166,19 +4166,19 @@ packages: webpack: 5.89.0(@swc/core@1.3.95) dev: false - /core-js-compat@3.33.1: - resolution: {integrity: sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==} + /core-js-compat@3.33.2: + resolution: {integrity: sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==} dependencies: browserslist: 4.22.1 dev: false - /core-js-pure@3.33.1: - resolution: {integrity: sha512-wCXGbLjnsP10PlK/thHSQlOLlLKNEkaWbTzVvHHZ79fZNeN1gUmw2gBlpItxPv/pvqldevEXFh/d5stdNvl6EQ==} + /core-js-pure@3.33.2: + resolution: {integrity: sha512-a8zeCdyVk7uF2elKIGz67AjcXOxjRbwOLz8SbklEso1V+2DoW4OkAMZN9S9GBgvZIaqQi/OemFX4OiSoQEmg1Q==} requiresBuild: true dev: false - /core-js@3.33.1: - resolution: {integrity: sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==} + /core-js@3.33.2: + resolution: {integrity: sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==} requiresBuild: true dev: false @@ -4680,8 +4680,8 @@ packages: jake: 10.8.7 dev: false - /electron-to-chromium@1.4.569: - resolution: {integrity: sha512-LsrJjZ0IbVy12ApW3gpYpcmHS3iRxH4bkKOW98y1/D+3cvDUWGcbzbsFinfUS8knpcZk/PG/2p/RnkMCYN7PVg==} + /electron-to-chromium@1.4.572: + resolution: {integrity: sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA==} /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -4877,7 +4877,7 @@ packages: resolution: {integrity: sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==} engines: {node: '>= 0.8'} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 require-like: 0.1.2 dev: false @@ -5579,7 +5579,7 @@ packages: he: 1.2.0 param-case: 3.0.4 relateurl: 0.2.7 - terser: 5.22.0 + terser: 5.24.0 dev: false /html-tags@3.3.1: @@ -6109,7 +6109,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.8.9 + '@types/node': 20.8.10 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -6120,7 +6120,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 merge-stream: 2.0.0 supports-color: 7.2.0 dev: false @@ -6129,7 +6129,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -6137,14 +6137,14 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 20.8.9 + '@types/node': 20.8.10 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false - /jiti@1.20.0: - resolution: {integrity: sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==} + /jiti@1.21.0: + resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true dev: false @@ -7083,7 +7083,7 @@ packages: webpack: ^5.0.0 dependencies: cosmiconfig: 8.3.6(typescript@5.2.2) - jiti: 1.20.0 + jiti: 1.21.0 postcss: 8.4.31 semver: 7.5.4 webpack: 5.89.0(@swc/core@1.3.95) @@ -7500,8 +7500,8 @@ packages: resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} dev: false - /punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} + /punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} /pupa@2.1.1: @@ -8000,7 +8000,7 @@ packages: jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 - terser: 5.22.0 + terser: 5.24.0 dev: false /rollup@2.79.1: @@ -8681,11 +8681,11 @@ packages: jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.1 - terser: 5.22.0 + terser: 5.24.0 webpack: 5.89.0(@swc/core@1.3.95) - /terser@5.22.0: - resolution: {integrity: sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==} + /terser@5.24.0: + resolution: {integrity: sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==} engines: {node: '>=10'} hasBin: true dependencies: @@ -8743,7 +8743,7 @@ packages: /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} dependencies: - punycode: 2.3.0 + punycode: 2.3.1 dev: false /trim-trailing-lines@1.1.4: @@ -9013,7 +9013,7 @@ packages: /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: - punycode: 2.3.0 + punycode: 2.3.1 /url-loader@4.1.1(file-loader@6.2.0)(webpack@5.89.0): resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} @@ -9290,7 +9290,7 @@ packages: optional: true dependencies: '@types/eslint-scope': 3.7.6 - '@types/estree': 1.0.3 + '@types/estree': 1.0.4 '@webassemblyjs/ast': 1.11.6 '@webassemblyjs/wasm-edit': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 diff --git a/fastlane/metadata/android/en-US/changelogs/78.txt b/fastlane/metadata/android/en-US/changelogs/78.txt index 17953603f6d6..f3fd1b7ce6b6 100644 --- a/fastlane/metadata/android/en-US/changelogs/78.txt +++ b/fastlane/metadata/android/en-US/changelogs/78.txt @@ -9,6 +9,7 @@ * Fix folder creation ([#513](https://github.com/LinwoodDev/Butterfly/issues/513)) * Fix locale spacing * Fix pack updating +* Set full screen tool to action tool * Fix saving files in local external directory * Fixing missing saving of pdf quality and platform theme settings