Browse Source

[feat] improve svg widget api (#3205)

* feat: change api

* fix: api upgrade errors
Alex Wallen 2 years ago
parent
commit
00ee4be723

+ 0 - 1
frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_user.dart

@@ -86,7 +86,6 @@ class SidebarUser extends StatelessWidget {
           backgroundColor: Colors.transparent,
           backgroundColor: Colors.transparent,
           child: FlowySvg(
           child: FlowySvg(
             FlowySvgData('emoji/$iconUrl'),
             FlowySvgData('emoji/$iconUrl'),
-            overrideColor: false,
           ),
           ),
         ),
         ),
       ),
       ),

+ 1 - 2
frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dart

@@ -318,7 +318,6 @@ class _CurrentIcon extends StatelessWidget {
             child: FlowySvg(
             child: FlowySvg(
               FlowySvgData('emoji/$iconUrl'),
               FlowySvgData('emoji/$iconUrl'),
               size: _iconSize,
               size: _iconSize,
-              overrideColor: false,
             ),
             ),
           ),
           ),
         ),
         ),
@@ -389,7 +388,7 @@ class IconOption extends StatelessWidget {
       borderRadius: Corners.s6Border,
       borderRadius: Corners.s6Border,
       hoverColor: Theme.of(context).colorScheme.tertiaryContainer,
       hoverColor: Theme.of(context).colorScheme.tertiaryContainer,
       onTap: () => setIcon(iconUrl),
       onTap: () => setIcon(iconUrl),
-      child: FlowySvg(emoji, size: _iconSize, overrideColor: false),
+      child: FlowySvg(emoji, size: _iconSize),
     );
     );
   }
   }
 }
 }

+ 4 - 4
frontend/appflowy_flutter/packages/flowy_svg/lib/src/flowy_svg.dart

@@ -22,7 +22,7 @@ class FlowySvg extends StatelessWidget {
     super.key,
     super.key,
     this.size,
     this.size,
     this.color,
     this.color,
-    this.overrideColor = true,
+    this.blendMode = BlendMode.srcIn,
   });
   });
 
 
   /// The data for the flowy svg. Will be generated by the generator in this
   /// The data for the flowy svg. Will be generated by the generator in this
@@ -39,7 +39,7 @@ class FlowySvg extends StatelessWidget {
   ///
   ///
   /// Defaults to true
   /// Defaults to true
   ///
   ///
-  final bool overrideColor;
+  final BlendMode blendMode;
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
@@ -47,8 +47,8 @@ class FlowySvg extends StatelessWidget {
 
 
     final child = SvgPicture.asset(
     final child = SvgPicture.asset(
       _normalized(),
       _normalized(),
-      colorFilter: iconColor != null && overrideColor
-          ? ColorFilter.mode(iconColor, BlendMode.srcIn)
+      colorFilter:
+          iconColor != null ? ColorFilter.mode(iconColor, blendMode)
           : null,
           : null,
     );
     );