Fix analysis warrnings + bugs

pull/1634/head
Ellet 1 year ago
parent fc0ddbca6a
commit 661f8e8744
  1. 2
      flutter_quill_extensions/lib/embeds/others/camera_button/camera_button.dart
  2. 57
      lib/src/models/themes/quill_icon_theme.dart
  3. 14
      lib/src/widgets/toolbar/buttons/font_family_button.dart
  4. 16
      lib/src/widgets/toolbar/buttons/font_size_button.dart
  5. 15
      lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_buttons.dart

@ -112,7 +112,7 @@ class QuillToolbarCameraButton extends StatelessWidget {
isSelected: false,
// isDesktop(supportWeb: false) ? null :
onPressed: () => _sharedOnPressed(context),
iconTheme: _iconTheme(context),
iconTheme: iconTheme,
);
}

@ -1,3 +1,4 @@
// ignore_for_file: public_member_api_docs, sort_constructors_first
import 'package:flutter/material.dart';
@immutable
@ -16,6 +17,18 @@ class QuillIconTheme {
final IconButtonData? iconButtonUnselectedData;
final IconButtonData? iconButtonSelectedData;
QuillIconTheme copyWith({
IconButtonData? iconButtonUnselectedData,
IconButtonData? iconButtonSelectedData,
}) {
return QuillIconTheme(
iconButtonUnselectedData:
iconButtonUnselectedData ?? this.iconButtonUnselectedData,
iconButtonSelectedData:
iconButtonSelectedData ?? this.iconButtonSelectedData,
);
}
}
@immutable
@ -61,4 +74,48 @@ class IconButtonData {
final ButtonStyle? style;
final bool? isSelected;
final Widget? selectedIcon;
IconButtonData copyWith({
double? iconSize,
VisualDensity? visualDensity,
EdgeInsetsGeometry? padding,
AlignmentGeometry? alignment,
double? splashRadius,
Color? color,
Color? focusColor,
Color? hoverColor,
Color? highlightColor,
Color? splashColor,
Color? disabledColor,
MouseCursor? mouseCursor,
bool? autofocus,
String? tooltip,
bool? enableFeedback,
BoxConstraints? constraints,
ButtonStyle? style,
bool? isSelected,
Widget? selectedIcon,
}) {
return IconButtonData(
iconSize: iconSize ?? this.iconSize,
visualDensity: visualDensity ?? this.visualDensity,
padding: padding ?? this.padding,
alignment: alignment ?? this.alignment,
splashRadius: splashRadius ?? this.splashRadius,
color: color ?? this.color,
focusColor: focusColor ?? this.focusColor,
hoverColor: hoverColor ?? this.hoverColor,
highlightColor: highlightColor ?? this.highlightColor,
splashColor: splashColor ?? this.splashColor,
disabledColor: disabledColor ?? this.disabledColor,
mouseCursor: mouseCursor ?? this.mouseCursor,
autofocus: autofocus ?? this.autofocus,
tooltip: tooltip ?? this.tooltip,
enableFeedback: enableFeedback ?? this.enableFeedback,
constraints: constraints ?? this.constraints,
style: style ?? this.style,
isSelected: isSelected ?? this.isSelected,
selectedIcon: selectedIcon ?? this.selectedIcon,
);
}
}

@ -190,10 +190,16 @@ class QuillToolbarFontFamilyButtonState
child: _buildContent(context),
);
}
return IconButton(
// tooltip: , // TODO: Use this here
visualDensity: VisualDensity.compact,
style: iconTheme?.iconButtonUnselectedStyle,
return QuillToolbarIconButton(
isSelected: false,
iconTheme: iconTheme?.copyWith(
iconButtonSelectedData: const IconButtonData(
visualDensity: VisualDensity.compact,
),
iconButtonUnselectedData: const IconButtonData(
visualDensity: VisualDensity.compact,
),
),
onPressed: _onPressed,
icon: _buildContent(context),
);

@ -1,13 +1,14 @@
import 'package:flutter/material.dart';
import '../../../../extensions.dart';
import '../../../extensions/quill_configurations_ext.dart';
import '../../../l10n/extensions/localizations.dart';
import '../../../models/config/quill_configurations.dart';
import '../../../models/documents/attribute.dart';
import '../../../models/themes/quill_icon_theme.dart';
import '../../../utils/font.dart';
import '../../quill/quill_controller.dart';
import '../base_toolbar.dart';
class QuillToolbarFontSizeButton extends StatefulWidget {
QuillToolbarFontSizeButton({
@ -150,10 +151,17 @@ class QuillToolbarFontSizeButtonState
child: _buildContent(context),
);
}
return IconButton(
return QuillToolbarIconButton(
tooltip: tooltip,
visualDensity: VisualDensity.compact,
style: iconTheme?.iconButtonUnselectedStyle,
isSelected: false,
iconTheme: iconTheme?.copyWith(
iconButtonSelectedData: const IconButtonData(
visualDensity: VisualDensity.compact,
),
iconButtonUnselectedData: const IconButtonData(
visualDensity: VisualDensity.compact,
),
),
onPressed: _onPressed,
icon: _buildContent(context),
);

@ -155,12 +155,17 @@ class QuillToolbarSelectHeaderStyleButtonsState
width: iconSize * iconButtonFactor,
height: iconSize * iconButtonFactor,
),
child: IconButton(
child: QuillToolbarIconButton(
tooltip: tooltip,
visualDensity: VisualDensity.compact,
style: isSelected
? iconTheme?.iconButtonSelectedStyle
: iconTheme?.iconButtonUnselectedStyle,
iconTheme: iconTheme?.copyWith(
iconButtonSelectedData: const IconButtonData(
visualDensity: VisualDensity.compact,
),
iconButtonUnselectedData: const IconButtonData(
visualDensity: VisualDensity.compact,
),
),
isSelected: isSelected,
onPressed: () => _sharedOnPressed(attribute),
icon: Text(
_valueToText[attribute] ??

Loading…
Cancel
Save