Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YaruRow: drop Row-specific properties and rename to YaruTile #235

Merged
merged 2 commits into from
Oct 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions example/lib/example_page_items.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import 'package:yaru_widgets_example/pages/slider_page.dart';
import 'package:yaru_widgets_example/pages/switch_row_page.dart';
import 'package:yaru_widgets_example/pages/tabbed_page_page.dart';
import 'package:yaru_widgets_example/pages/toggle_buttons_row_page.dart';
import 'package:yaru_widgets_example/widgets/row_list.dart';
import 'package:yaru_widgets_example/widgets/tile_list.dart';

const _lorem =
'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';

final examplePageItems = <YaruPageItem>[
YaruPageItem(
titleBuilder: (context) => YaruPageItemTitle.text('YaruRow'),
titleBuilder: (context) => YaruPageItemTitle.text('YaruTile'),
iconData: YaruIcons.format_unordered_list,
builder: (_) => YaruPage(children: [RowList()]),
builder: (_) => YaruPage(children: [TileList()]),
itemWidget: SizedBox(
height: 20,
child: YaruCircularProgressIndicator(strokeWidth: 2),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class _HomeState extends State<Home> {
onChanged: (v) => setState(() => _compactMode = v),
),
if (_compactMode)
YaruRow(
YaruTile(
title: Text('YaruPageItem amount'),
trailing: Row(
children: [
Expand Down
2 changes: 1 addition & 1 deletion example/lib/pages/section_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class _SectionPageState extends State<SectionPage> {
YaruSection(
width: sectionWidth,
children: [
YaruRow(
YaruTile(
title: Text('Title'),
subtitle: Text('Subtitle'),
trailing: Text('Trailing'),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/widgets/dummy_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DummySection extends StatelessWidget {
width: 20,
),
children: [
YaruRow(
YaruTile(
title: Text('Title'),
subtitle: Text('Subtitle'),
trailing: Text('Trailing'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import 'package:flutter/material.dart';
import 'package:yaru_icons/yaru_icons.dart';
import 'package:yaru_widgets/yaru_widgets.dart';

class RowList extends StatelessWidget {
const RowList({Key? key}) : super(key: key);
class TileList extends StatelessWidget {
const TileList({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return ListView.builder(
shrinkWrap: true,
itemBuilder: (context, index) => const YaruRow(
title: Text("Trailing Widget"),
trailing: Text("Action Widget"),
itemBuilder: (context, index) => const YaruTile(
title: Text('Title'),
trailing: Icon(YaruIcons.information),
leading: Icon(YaruIcons.audio),
subtitle: Text("Description"),
subtitle: Text('Subtitle'),
),
itemCount: 20,
);
Expand Down
34 changes: 2 additions & 32 deletions lib/src/pages/rows/yaru_extra_option_row.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/controls/yaru_option_button.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
import 'package:yaru_widgets/src/pages/yaru_tile.dart';

class YaruExtraOptionRow extends StatelessWidget {
/// Creates a row having switch, label, description and YaruOptionButton.
Expand All @@ -14,12 +14,6 @@ class YaruExtraOptionRow extends StatelessWidget {
required this.onPressed,
required this.iconData,
this.padding = const EdgeInsets.all(8.0),
this.mainAxisAlignment = MainAxisAlignment.spaceBetween,
this.mainAxisSize = MainAxisSize.max,
this.crossAxisAlignment = CrossAxisAlignment.center,
this.verticalDirection = VerticalDirection.down,
this.textDirection,
this.textBaseline,
});

/// Whether or not we can interact with the widget
Expand Down Expand Up @@ -74,37 +68,13 @@ class YaruExtraOptionRow extends StatelessWidget {
/// The padding [EdgeInsets] which defaults to `EdgeInsets.all(8.0)`.
final EdgeInsets padding;

/// The [MainAxisAlignment] which defaults to [MainAxisAlignment.spaceBetween].
final MainAxisAlignment mainAxisAlignment;

/// The [MainAxisSize] which defaults to [MainAxisSize.max].
final MainAxisSize mainAxisSize;

/// The [CrossAxisAlignment] which defaults to [CrossAxisAlignment.center].
final CrossAxisAlignment crossAxisAlignment;

/// The optional [TextDirection].
final TextDirection? textDirection;

/// The [VerticalDirection] which defaults to [VerticalDirection.down].
final VerticalDirection verticalDirection;

/// The optional [TextBaseline].
final TextBaseline? textBaseline;

@override
Widget build(BuildContext context) {
final enabled = this.enabled && value != null;
return YaruRow(
return YaruTile(
enabled: enabled,
title: Text(actionLabel),
subtitle: actionDescription != null ? Text(actionDescription!) : null,
mainAxisAlignment: mainAxisAlignment,
mainAxisSize: mainAxisSize,
crossAxisAlignment: crossAxisAlignment,
textDirection: textDirection,
verticalDirection: verticalDirection,
textBaseline: textBaseline,
trailing: Row(
children: [
Switch(
Expand Down
34 changes: 2 additions & 32 deletions lib/src/pages/rows/yaru_single_info_row.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import 'yaru_row.dart';
import '../yaru_tile.dart';

class YaruSingleInfoRow extends StatelessWidget {
/// Creates an info widget with infoLabel and infoValue.
Expand All @@ -19,12 +19,6 @@ class YaruSingleInfoRow extends StatelessWidget {
required this.infoLabel,
required this.infoValue,
this.padding = const EdgeInsets.all(8.0),
this.mainAxisAlignment = MainAxisAlignment.spaceBetween,
this.mainAxisSize = MainAxisSize.max,
this.crossAxisAlignment = CrossAxisAlignment.center,
this.verticalDirection = VerticalDirection.down,
this.textDirection,
this.textBaseline,
});

/// Specifies the label for the information and is placed at the trailing position.
Expand All @@ -40,34 +34,10 @@ class YaruSingleInfoRow extends StatelessWidget {
/// The padding [EdgeInsets] which defaults to `EdgeInsets.all(8.0)`.
final EdgeInsets padding;

/// The [MainAxisAlignment] which defaults to [MainAxisAlignment.spaceBetween].
final MainAxisAlignment mainAxisAlignment;

/// The [MainAxisSize] which defaults to [MainAxisSize.max].
final MainAxisSize mainAxisSize;

/// The [CrossAxisAlignment] which defaults to [CrossAxisAlignment.center].
final CrossAxisAlignment crossAxisAlignment;

/// The optional [TextDirection].
final TextDirection? textDirection;

/// The [VerticalDirection] which defaults to [VerticalDirection.down].
final VerticalDirection verticalDirection;

/// The optional [TextBaseline].
final TextBaseline? textBaseline;

@override
Widget build(BuildContext context) {
return YaruRow(
return YaruTile(
enabled: true,
mainAxisAlignment: mainAxisAlignment,
mainAxisSize: mainAxisSize,
crossAxisAlignment: crossAxisAlignment,
textDirection: textDirection,
verticalDirection: verticalDirection,
textBaseline: textBaseline,
title: Text(infoLabel),
trailing: Expanded(
flex: 2,
Expand Down
36 changes: 3 additions & 33 deletions lib/src/pages/rows/yaru_slider_row.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
import 'package:yaru_widgets/src/pages/yaru_tile.dart';

class YaruSliderRow extends StatelessWidget {
/// Creates a yaru style slider.
/// If the `value` property is null the [Widget] will return [SizedBox].
/// Slider is passed as an `actionWidget inside [YaruRow].
/// Slider is passed as an `actionWidget inside [YaruTile].
/// `actionLabel` and `actionDescription` is placed in a row along with the slider.
///
/// For example:
Expand Down Expand Up @@ -35,12 +35,6 @@ class YaruSliderRow extends StatelessWidget {
this.fractionDigits = 0,
required this.onChanged,
this.padding = const EdgeInsets.all(8.0),
this.mainAxisAlignment = MainAxisAlignment.spaceBetween,
this.mainAxisSize = MainAxisSize.max,
this.crossAxisAlignment = CrossAxisAlignment.center,
this.verticalDirection = VerticalDirection.down,
this.textDirection,
this.textBaseline,
});

/// Whether or not we can interact with the widget
Expand Down Expand Up @@ -80,40 +74,16 @@ class YaruSliderRow extends StatelessWidget {
/// The padding [EdgeInsets] which defaults to `EdgeInsets.all(8.0)`.
final EdgeInsets padding;

/// The [MainAxisAlignment] which defaults to [MainAxisAlignment.spaceBetween].
final MainAxisAlignment mainAxisAlignment;

/// The [MainAxisSize] which defaults to [MainAxisSize.max].
final MainAxisSize mainAxisSize;

/// The [CrossAxisAlignment] which defaults to [CrossAxisAlignment.center].
final CrossAxisAlignment crossAxisAlignment;

/// The optional [TextDirection].
final TextDirection? textDirection;

/// The [VerticalDirection] which defaults to [VerticalDirection.down].
final VerticalDirection verticalDirection;

/// The optional [TextBaseline].
final TextBaseline? textBaseline;

@override
Widget build(BuildContext context) {
const thumbRadius = 24.0;

final enabled = this.enabled && value != null;

return YaruRow(
return YaruTile(
enabled: enabled,
title: Text(actionLabel),
subtitle: actionDescription != null ? Text(actionDescription!) : null,
mainAxisAlignment: mainAxisAlignment,
mainAxisSize: mainAxisSize,
crossAxisAlignment: crossAxisAlignment,
textDirection: textDirection,
verticalDirection: verticalDirection,
textBaseline: textBaseline,
trailing: Expanded(
flex: 2,
child: Row(
Expand Down
34 changes: 2 additions & 32 deletions lib/src/pages/rows/yaru_switch_row.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
import 'package:yaru_widgets/src/pages/yaru_tile.dart';

class YaruSwitchRow extends StatelessWidget {
/// Creates yaru style switch. The [Switch] will be aligned horizontally along with the `trailingWidget`.
Expand All @@ -25,12 +25,6 @@ class YaruSwitchRow extends StatelessWidget {
required this.value,
required this.onChanged,
this.padding = const EdgeInsets.all(8.0),
this.mainAxisAlignment = MainAxisAlignment.spaceBetween,
this.mainAxisSize = MainAxisSize.max,
this.crossAxisAlignment = CrossAxisAlignment.center,
this.verticalDirection = VerticalDirection.down,
this.textDirection,
this.textBaseline,
});

/// Whether or not we can interact with the widget
Expand All @@ -51,38 +45,14 @@ class YaruSwitchRow extends StatelessWidget {
/// The padding [EdgeInsets] which defaults to `EdgeInsets.all(8.0)`.
final EdgeInsets padding;

/// The [MainAxisAlignment] which defaults to [MainAxisAlignment.spaceBetween].
final MainAxisAlignment mainAxisAlignment;

/// The [MainAxisSize] which defaults to [MainAxisSize.max].
final MainAxisSize mainAxisSize;

/// The [CrossAxisAlignment] which defaults to [CrossAxisAlignment.center].
final CrossAxisAlignment crossAxisAlignment;

/// The optional [TextDirection].
final TextDirection? textDirection;

/// The [VerticalDirection] which defaults to [VerticalDirection.down].
final VerticalDirection verticalDirection;

/// The optional [TextBaseline].
final TextBaseline? textBaseline;

@override
Widget build(BuildContext context) {
final enabled = this.enabled && value != null;

return YaruRow(
return YaruTile(
enabled: enabled,
title: trailingWidget,
subtitle: actionDescription != null ? Text(actionDescription!) : null,
mainAxisAlignment: mainAxisAlignment,
mainAxisSize: mainAxisSize,
crossAxisAlignment: crossAxisAlignment,
textDirection: textDirection,
verticalDirection: verticalDirection,
textBaseline: textBaseline,
trailing: Switch(
value: value ?? false,
onChanged: enabled ? onChanged : null,
Expand Down
34 changes: 2 additions & 32 deletions lib/src/pages/rows/yaru_toggle_buttons_row.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
import 'package:yaru_widgets/src/pages/yaru_tile.dart';

class YaruToggleButtonsRow extends StatelessWidget {
/// Creates a set of Yaru style toggle buttons.
Expand Down Expand Up @@ -38,12 +38,6 @@ class YaruToggleButtonsRow extends StatelessWidget {
required this.selectedValues,
required this.onPressed,
this.padding = const EdgeInsets.all(8.0),
this.mainAxisAlignment = MainAxisAlignment.spaceBetween,
this.mainAxisSize = MainAxisSize.max,
this.crossAxisAlignment = CrossAxisAlignment.center,
this.verticalDirection = VerticalDirection.down,
this.textDirection,
this.textBaseline,
});

/// Whether or not we can interact with the widget
Expand Down Expand Up @@ -83,38 +77,14 @@ class YaruToggleButtonsRow extends StatelessWidget {
/// The padding [EdgeInsets] which defaults to `EdgeInsets.all(8.0)`.
final EdgeInsets padding;

/// The [MainAxisAlignment] which defaults to [MainAxisAlignment.spaceBetween].
final MainAxisAlignment mainAxisAlignment;

/// The [MainAxisSize] which defaults to [MainAxisSize.max].
final MainAxisSize mainAxisSize;

/// The [CrossAxisAlignment] which defaults to [CrossAxisAlignment.center].
final CrossAxisAlignment crossAxisAlignment;

/// The optional [TextDirection].
final TextDirection? textDirection;

/// The [VerticalDirection] which defaults to [VerticalDirection.down].
final VerticalDirection verticalDirection;

/// The optional [TextBaseline].
final TextBaseline? textBaseline;

@override
Widget build(BuildContext context) {
final enabled = this.enabled && selectedValues != null;

return YaruRow(
return YaruTile(
enabled: enabled,
title: Text(actionLabel),
subtitle: actionDescription != null ? Text(actionDescription!) : null,
mainAxisAlignment: mainAxisAlignment,
mainAxisSize: mainAxisSize,
crossAxisAlignment: crossAxisAlignment,
textDirection: textDirection,
verticalDirection: verticalDirection,
textBaseline: textBaseline,
trailing: ToggleButtons(
constraints: const BoxConstraints(minHeight: 40.0),
isSelected:
Expand Down