New borderRadius for iconTheme (#788)

* Update quill_icon_theme.dart

* Update quill_icon_theme.dart

* Update select_alignment_button.dart

* Update quill_dropdown_button.dart

* Update quill_dropdown_button.dart

* Update quill_icon_button.dart

* Update quill_icon_button.dart

* Update select_header_style_button.dart

* Update quill_icon_button.dart

* Update quill_icon_button.dart

* Update toggle_style_button.dart

* Update video_button.dart

* Update link_style_button.dart

* Update indent_button.dart

* Update image_button.dart

* Update history_button.dart

* Update color_button.dart

* Update clear_format_button.dart

* Update camera_button.dart
pull/791/head
mark8044 3 years ago committed by GitHub
parent 79590923dc
commit d50833cdcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      lib/src/models/themes/quill_icon_theme.dart
  2. 1
      lib/src/widgets/toolbar/camera_button.dart
  3. 1
      lib/src/widgets/toolbar/clear_format_button.dart
  4. 1
      lib/src/widgets/toolbar/color_button.dart
  5. 1
      lib/src/widgets/toolbar/history_button.dart
  6. 1
      lib/src/widgets/toolbar/image_button.dart
  7. 1
      lib/src/widgets/toolbar/indent_button.dart
  8. 1
      lib/src/widgets/toolbar/link_style_button.dart
  9. 5
      lib/src/widgets/toolbar/quill_dropdown_button.dart
  10. 4
      lib/src/widgets/toolbar/quill_icon_button.dart
  11. 2
      lib/src/widgets/toolbar/select_alignment_button.dart
  12. 2
      lib/src/widgets/toolbar/select_header_style_button.dart
  13. 1
      lib/src/widgets/toolbar/toggle_style_button.dart
  14. 1
      lib/src/widgets/toolbar/video_button.dart

@ -8,6 +8,7 @@ class QuillIconTheme {
this.iconUnselectedFillColor,
this.disabledIconColor,
this.disabledIconFillColor,
this.borderRadius
});
///The color to use for selected icons in the toolbar
@ -27,4 +28,7 @@ class QuillIconTheme {
///The fill color to use for disabled icons in the toolbar
final Color? disabledIconFillColor;
///The borderRadius for icons
final double? borderRadius;
}

@ -53,6 +53,7 @@ class CameraButton extends StatelessWidget {
hoverElevation: 0,
size: iconSize * 1.77,
fillColor: iconFillColor,
borderRadius: iconTheme?.borderRadius ?? 2,
onPressed: () => _handleCameraButtonTap(context, controller,
onImagePickCallback: onImagePickCallback,
onVideoPickCallback: onVideoPickCallback,

@ -36,6 +36,7 @@ class _ClearFormatButtonState extends State<ClearFormatButton> {
size: widget.iconSize * kIconButtonFactor,
icon: Icon(widget.icon, size: widget.iconSize, color: iconColor),
fillColor: fillColor,
borderRadius: widget.iconTheme?.borderRadius ?? 2,
onPressed: () {
final attrs = <Attribute>{};
for (final style in widget.controller.getAllSelectionStyles()) {

@ -124,6 +124,7 @@ class _ColorButtonState extends State<ColorButton> {
size: widget.iconSize,
color: widget.background ? iconColorBackground : iconColor),
fillColor: widget.background ? fillColorBackground : fillColor,
borderRadius: widget.iconTheme?.borderRadius ?? 2,
onPressed: _showColorPicker,
);
}

@ -42,6 +42,7 @@ class _HistoryButtonState extends State<HistoryButton> {
size: widget.iconSize * 1.77,
icon: Icon(widget.icon, size: widget.iconSize, color: _iconColor),
fillColor: fillColor,
borderRadius: widget.iconTheme?.borderRadius ?? 2,
onPressed: _changeHistory,
);
}

@ -55,6 +55,7 @@ class ImageButton extends StatelessWidget {
hoverElevation: 0,
size: iconSize * 1.77,
fillColor: iconFillColor,
borderRadius: iconTheme?.borderRadius ?? 2,
onPressed: () => _onPressedHandler(context),
);
}

@ -38,6 +38,7 @@ class _IndentButtonState extends State<IndentButton> {
size: widget.iconSize * 1.77,
icon: Icon(widget.icon, size: widget.iconSize, color: iconColor),
fillColor: iconFillColor,
borderRadius: widget.iconTheme?.borderRadius ?? 2,
onPressed: () {
final indent = widget.controller
.getSelectionStyle()

@ -91,6 +91,7 @@ class _LinkStyleButtonState extends State<LinkStyleButton> {
),
fillColor:
widget.iconTheme?.iconUnselectedFillColor ?? theme.canvasColor,
borderRadius: widget.iconTheme?.borderRadius ?? 2,
onPressed: pressedHandler,
),
),

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import '../../models/themes/quill_icon_theme.dart';
@Deprecated('Not being used')
class QuillDropdownButton<T> extends StatefulWidget {
@ -11,6 +12,7 @@ class QuillDropdownButton<T> extends StatefulWidget {
this.fillColor,
this.hoverElevation = 1,
this.highlightElevation = 1,
this.iconTheme,
Key? key,
}) : super(key: key);
@ -22,6 +24,7 @@ class QuillDropdownButton<T> extends StatefulWidget {
final T initialValue;
final List<PopupMenuEntry<T>> items;
final ValueChanged<T> onSelected;
final QuillIconTheme? iconTheme;
@override
_QuillDropdownButtonState<T> createState() => _QuillDropdownButtonState<T>();
@ -35,7 +38,7 @@ class _QuillDropdownButtonState<T> extends State<QuillDropdownButton<T>> {
constraints: BoxConstraints.tightFor(height: widget.height),
child: RawMaterialButton(
visualDensity: VisualDensity.compact,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(2)),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(widget.iconTheme?.borderRadius ?? 2)),
fillColor: widget.fillColor,
elevation: 0,
hoverElevation: widget.hoverElevation,

@ -8,6 +8,7 @@ class QuillIconButton extends StatelessWidget {
this.fillColor,
this.hoverElevation = 1,
this.highlightElevation = 1,
this.borderRadius = 2,
Key? key,
}) : super(key: key);
@ -17,6 +18,7 @@ class QuillIconButton extends StatelessWidget {
final Color? fillColor;
final double hoverElevation;
final double highlightElevation;
final double borderRadius;
@override
Widget build(BuildContext context) {
@ -24,7 +26,7 @@ class QuillIconButton extends StatelessWidget {
constraints: BoxConstraints.tightFor(width: size, height: size),
child: RawMaterialButton(
visualDensity: VisualDensity.compact,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(2)),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(borderRadius)),
fillColor: fillColor,
elevation: 0,
hoverElevation: hoverElevation,

@ -97,7 +97,7 @@ class _SelectAlignmentButtonState extends State<SelectAlignmentButton> {
elevation: 0,
visualDensity: VisualDensity.compact,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(2)),
borderRadius: BorderRadius.circular(widget.iconTheme?.borderRadius ?? 2)),
fillColor: _valueToText[_value] == _valueString[index]
? (widget.iconTheme?.iconSelectedFillColor ??
theme.toggleableActiveColor)

@ -79,7 +79,7 @@ class _SelectHeaderStyleButtonState extends State<SelectHeaderStyleButton> {
elevation: 0,
visualDensity: VisualDensity.compact,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(2)),
borderRadius: BorderRadius.circular(widget.iconTheme?.borderRadius ?? 2)),
fillColor: _valueToText[_value] == _valueString[index]
? (widget.iconTheme?.iconSelectedFillColor ??
theme.toggleableActiveColor)

@ -145,5 +145,6 @@ Widget defaultToggleStyleButtonBuilder(
icon: Icon(icon, size: iconSize, color: iconColor),
fillColor: fill,
onPressed: onPressed,
borderRadius: iconTheme?.borderRadius ?? 2,
);
}

@ -55,6 +55,7 @@ class VideoButton extends StatelessWidget {
hoverElevation: 0,
size: iconSize * 1.77,
fillColor: iconFillColor,
borderRadius: iconTheme?.borderRadius ?? 2,
onPressed: () => _onPressedHandler(context),
);
}

Loading…
Cancel
Save