Refactor icon color opacity handling and update example icons

Author: bennajah

example/lib/icons.dart

@@ -348,6 +348,7 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.solidChartBar, 'solidChartBar'),
   ExampleIcon(FontAwesomeIcons.chartBar, 'chartBar'),
   ExampleIcon(FontAwesomeIcons.chartColumn, 'chartColumn'),
+  ExampleIcon(FontAwesomeIcons.chartDiagram, 'chartDiagram'),
   ExampleIcon(FontAwesomeIcons.chartGantt, 'chartGantt'),
   ExampleIcon(FontAwesomeIcons.chartLine, 'chartLine'),
   ExampleIcon(FontAwesomeIcons.chartPie, 'chartPie'),
@@ -476,6 +477,7 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.solidCommentDots, 'solidCommentDots'),
   ExampleIcon(FontAwesomeIcons.commentDots, 'commentDots'),
   ExampleIcon(FontAwesomeIcons.commentMedical, 'commentMedical'),
+  ExampleIcon(FontAwesomeIcons.commentNodes, 'commentNodes'),
   ExampleIcon(FontAwesomeIcons.commentSlash, 'commentSlash'),
   ExampleIcon(FontAwesomeIcons.commentSms, 'commentSms'),
   ExampleIcon(FontAwesomeIcons.solidComments, 'solidComments'),
@@ -528,6 +530,7 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.crown, 'crown'),
   ExampleIcon(FontAwesomeIcons.crutch, 'crutch'),
   ExampleIcon(FontAwesomeIcons.cruzeiroSign, 'cruzeiroSign'),
+  ExampleIcon(FontAwesomeIcons.css, 'css'),
   ExampleIcon(FontAwesomeIcons.css3, 'css3'),
   ExampleIcon(FontAwesomeIcons.css3Alt, 'css3Alt'),
   ExampleIcon(FontAwesomeIcons.cube, 'cube'),
@@ -764,6 +767,8 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.solidFileExcel, 'solidFileExcel'),
   ExampleIcon(FontAwesomeIcons.fileExcel, 'fileExcel'),
   ExampleIcon(FontAwesomeIcons.fileExport, 'fileExport'),
+  ExampleIcon(FontAwesomeIcons.fileFragment, 'fileFragment'),
+  ExampleIcon(FontAwesomeIcons.fileHalfDashed, 'fileHalfDashed'),
   ExampleIcon(FontAwesomeIcons.solidFileImage, 'solidFileImage'),
   ExampleIcon(FontAwesomeIcons.fileImage, 'fileImage'),
   ExampleIcon(FontAwesomeIcons.fileImport, 'fileImport'),
@@ -787,6 +792,7 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.fileWord, 'fileWord'),
   ExampleIcon(FontAwesomeIcons.solidFileZipper, 'solidFileZipper'),
   ExampleIcon(FontAwesomeIcons.fileZipper, 'fileZipper'),
+  ExampleIcon(FontAwesomeIcons.filesPinwheel, 'filesPinwheel'),
   ExampleIcon(FontAwesomeIcons.fill, 'fill'),
   ExampleIcon(FontAwesomeIcons.fillDrip, 'fillDrip'),
   ExampleIcon(FontAwesomeIcons.film, 'film'),
@@ -998,6 +1004,8 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.helicopterSymbol, 'helicopterSymbol'),
   ExampleIcon(FontAwesomeIcons.helmetSafety, 'helmetSafety'),
   ExampleIcon(FontAwesomeIcons.helmetUn, 'helmetUn'),
+  ExampleIcon(FontAwesomeIcons.hexagonNodes, 'hexagonNodes'),
+  ExampleIcon(FontAwesomeIcons.hexagonNodesBolt, 'hexagonNodesBolt'),
   ExampleIcon(FontAwesomeIcons.highlighter, 'highlighter'),
   ExampleIcon(FontAwesomeIcons.hillAvalanche, 'hillAvalanche'),
   ExampleIcon(FontAwesomeIcons.hillRockslide, 'hillRockslide'),
@@ -1676,6 +1684,8 @@ final icons = <ExampleIcon>[
   ExampleIcon(FontAwesomeIcons.square, 'square'),
   ExampleIcon(FontAwesomeIcons.squareArrowUpRight, 'squareArrowUpRight'),
   ExampleIcon(FontAwesomeIcons.squareBehance, 'squareBehance'),
+  ExampleIcon(FontAwesomeIcons.squareBinary, 'squareBinary'),
+  ExampleIcon(FontAwesomeIcons.squareBluesky, 'squareBluesky'),
   ExampleIcon(FontAwesomeIcons.solidSquareCaretDown, 'solidSquareCaretDown'),
   ExampleIcon(FontAwesomeIcons.squareCaretDown, 'squareCaretDown'),
   ExampleIcon(FontAwesomeIcons.solidSquareCaretLeft, 'solidSquareCaretLeft'),

lib/font_awesome_flutter.dart

@@ -136,7 +136,7 @@ class FaIcon extends StatelessWidget {
     final double iconOpacity = iconTheme.opacity ?? 1.0;
     Color iconColor = color ?? iconTheme.color!;
     if (iconOpacity != 1.0) {
-      iconColor = iconColor.withOpacity(iconColor.opacity * iconOpacity);
+      iconColor = iconColor.withValues(alpha: iconColor.a * iconOpacity);
     }
 
     Widget iconWidget = RichText(

lib/fonts/fa-brands-400.ttf

@@ -59,4 +59,4 @@ flutter:
 #    - family: FontAwesomeSharpSolid
 #      fonts:
 #        - asset: lib/fonts/fa-sharp-solid-900.ttf
-#          weight: 900
+#          weight: 900

lib/fonts/fa-regular-400.ttf

@@ -21,7 +21,8 @@ void main() {
       ),
     );
     final RichText text = tester.widget(find.byType(RichText));
-    expect(text.text.style!.color, const Color(0xFF666666).withOpacity(0.5));
+    expect(
+        text.text.style!.color, const Color(0xFF666666).withValues(alpha: 0.5));
   });
 
   testWidgets('Icon sizing - no theme, default size',

lib/fonts/fa-solid-900.ttf

@@ -194,7 +194,8 @@ void adjustPubspecFontIncludes(Set<String> styles) {
     if (!line.trimLeft().startsWith('- family:')) continue;
 
     styleName = line.substring(25).toLowerCase(); // - family: FontAwesomeXXXXXX
-    if (styles.any((element) => element.replaceAll(' ', '') == styleName)) { //Because of 'sharp thin' we need to remove spaces here
+    if (styles.any((element) => element.replaceAll(' ', '') == styleName)) {
+      //Because of 'sharp thin' we need to remove spaces here
       pubspec[i] = uncommentYamlLine(pubspec[i]);
       pubspec[i + 1] = uncommentYamlLine(pubspec[i + 1]);
       pubspec[i + 2] = uncommentYamlLine(pubspec[i + 2]);
@@ -562,10 +563,12 @@ bool readAndPickMetadata(File iconsJson, List<IconMetadata> metadata,
     } else if (icon.containsKey("svgs")) {
       iconStyles.addAll((icon['svgs']['classic'] as Map<String, dynamic>).keys);
       if (icon['svgs']?['sharp'] != null) {
-        iconStyles.addAll((icon['svgs']['sharp'] as Map<String, dynamic>).keys.map((key) => 'sharp $key')); //"sharp thin ..."
+        iconStyles.addAll((icon['svgs']['sharp'] as Map<String, dynamic>)
+            .keys
+            .map((key) => 'sharp $key')); //"sharp thin ..."
       }
     }
-    //TODO: Remove line once duotone support discontinuation notice is removed
+    //Remove line once duotone support discontinuation notice is removed
     if (iconStyles.contains('duotone')) hasDuotoneIcons = true;
 
     for (var excluded in excludedStyles) {
@@ -640,7 +643,15 @@ ArgParser setUpArgParser() {
   argParser.addMultiOption('exclude',
       abbr: 'e',
       defaultsTo: [],
-      allowed: ['brands', 'regular', 'solid', 'duotone', 'light', 'thin', 'sharp'],
+      allowed: [
+        'brands',
+        'regular',
+        'solid',
+        'duotone',
+        'light',
+        'thin',
+        'sharp'
+      ],
       help: 'icon styles which are excluded by the generator');
 
   argParser.addFlag('dynamic',