NarrowLayout: Use Text.data for item label (#136)

ubuntu · May 24, 2022 · 9314d64 · 9314d64
1 parent db078fc
commit 9314d64
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/lib/src/yaru_narrow_layout.dart b/lib/src/yaru_narrow_layout.dart
@@ -61,13 +61,15 @@ class _YaruNarrowLayoutState extends State<YaruNarrowLayout> {
             showSelectedLabels: widget.showSelectedLabels,
             showUnselectedLabels: widget.showUnselectedLabels,
             items: widget.pageItems
-                .map((pageItem) => BottomNavigationBarItem(
-                    icon: Icon(pageItem.iconData),
-                    activeIcon: pageItem.selectedIconData != null
-                        ? Icon(pageItem.selectedIconData)
-                        : Icon(pageItem.iconData),
-                    label:
-                        convertWidgetToString(pageItem.titleBuilder(context))))
+                .map(
+                  (pageItem) => BottomNavigationBarItem(
+                      icon: Icon(pageItem.iconData),
+                      activeIcon: pageItem.selectedIconData != null
+                          ? Icon(pageItem.selectedIconData)
+                          : Icon(pageItem.iconData),
+                      label: convertWidgetToString(
+                          pageItem.titleBuilder(context))),
+                )
                 .toList(),
             currentIndex: _selectedIndex,
             onTap: (index) {
@@ -81,13 +83,6 @@ class _YaruNarrowLayoutState extends State<YaruNarrowLayout> {
   }
 
   String convertWidgetToString(Widget widget) {
-    return widget is Text
-        ? widget
-            .toString()
-            .replaceAll('Text(', '')
-            .replaceAll(')', '')
-            .replaceAll('"', '')
-            .replaceAll("'", '')
-        : '';
+    return widget is Text && widget.data != null ? widget.data! : '';
   }
 }