Merge pull request #1507 from LucasXu0/remove_svg_function

Remove svg function
This commit is contained in:
Lucas.Xu 2022-11-30 13:44:41 +08:00 committed by GitHub
commit 5adf3139ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 20 deletions

View File

@ -20,7 +20,7 @@ class NewAppButton extends StatelessWidget {
hoverColor: Colors.transparent,
fontColor: Theme.of(context).colorScheme.onSurfaceVariant,
onPressed: () async => await _showCreateAppDialog(context),
heading: svgWithSize("home/new_app", const Size(16, 16)),
heading: svgWidget("home/new_app", size: const Size(16, 16)),
padding: EdgeInsets.symmetric(horizontal: Insets.l, vertical: 20),
);

View File

@ -207,8 +207,8 @@ class MenuTopBar extends StatelessWidget {
return Container();
}
return (Theme.of(context).brightness == Brightness.dark
? svgWithSize("flowy_logo_dark_mode", const Size(92, 17))
: svgWithSize("flowy_logo_with_text", const Size(92, 17)));
? svgWidget("flowy_logo_dark_mode", size: const Size(92, 17))
: svgWidget("flowy_logo_with_text", size: const Size(92, 17)));
}
@override

View File

@ -118,7 +118,7 @@ class _CurrentIcon extends StatelessWidget {
margin: const EdgeInsets.all(5.0),
decoration:
BoxDecoration(border: Border.all(color: Colors.grey)),
child: svgWithSize('emoji/$iconUrl', const Size(60, 60)),
child: svgWidget('emoji/$iconUrl', size: const Size(60, 60)),
)),
])),
);

View File

@ -83,7 +83,6 @@ class _CheckboxNodeWidgetState extends State<CheckboxNodeWidget>
children: [
GestureDetector(
key: iconKey,
child: icon,
behavior: HitTestBehavior.opaque,
onTap: () async {
await widget.editorState.formatTextToCheckbox(
@ -92,6 +91,7 @@ class _CheckboxNodeWidgetState extends State<CheckboxNodeWidget>
textNode: widget.textNode,
);
},
child: icon,
),
Flexible(
child: FlowyRichText(

View File

@ -1,26 +1,13 @@
import 'package:flutter/widgets.dart';
import 'package:flutter_svg/flutter_svg.dart';
Widget svgWithSize(String name, Size size) {
return SizedBox.fromSize(
size: size,
child: svgWidget(name),
);
}
Widget svgWidget(String name, {Size? size, Color? color}) {
if (size != null) {
return SizedBox.fromSize(
size: size,
child: _svgWidget(name, color: color),
child: SvgPicture.asset('assets/images/$name.svg', color: color),
);
} else {
return _svgWidget(name, color: color);
return SvgPicture.asset('assets/images/$name.svg', color: color);
}
}
Widget _svgWidget(String name, {Color? color}) {
final Widget svg = SvgPicture.asset('assets/images/$name.svg', color: color);
return svg;
}