Skip to content

Add bottomPadding override parameter #65

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

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

Add bottomPadding override parameter #65

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07de963
Add bottomPadding override parameter
Sep 25, 2023
fb68ca0
Add iconColor to allow custom themes
Sep 27, 2023
79f682b
Merge branch 'main' into feature_configure_bottom_padding
MBjoern Nov 17, 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
42 changes: 37 additions & 5 deletions lib/src/_paint_over_image.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class ImagePainter extends StatefulWidget {
this.onPaintModeChanged,
this.textDelegate,
this.showControls = true,
this.bottomPadding,
this.iconColor,
this.controlsBackgroundColor,
this.optionSelectedColor,
this.optionUnselectedColor,
Expand Down Expand Up @@ -76,6 +78,8 @@ class ImagePainter extends StatefulWidget {
TextDelegate? textDelegate,
bool? controlsAtTop,
bool? showControls,
double? bottomPadding,
Color? iconColor,
Color? controlsBackgroundColor,
Color? selectedColor,
Color? unselectedColor,
Expand Down Expand Up @@ -104,6 +108,8 @@ class ImagePainter extends StatefulWidget {
textDelegate: textDelegate,
controlsAtTop: controlsAtTop ?? true,
showControls: showControls ?? true,
bottomPadding: bottomPadding,
iconColor: iconColor,
controlsBackgroundColor: controlsBackgroundColor,
optionSelectedColor: selectedColor,
optionUnselectedColor: unselectedColor,
Expand Down Expand Up @@ -135,6 +141,8 @@ class ImagePainter extends StatefulWidget {
TextDelegate? textDelegate,
bool? controlsAtTop,
bool? showControls,
double? bottomPadding,
Color? iconColor,
Color? controlsBackgroundColor,
Color? selectedColor,
Color? unselectedColor,
Expand Down Expand Up @@ -163,6 +171,8 @@ class ImagePainter extends StatefulWidget {
textDelegate: textDelegate,
controlsAtTop: controlsAtTop ?? true,
showControls: showControls ?? true,
bottomPadding: bottomPadding,
iconColor: iconColor,
controlsBackgroundColor: controlsBackgroundColor,
optionSelectedColor: selectedColor,
optionUnselectedColor: unselectedColor,
Expand Down Expand Up @@ -194,6 +204,8 @@ class ImagePainter extends StatefulWidget {
TextDelegate? textDelegate,
bool? controlsAtTop,
bool? showControls,
double? bottomPadding,
Color? iconColor,
Color? controlsBackgroundColor,
Color? selectedColor,
Color? unselectedColor,
Expand Down Expand Up @@ -222,6 +234,8 @@ class ImagePainter extends StatefulWidget {
textDelegate: textDelegate,
controlsAtTop: controlsAtTop ?? true,
showControls: showControls ?? true,
bottomPadding: bottomPadding,
iconColor: iconColor,
controlsBackgroundColor: controlsBackgroundColor,
optionSelectedColor: selectedColor,
optionUnselectedColor: unselectedColor,
Expand Down Expand Up @@ -253,6 +267,8 @@ class ImagePainter extends StatefulWidget {
TextDelegate? textDelegate,
bool? controlsAtTop,
bool? showControls,
double? bottomPadding,
Color? iconColor,
Color? controlsBackgroundColor,
Color? selectedColor,
Color? unselectedColor,
Expand Down Expand Up @@ -281,6 +297,8 @@ class ImagePainter extends StatefulWidget {
textDelegate: textDelegate,
controlsAtTop: controlsAtTop ?? true,
showControls: showControls ?? true,
bottomPadding: bottomPadding,
iconColor: iconColor,
controlsBackgroundColor: controlsBackgroundColor,
optionSelectedColor: selectedColor,
optionUnselectedColor: unselectedColor,
Expand All @@ -307,6 +325,8 @@ class ImagePainter extends StatefulWidget {
TextDelegate? textDelegate,
bool? controlsAtTop,
bool? showControls,
double? bottomPadding,
Color? iconColor,
Color? controlsBackgroundColor,
Color? selectedColor,
Color? unselectedColor,
Expand All @@ -332,6 +352,8 @@ class ImagePainter extends StatefulWidget {
textDelegate: textDelegate,
controlsAtTop: controlsAtTop ?? true,
showControls: showControls ?? true,
bottomPadding: bottomPadding,
iconColor: iconColor,
controlsBackgroundColor: controlsBackgroundColor,
optionSelectedColor: selectedColor,
optionUnselectedColor: unselectedColor,
Expand Down Expand Up @@ -412,6 +434,11 @@ class ImagePainter extends StatefulWidget {
///It will control displaying the Control Bar
final bool showControls;

///sets the bottom padding if set, else MediaQuery.padding.bottom is used
final double? bottomPadding;

final Color? iconColor;

final Color? controlsBackgroundColor;

final Color? optionSelectedColor;
Expand Down Expand Up @@ -439,6 +466,7 @@ class ImagePainterState extends State<ImagePainter> {

int _strokeMultiplier = 1;
late TextDelegate textDelegate;

@override
void initState() {
super.initState();
Expand Down Expand Up @@ -603,7 +631,10 @@ class ImagePainterState extends State<ImagePainter> {
),
),
if (!widget.controlsAtTop && widget.showControls) _buildControls(),
SizedBox(height: MediaQuery.of(context).padding.bottom)
SizedBox(
height:
widget.bottomPadding ?? MediaQuery.of(context).padding.bottom,
)
],
),
);
Expand Down Expand Up @@ -926,8 +957,8 @@ class ImagePainterState extends State<ImagePainter> {
shape: ContinuousRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
icon:
widget.brushIcon ?? Icon(Icons.brush, color: Colors.grey[700]),
icon: widget.brushIcon ??
Icon(Icons.brush, color: widget.iconColor ?? Colors.grey[700]),
itemBuilder: (_) => [_showRangeSlider()],
),
AnimatedBuilder(
Expand Down Expand Up @@ -956,7 +987,8 @@ class ImagePainterState extends State<ImagePainter> {
const Spacer(),
IconButton(
tooltip: textDelegate.undo,
icon: widget.undoIcon ?? Icon(Icons.reply, color: Colors.grey[700]),
icon: widget.undoIcon ??
Icon(Icons.reply, color: widget.iconColor ?? Colors.grey[700]),
onPressed: () {
widget.onUndo?.call();
_controller.undo();
Expand All @@ -965,7 +997,7 @@ class ImagePainterState extends State<ImagePainter> {
IconButton(
tooltip: textDelegate.clearAllProgress,
icon: widget.clearAllIcon ??
Icon(Icons.clear, color: Colors.grey[700]),
Icon(Icons.clear, color: widget.iconColor ?? Colors.grey[700]),
onPressed: () {
widget.onClear?.call();
_controller.clear();
Expand Down