Skip to content

Commit

Permalink
Remove YaruPageItemTitle (#273)
Browse files Browse the repository at this point in the history
The type of the immediate child should not matter. It could be wrapped
into a non-Text widget. Just wrap with DefaultTextStyle and let any
descendant Text inherit the style. If desired, users can override the
defaults in builders.

Fixes: #271
  • Loading branch information
jpnurmi committed Oct 12, 2022
1 parent 64063fd commit 47c23fe
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 35 deletions.
26 changes: 12 additions & 14 deletions example/lib/example_page_items.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_icons/yaru_icons.dart';
import 'package:yaru_widgets/yaru_widgets.dart';
import 'pages/banner_page.dart';
import 'pages/carousel_page.dart';
import 'pages/color_disk_page.dart';
Expand Down Expand Up @@ -28,65 +27,64 @@ class PageItem {

final examplePageItems = <PageItem>[
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruBanner'),
titleBuilder: (context) => const Text('YaruBanner'),
pageBuilder: (context) => const BannerPage(),
iconBuilder: (context, selected) => selected
? const Icon(YaruIcons.image_filled)
: const Icon(YaruIcons.image),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruCarousel'),
titleBuilder: (context) => const Text('YaruCarousel'),
pageBuilder: (_) => const CarouselPage(),
iconBuilder: (context, selected) => const Icon(YaruIcons.refresh),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruColorDisk'),
titleBuilder: (context) => const Text('YaruColorDisk'),
pageBuilder: (context) => const ColorDiskPage(),
iconBuilder: (context, selected) => const Icon(YaruIcons.color_select),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruDraggable'),
titleBuilder: (context) => const Text('YaruDraggable'),
pageBuilder: (context) => const DraggablePage(),
iconBuilder: (context, selected) => const Icon(YaruIcons.drag_handle),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruExpandable'),
titleBuilder: (context) => const Text('YaruExpandable'),
iconBuilder: (context, selected) => const Icon(YaruIcons.pan_down),
pageBuilder: (_) => const ExpandablePage(),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruIconButton'),
titleBuilder: (context) => const Text('YaruIconButton'),
iconBuilder: (context, selected) => const Icon(YaruIcons.app_grid),
pageBuilder: (_) => const IconButtonPage(),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruOptionButton'),
titleBuilder: (context) => const Text('YaruOptionButton'),
iconBuilder: (context, selected) => const Icon(YaruIcons.settings),
pageBuilder: (_) => const OptionButtonPage(),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruProgressIndicator'),
titleBuilder: (context) => const Text('YaruProgressIndicator'),
iconBuilder: (context, selected) => const Icon(YaruIcons.download),
pageBuilder: (_) => const ProgressIndicatorPage(),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruSection'),
titleBuilder: (context) => const Text('YaruSection'),
iconBuilder: (context, selected) => const Icon(YaruIcons.window),
pageBuilder: (_) => const SectionPage(),
),
PageItem(
titleBuilder: (context) =>
YaruPageItemTitle.text('YaruSelectableContainer'),
titleBuilder: (context) => const Text('YaruSelectableContainer'),
iconBuilder: (context, selected) => const Icon(YaruIcons.selection),
pageBuilder: (_) => const SelectableContainerPage(),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruTabbedPage'),
titleBuilder: (context) => const Text('YaruTabbedPage'),
pageBuilder: (_) => const TabbedPagePage(),
iconBuilder: (context, selected) => const Icon(YaruIcons.tab_new),
),
PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruTile'),
titleBuilder: (context) => const Text('YaruTile'),
iconBuilder: (context, selected) =>
const Icon(YaruIcons.format_unordered_list),
pageBuilder: (_) => const TilePage(),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class _HomeState extends State<Home> {
@override
Widget build(BuildContext context) {
final configItem = PageItem(
titleBuilder: (context) => YaruPageItemTitle.text('Layout'),
titleBuilder: (context) => const Text('Layout'),
pageBuilder: (_) => ListView(
padding: const EdgeInsets.all(kYaruPagePadding),
children: [
Expand Down
19 changes: 0 additions & 19 deletions lib/src/pages/layouts/yaru_page_item_title.dart

This file was deleted.

1 change: 0 additions & 1 deletion lib/yaru_widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export 'src/pages/layouts/yaru_master_detail_theme.dart';
export 'src/pages/layouts/yaru_master_tile.dart';
export 'src/pages/layouts/yaru_navigation_rail.dart';
export 'src/pages/layouts/yaru_navigation_rail_item.dart';
export 'src/pages/layouts/yaru_page_item_title.dart';
// Pages
export 'src/pages/yaru_section.dart';
export 'src/pages/yaru_tabbed_page.dart';
Expand Down

0 comments on commit 47c23fe

Please sign in to comment.