From 9604dbe44aed38359926d95f8e384e4014a33993 Mon Sep 17 00:00:00 2001 From: jacobrask15 <49784405+jacobrask15@users.noreply.github.com> Date: Sat, 23 Sep 2023 00:58:31 +0200 Subject: [PATCH] iconcolor added --- example/pubspec.lock | 54 +++++++++++++------------- lib/widget/circle_floating_button.dart | 13 +++++-- pubspec.lock | 54 +++++++++++++------------- 3 files changed, 64 insertions(+), 57 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 2ecd259..1dd3e83 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: @@ -75,46 +75,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.2" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" radial_button: dependency: "direct main" description: @@ -141,10 +133,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -181,10 +173,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.0" vector_math: dependency: transitive description: @@ -193,5 +185,13 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=2.19.6 <3.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" diff --git a/lib/widget/circle_floating_button.dart b/lib/widget/circle_floating_button.dart index c5b54ea..0f89e76 100644 --- a/lib/widget/circle_floating_button.dart +++ b/lib/widget/circle_floating_button.dart @@ -16,6 +16,7 @@ class CircleFloatingButton extends StatefulWidget { final Duration duration; final Color buttonColor; final IconData buttonIcon; + final Color iconColor; final Curve curve; final bool opacity; final Widget? child; @@ -32,6 +33,7 @@ class CircleFloatingButton extends StatefulWidget { required this.type, required this.buttonColor, required this.buttonIcon, + required this.iconColor, required this.curve, required this.opacity, this.child, @@ -42,6 +44,7 @@ class CircleFloatingButton extends StatefulWidget { double radius = 100, required Duration duration, required IconData icon, + required Color iconColor, required Color color, required Curve curveAnim, required bool useOpacity, @@ -56,6 +59,7 @@ class CircleFloatingButton extends StatefulWidget { type: CircleType.quarterPart, duration: duration, buttonIcon: icon, + iconColor: iconColor, buttonColor: color, curve: curveAnim, opacity: useOpacity, @@ -69,6 +73,7 @@ class CircleFloatingButton extends StatefulWidget { required Duration duration, required IconData icon, required Color color, + required Color iconColor, required Curve curveAnim, required bool useOpacity, Key? key, @@ -81,6 +86,7 @@ class CircleFloatingButton extends StatefulWidget { type: CircleType.complete, duration: duration, buttonIcon: icon, + iconColor: iconColor, buttonColor: color, curve: curveAnim, opacity: useOpacity, @@ -108,6 +114,7 @@ class CircleFloatingButton extends StatefulWidget { type: CircleType.semi, duration: duration, buttonIcon: icon, + iconColor: color, buttonColor: color, curve: curveAnim, opacity: useOpacity, @@ -215,7 +222,7 @@ class CircleFloatingButtonState extends State { heroTag: UniqueKey(), backgroundColor: widget.buttonColor, onPressed: _bloc.toggle, - child: Icon(widget.buttonIcon), + child: Icon(widget.buttonIcon, color: widget.iconColor), ), ), ), @@ -268,7 +275,7 @@ class CircleFloatingButtonState extends State { heroTag: UniqueKey(), backgroundColor: widget.buttonColor, onPressed: _bloc.toggle, - child: Icon(widget.buttonIcon), + child: Icon(widget.buttonIcon, color: widget.iconColor), ), ), ), @@ -319,7 +326,7 @@ class CircleFloatingButtonState extends State { heroTag: UniqueKey(), backgroundColor: widget.buttonColor, onPressed: _bloc.toggle, - child: Icon(widget.buttonIcon), + child: Icon(widget.buttonIcon, color: widget.iconColor), ), ), ), diff --git a/pubspec.lock b/pubspec.lock index a8f0e95..dc360aa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.2" fake_async: dependency: transitive description: @@ -67,46 +67,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.2" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" rxdart: dependency: "direct main" description: @@ -124,10 +116,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -164,10 +156,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.0" vector_math: dependency: transitive description: @@ -176,5 +168,13 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=2.19.6 <3.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0"