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

Adapt radii to yaru and remove optioncard #98

Merged
merged 1 commit into from
Feb 19, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions example/lib/example_page_items.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ 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/option_button_list.dart';
import 'package:yaru_widgets_example/widgets/card_list.dart';
import 'package:yaru_widgets_example/widgets/row_list.dart';

final examplePageItems = <YaruPageItem>[
Expand Down Expand Up @@ -49,11 +48,6 @@ final examplePageItems = <YaruPageItem>[
iconData: YaruIcons.settings,
builder: (_) => YaruPage(children: [OptionButtonList()]),
),
YaruPageItem(
titleBuilder: (context) => Text('YaruOptionCard'),
iconData: YaruIcons.image,
builder: (_) => YaruPage(children: [CardList()]),
),
YaruPageItem(
titleBuilder: (context) => Text('YaruSearchAppBar'),
iconData: YaruIcons.folder_search,
Expand Down
41 changes: 0 additions & 41 deletions example/lib/widgets/card_list.dart

This file was deleted.

2 changes: 2 additions & 0 deletions lib/src/constants.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const kDefaultPagePadding = 20.0;
const kDefaultDialogTitlePadding = 0.0;
const kDefaultPageWidth = 500.0;
const kDefaultContainerRadius = 8.0;
const kDefaultButtonRadius = 6.0;
3 changes: 2 additions & 1 deletion lib/src/yaru_carousel.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';

class YaruCarousel extends StatefulWidget {
const YaruCarousel({
Expand All @@ -8,7 +9,7 @@ class YaruCarousel extends StatefulWidget {
this.fit,
this.centerSlice,
this.showBorder = true,
this.radius = 10.0,
this.radius = kDefaultContainerRadius,
required this.images,
this.initialIndex = 0,
this.onTap,
Expand Down
3 changes: 2 additions & 1 deletion lib/src/yaru_expansion_panel_list.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:math' as math;

import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';

const double _kPanelHeaderCollapsedHeight = 48.0;
const double _kPanelHeaderExpandedHeight = 64.0;
Expand Down Expand Up @@ -79,7 +80,7 @@ class YaruExpansionPanelList extends StatelessWidget {
],
);

double _radiusValue = 8.0;
double _radiusValue = kDefaultContainerRadius;
BorderRadius borderRadius = index == 0
? BorderRadius.only(
topLeft: Radius.circular(_radiusValue),
Expand Down
130 changes: 0 additions & 130 deletions lib/src/yaru_option_card.dart

This file was deleted.

6 changes: 4 additions & 2 deletions lib/src/yaru_page_item_list_view.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';
import 'package:yaru_widgets/src/yaru_page_item.dart';

const double _kScrollbarThickness = 8.0;
Expand Down Expand Up @@ -83,7 +84,8 @@ class _YaruListTile extends StatelessWidget {
Widget build(BuildContext context) {
return DecoratedBox(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(4.0)),
borderRadius:
const BorderRadius.all(Radius.circular(kDefaultButtonRadius)),
color: selected
? Theme.of(context).colorScheme.onSurface.withOpacity(0.07)
: null,
Expand All @@ -93,7 +95,7 @@ class _YaruListTile extends StatelessWidget {
selectedColor: Theme.of(context).colorScheme.onSurface,
visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(4.0)),
borderRadius: BorderRadius.all(Radius.circular(kDefaultButtonRadius)),
),
leading: iconData != null
? Icon(
Expand Down
4 changes: 3 additions & 1 deletion lib/src/yaru_section.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';

class YaruSection extends StatelessWidget {
/// Creates a yaru style section widget with multiple
Expand Down Expand Up @@ -41,7 +42,8 @@ class YaruSection extends StatelessWidget {
color:
Theme.of(context).colorScheme.onSurface.withOpacity(0.15),
),
borderRadius: BorderRadius.circular(6.0),
borderRadius: const BorderRadius.all(
Radius.circular(kDefaultContainerRadius)),
),
child: Column(
children: [
Expand Down
8 changes: 4 additions & 4 deletions lib/src/yaru_selectable_container.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru_widgets/src/constants.dart';

class YaruSelectableContainer extends StatelessWidget {
/// Creates a Image Tile from the image path given in the path property.
Expand All @@ -8,7 +9,7 @@ class YaruSelectableContainer extends StatelessWidget {
this.onTap,
required this.selected,
this.borderRadius,
this.radius = 6.0,
this.radius = kDefaultContainerRadius,
this.padding,
this.selectionColor,
}) : super(key: key);
Expand All @@ -25,7 +26,7 @@ class YaruSelectableContainer extends StatelessWidget {
/// Callback triggered when the [YaruSelectableContainer] is clicked.
final VoidCallback? onTap;

/// Optional custom radius for the corners which defaults to a circular 6.0 [BorderRadius]
/// Optional custom radius for the corners which defaults to a 8.0 [BorderRadius]
final BorderRadius? borderRadius;

/// Optional double value used for a symmetric circular [BorderRadius] if [borderRadius]
Expand Down Expand Up @@ -53,8 +54,7 @@ class YaruSelectableContainer extends StatelessWidget {
child: Padding(
padding: padding ?? const EdgeInsets.all(6.0),
child: ClipRRect(
borderRadius:
borderRadius ?? BorderRadius.circular(radius - radius / 3),
borderRadius: borderRadius ?? BorderRadius.circular(radius),
child: child,
),
),
Expand Down
6 changes: 4 additions & 2 deletions lib/src/yaru_tabbed_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class _YaruTabbedPageState extends State<YaruTabbedPage>
child: Container(
width: widget.width,
height: 60,
decoration: BoxDecoration(borderRadius: BorderRadius.circular(4)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(kDefaultContainerRadius)),
child: Theme(
data: ThemeData().copyWith(
splashColor: Colors.transparent,
Expand All @@ -80,7 +81,8 @@ class _YaruTabbedPageState extends State<YaruTabbedPage>
controller: tabController,
labelColor: Theme.of(context).colorScheme.onSurface,
indicator: BoxDecoration(
borderRadius: BorderRadius.circular(4),
borderRadius:
BorderRadius.circular(kDefaultContainerRadius),
color: Theme.of(context)
.colorScheme
.onSurface
Expand Down
1 change: 0 additions & 1 deletion lib/yaru_widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export 'src/yaru_linear_progress_indicator.dart';
export 'src/yaru_master_detail_page.dart';
export 'src/yaru_narrow_layout.dart';
export 'src/yaru_option_button.dart';
export 'src/yaru_option_card.dart';
export 'src/yaru_page.dart';
export 'src/yaru_page_item.dart';
export 'src/yaru_row.dart';
Expand Down
25 changes: 0 additions & 25 deletions test/yaru_option_card_test.dart

This file was deleted.