YaruRow: make the description a widget (#232)

ubuntu · Oct 5, 2022 · 53e95cf · 53e95cf
1 parent 62496a2
commit 53e95cf
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/example/lib/pages/section_page.dart b/example/lib/pages/section_page.dart
@@ -33,7 +33,7 @@ class _SectionPageState extends State<SectionPage> {
             YaruRow(
               trailingWidget: Text("Trailing Widget"),
               actionWidget: Text("Action Widget"),
-              description: "Description",
+              description: Text("Description"),
             ),
             YaruSliderRow(
               actionLabel: "YaruSection width",

diff --git a/example/lib/widgets/dummy_section.dart b/example/lib/widgets/dummy_section.dart
@@ -19,7 +19,7 @@ class DummySection extends StatelessWidget {
         YaruRow(
           trailingWidget: Text("Trailing Widget"),
           actionWidget: Text("Action Widget"),
-          description: "Description",
+          description: Text("Description"),
         ),
       ],
       width: width,

diff --git a/example/lib/widgets/row_list.dart b/example/lib/widgets/row_list.dart
@@ -13,7 +13,7 @@ class RowList extends StatelessWidget {
         trailingWidget: Text("Trailing Widget"),
         actionWidget: Text("Action Widget"),
         leadingWidget: Icon(YaruIcons.audio),
-        description: "Description",
+        description: Text("Description"),
       ),
       itemCount: 20,
     );

diff --git a/lib/src/pages/rows/yaru_extra_option_row.dart b/lib/src/pages/rows/yaru_extra_option_row.dart
@@ -103,7 +103,7 @@ class YaruExtraOptionRow extends StatelessWidget {
       width: width,
       enabled: enabled,
       trailingWidget: Text(actionLabel),
-      description: actionDescription,
+      description: actionDescription != null ? Text(actionDescription!) : null,
       mainAxisAlignment: mainAxisAlignment,
       mainAxisSize: mainAxisSize,
       crossAxisAlignment: crossAxisAlignment,

diff --git a/lib/src/pages/rows/yaru_row.dart b/lib/src/pages/rows/yaru_row.dart
@@ -37,8 +37,8 @@ class YaruRow extends StatelessWidget {
   /// The [Widget] placed at trailing position.
   final Widget trailingWidget;
 
-  /// The Description placed below [trailingWidget].
-  final String? description;
+  /// The [Widget] placed below [trailingWidget].
+  final Widget? description;
 
   /// The [Widget] placed after the [trailingWidget].
   final Widget actionWidget;
@@ -103,13 +103,13 @@ class YaruRow extends StatelessWidget {
                     if (description != null)
                       Padding(
                         padding: const EdgeInsets.only(top: 4.0),
-                        child: Text(
-                          description!,
+                        child: DefaultTextStyle(
                           style: enabled
-                              ? Theme.of(context).textTheme.bodySmall
-                              : Theme.of(context).textTheme.bodySmall?.copyWith(
+                              ? Theme.of(context).textTheme.bodySmall!
+                              : Theme.of(context).textTheme.bodySmall!.copyWith(
                                     color: Theme.of(context).disabledColor,
                                   ),
+                          child: description!,
                         ),
                       ),
                   ],

diff --git a/lib/src/pages/rows/yaru_slider_row.dart b/lib/src/pages/rows/yaru_slider_row.dart
@@ -112,7 +112,7 @@ class YaruSliderRow extends StatelessWidget {
       width: width,
       enabled: enabled,
       trailingWidget: Text(actionLabel),
-      description: actionDescription,
+      description: actionDescription != null ? Text(actionDescription!) : null,
       mainAxisAlignment: mainAxisAlignment,
       mainAxisSize: mainAxisSize,
       crossAxisAlignment: crossAxisAlignment,

diff --git a/lib/src/pages/rows/yaru_switch_row.dart b/lib/src/pages/rows/yaru_switch_row.dart
@@ -81,7 +81,7 @@ class YaruSwitchRow extends StatelessWidget {
       width: width,
       enabled: enabled,
       trailingWidget: trailingWidget,
-      description: actionDescription,
+      description: actionDescription != null ? Text(actionDescription!) : null,
       mainAxisAlignment: mainAxisAlignment,
       mainAxisSize: mainAxisSize,
       crossAxisAlignment: crossAxisAlignment,

diff --git a/lib/src/pages/rows/yaru_toggle_buttons_row.dart b/lib/src/pages/rows/yaru_toggle_buttons_row.dart
@@ -113,7 +113,7 @@ class YaruToggleButtonsRow extends StatelessWidget {
       width: width,
       enabled: enabled,
       trailingWidget: Text(actionLabel),
-      description: actionDescription,
+      description: actionDescription != null ? Text(actionDescription!) : null,
       mainAxisAlignment: mainAxisAlignment,
       mainAxisSize: mainAxisSize,
       crossAxisAlignment: crossAxisAlignment,

diff --git a/test/pages/rows/yaru_row_test.dart b/test/pages/rows/yaru_row_test.dart
@@ -14,7 +14,7 @@ void main() {
             leadingWidget: Text('Foo Leading'),
             actionWidget: Text('Foo Text'),
             trailingWidget: Icon(Icons.add),
-            description: 'Foo Description',
+            description: Text('Foo Description'),
           ),
         ),
       ),