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.

Sign up for GitHub

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

Added borderColor #58

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added borderColor #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebd0015
Added borderColor
vinicioshenriques Jan 5, 2022
140eb1e
Merge remote-tracking branch 'upstream/main' into add_bordinha
luciano-cervantes Jan 24, 2023
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
16 changes: 16 additions & 0 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class _CropSampleState extends State<CropSample> {
}

var _isSumbnail = false;
var _useBorders = false;
var _isCropping = false;
var _isCircleUi = false;
Uint8List? _croppedData;
Expand Down Expand Up @@ -117,6 +118,7 @@ class _CropSampleState extends State<CropSample> {
children: [
if (_imageDataList.isNotEmpty) ...[
Crop(
borderColor: _useBorders ? Colors.black : null,
controller: _cropController,
image: _imageDataList[_currentImage],
onCropped: (croppedData) {
Expand Down Expand Up @@ -166,6 +168,20 @@ class _CropSampleState extends State<CropSample> {
),
),
],
Positioned(
right: 16,
bottom: 60,
child: GestureDetector(
onTap: () => setState(() => _useBorders = !_useBorders),
child: CircleAvatar(
backgroundColor:
_useBorders ? Colors.blue.shade50 : Colors.blue,
child: Center(
child: Icon(Icons.border_outer_rounded),
),
),
),
),
Positioned(
right: 16,
bottom: 16,
Expand Down
120 changes: 56 additions & 64 deletions lib/src/crop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ part of crop_your_image;

const dotTotalSize = 32.0; // fixed corner dot size.

typedef CornerDotBuilder = Widget Function(
double size, EdgeAlignment edgeAlignment);
typedef CornerDotBuilder = Widget Function(double size, EdgeAlignment edgeAlignment);

typedef CroppingAreaBuilder = Rect Function(Rect imageRect);

Expand Down Expand Up @@ -76,6 +75,12 @@ class Crop extends StatelessWidget {
/// If default dot Widget with different color is needed, [DotControl] is available.
final CornerDotBuilder? cornerDotBuilder;

/// [Color] of the image border
/// When [borderColor] is set, a border with the given color is added to the
/// image exterior, making it better to see the image ending when
/// the [baseColor] and the image background are similar
final Color? borderColor;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we accept Border, not only Color?
It enables users to decide other configurations, such as width.


/// If [true], cropping area is fixed and CANNOT be moved.
/// [false] by default.
final bool fixArea;
Expand Down Expand Up @@ -105,11 +110,11 @@ class Crop extends StatelessWidget {
this.baseColor = Colors.white,
this.radius = 0,
this.cornerDotBuilder,
this.borderColor,
this.fixArea = false,
this.progressIndicator = const SizedBox.shrink(),
this.interactive = false,
}) : assert((initialSize ?? 1.0) <= 1.0,
'initialSize must be less than 1.0, or null meaning not specified.'),
}) : assert((initialSize ?? 1.0) <= 1.0, 'initialSize must be less than 1.0, or null meaning not specified.'),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you format the code so that unrelated changes are not included in this PR?

super(key: key);

@override
Expand All @@ -136,6 +141,7 @@ class Crop extends StatelessWidget {
baseColor: baseColor,
radius: radius,
cornerDotBuilder: cornerDotBuilder,
borderColor: borderColor,
fixArea: fixArea,
progressIndicator: progressIndicator,
interactive: interactive,
Expand All @@ -161,6 +167,7 @@ class _CropEditor extends StatefulWidget {
final Color baseColor;
final double radius;
final CornerDotBuilder? cornerDotBuilder;
final Color? borderColor;
final bool fixArea;
final Widget progressIndicator;
final bool interactive;
Expand All @@ -181,6 +188,7 @@ class _CropEditor extends StatefulWidget {
required this.baseColor,
required this.radius,
this.cornerDotBuilder,
this.borderColor,
required this.fixArea,
required this.progressIndicator,
required this.interactive,
Expand All @@ -203,9 +211,7 @@ class _CropEditorState extends State<_CropEditor> {

bool get _isImageLoading => _lastComputed != null;

_Calculator get calculator => _isFitVertically
? const _VerticalCalculator()
: const _HorizontalCalculator();
_Calculator get calculator => _isFitVertically ? const _VerticalCalculator() : const _HorizontalCalculator();

set rect(Rect newRect) {
setState(() {
Expand Down Expand Up @@ -270,25 +276,17 @@ class _CropEditorState extends State<_CropEditor> {

// width
final newWidth = baseWidth * nextScale;
final horizontalFocalPointBias = focalPoint == null
? 0.5
: (focalPoint.dx - _imageRect.left) / _imageRect.width;
final leftPositionDelta =
(newWidth - _imageRect.width) * horizontalFocalPointBias;
final horizontalFocalPointBias = focalPoint == null ? 0.5 : (focalPoint.dx - _imageRect.left) / _imageRect.width;
final leftPositionDelta = (newWidth - _imageRect.width) * horizontalFocalPointBias;

// height
final newHeight = baseHeight * nextScale;
final verticalFocalPointBias = focalPoint == null
? 0.5
: (focalPoint.dy - _imageRect.top) / _imageRect.height;
final topPositionDelta =
(newHeight - _imageRect.height) * verticalFocalPointBias;
final verticalFocalPointBias = focalPoint == null ? 0.5 : (focalPoint.dy - _imageRect.top) / _imageRect.height;
final topPositionDelta = (newHeight - _imageRect.height) * verticalFocalPointBias;

// position
final newLeft = max(min(_rect.left, _imageRect.left - leftPositionDelta),
_rect.right - newWidth);
final newTop = max(min(_rect.top, _imageRect.top - topPositionDelta),
_rect.bottom - newHeight);
final newLeft = max(min(_rect.left, _imageRect.left - leftPositionDelta), _rect.right - newWidth);
final newTop = max(min(_rect.top, _imageRect.top - topPositionDelta), _rect.bottom - newHeight);

if (newWidth < _rect.width || newHeight < _rect.height) {
return;
Expand Down Expand Up @@ -456,36 +454,42 @@ class _CropEditorState extends State<_CropEditor> {
child: GestureDetector(
onScaleStart: widget.interactive ? _startScale : null,
onScaleUpdate: widget.interactive ? _updateScale : null,
child: Container(
color: widget.baseColor,
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Stack(
children: [
Positioned(
left: _imageRect.left,
top: _imageRect.top,
child: Image.memory(
widget.image,
width: _isFitVertically
? null
: MediaQuery.of(context).size.width * _scale,
height: _isFitVertically
? MediaQuery.of(context).size.height * _scale
: null,
fit: BoxFit.contain,
child: Flex(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need Flex? It seems children always has only one child and Flex is not necessary.

direction: _isFitVertically ? Axis.vertical : Axis.horizontal,
children: [
Expanded(
child: Container(
foregroundDecoration: (widget.borderColor != null && widget.maskColor == null)
? BoxDecoration(
border: Border.all(color: widget.borderColor!, width: 2),
)
: null,
color: widget.baseColor,
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Stack(
children: [
Positioned(
left: _imageRect.left,
top: _imageRect.top,
child: Image.memory(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the border decoration should come here. Otherwise, as long as checking the example app, the border comes to the boundary of Crop, not the image.

widget.image,
width: _isFitVertically ? null : MediaQuery.of(context).size.width * _scale,
height: _isFitVertically ? MediaQuery.of(context).size.height * _scale : null,
fit: BoxFit.contain,
),
),
],
),
),
],
),
)
],
),
),
),
IgnorePointer(
child: ClipPath(
clipper: _withCircleUi
? _CircleCropAreaClipper(_rect)
: _CropAreaClipper(_rect, widget.radius),
clipper: _withCircleUi ? _CircleCropAreaClipper(_rect) : _CropAreaClipper(_rect, widget.radius),
child: Container(
width: double.infinity,
height: double.infinity,
Expand Down Expand Up @@ -528,9 +532,7 @@ class _CropEditorState extends State<_CropEditor> {
_aspectRatio,
);
},
child: widget.cornerDotBuilder
?.call(dotTotalSize, EdgeAlignment.topLeft) ??
const DotControl(),
child: widget.cornerDotBuilder?.call(dotTotalSize, EdgeAlignment.topLeft) ?? const DotControl(),
),
),
Positioned(
Expand All @@ -548,9 +550,7 @@ class _CropEditorState extends State<_CropEditor> {
_aspectRatio,
);
},
child: widget.cornerDotBuilder
?.call(dotTotalSize, EdgeAlignment.topRight) ??
const DotControl(),
child: widget.cornerDotBuilder?.call(dotTotalSize, EdgeAlignment.topRight) ?? const DotControl(),
),
),
Positioned(
Expand All @@ -568,9 +568,7 @@ class _CropEditorState extends State<_CropEditor> {
_aspectRatio,
);
},
child: widget.cornerDotBuilder
?.call(dotTotalSize, EdgeAlignment.bottomLeft) ??
const DotControl(),
child: widget.cornerDotBuilder?.call(dotTotalSize, EdgeAlignment.bottomLeft) ?? const DotControl(),
),
),
Positioned(
Expand All @@ -588,9 +586,7 @@ class _CropEditorState extends State<_CropEditor> {
_aspectRatio,
);
},
child: widget.cornerDotBuilder
?.call(dotTotalSize, EdgeAlignment.bottomRight) ??
const DotControl(),
child: widget.cornerDotBuilder?.call(dotTotalSize, EdgeAlignment.bottomRight) ?? const DotControl(),
),
),
],
Expand All @@ -610,17 +606,13 @@ class _CropAreaClipper extends CustomClipper<Path> {
..addPath(
Path()
..moveTo(rect.left, rect.top + radius)
..arcToPoint(Offset(rect.left + radius, rect.top),
radius: Radius.circular(radius))
..arcToPoint(Offset(rect.left + radius, rect.top), radius: Radius.circular(radius))
..lineTo(rect.right - radius, rect.top)
..arcToPoint(Offset(rect.right, rect.top + radius),
radius: Radius.circular(radius))
..arcToPoint(Offset(rect.right, rect.top + radius), radius: Radius.circular(radius))
..lineTo(rect.right, rect.bottom - radius)
..arcToPoint(Offset(rect.right - radius, rect.bottom),
radius: Radius.circular(radius))
..arcToPoint(Offset(rect.right - radius, rect.bottom), radius: Radius.circular(radius))
..lineTo(rect.left + radius, rect.bottom)
..arcToPoint(Offset(rect.left, rect.bottom - radius),
radius: Radius.circular(radius))
..arcToPoint(Offset(rect.left, rect.bottom - radius), radius: Radius.circular(radius))
..close(),
Offset.zero,
)
Expand Down