fix: bottom navbar first item icon color not changing on primary colo…

…r change
KRTirtho · Mar 24, 2023 · 6eb4244 · 6eb4244
1 parent 7a0fd64
commit 6eb4244
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/components/root/spotube_navigation_bar.dart b/lib/components/root/spotube_navigation_bar.dart
@@ -57,23 +57,26 @@ class SpotubeNavigationBar extends HookConsumerWidget {
           buttonBackgroundColor: buttonColor,
           color: theme.colorScheme.background,
           height: 50,
-          items: [
-            ...navbarTileList.map(
-              (e) {
+          animationDuration: const Duration(milliseconds: 350),
+          items: navbarTileList.map(
+            (e) {
+              /// Using this [Builder] as an workaround for the first item's
+              /// icon color not updating unless navigating to another page
+              return Builder(builder: (context) {
                 return MouseRegion(
                   cursor: SystemMouseCursors.click,
                   child: Badge(
                     isLabelVisible: e.title == "Library" && downloadCount > 0,
                     label: Text(downloadCount.toString()),
                     child: Icon(
                       e.icon,
-                      color: theme.colorScheme.primary,
+                      color: Theme.of(context).colorScheme.primary,
                     ),
                   ),
                 );
-              },
-            ),
-          ],
+              });
+            },
+          ).toList(),
           index: insideSelectedIndex.value,
           onTap: (i) {
             insideSelectedIndex.value = i;