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

Buttons #16

Merged
merged 31 commits into from
Jun 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2ba3eb6
Initial draft
Daviiddoo May 17, 2024
e4c0d6d
clean up
Daviiddoo May 17, 2024
bbe716c
next draft for review
Daviiddoo May 19, 2024
eef8dc8
Update button_style.dart
Daviiddoo May 19, 2024
f8809ab
add style to ButtonContent
Daviiddoo May 19, 2024
dce2906
removed flutter hooks, implemented Tappable
Daviiddoo May 22, 2024
a5371d9
Mob programming
Pante May 23, 2024
454ebd7
fixed build issues
Daviiddoo May 27, 2024
9ccbafc
Left to test colors
Daviiddoo May 27, 2024
59fc77a
colors tested
Daviiddoo May 29, 2024
10b73e4
Rebase branch with master
Pante May 30, 2024
7635df8
Added SVG assets, cleaned up dart analysis issues
Daviiddoo May 30, 2024
7262a91
added tests
Daviiddoo Jun 1, 2024
bee7736
updateed with some of the parameters from gesture detector
Daviiddoo Jun 1, 2024
9b8c80f
Fbutton is ready
Daviiddoo Jun 2, 2024
cbe04bd
Implemented tappable
Daviiddoo Jun 2, 2024
0a52d73
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Jun 2, 2024
4b28bbe
Update forui/lib/src/widgets/button/button.dart
Daviiddoo Jun 2, 2024
0bfe4f0
Update forui/lib/src/widgets/button/button.dart
Daviiddoo Jun 2, 2024
d0502d4
Update forui/lib/src/widgets/button/button.dart
Daviiddoo Jun 2, 2024
df3c749
Update forui/lib/src/widgets/button/button.dart
Daviiddoo Jun 2, 2024
f488964
Update forui/lib/src/widgets/button/button.dart
Daviiddoo Jun 2, 2024
334e034
Update forui/lib/src/widgets/button/button_style.dart
Daviiddoo Jun 2, 2024
99cd5a3
Fixed pr issues
Daviiddoo Jun 2, 2024
35e13f5
Merge branch 'feature/buttons' of https://github.com/forus-labs/forui…
Daviiddoo Jun 2, 2024
06b8482
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Jun 2, 2024
7b1eead
Matthias Done???
Daviiddoo Jun 2, 2024
ca14ca8
Merge branch 'feature/buttons' of https://github.com/forus-labs/forui…
Daviiddoo Jun 2, 2024
ae338b1
Update button.dart
Daviiddoo Jun 2, 2024
97196da
Commit from GitHub Actions (Forui Presubmit)
Daviiddoo Jun 2, 2024
d2cd05b
Squashed commit of the following:
Daviiddoo Jun 2, 2024
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
Prev Previous commit
Next Next commit
Update button.dart
Daviiddoo committed Jun 2, 2024
commit ae338b1d5f4a929220ab86ed31dcc74846662339
8 changes: 2 additions & 6 deletions forui/lib/src/widgets/button/button.dart
Original file line number Diff line number Diff line change
@@ -61,9 +61,7 @@ class FButton extends StatelessWidget {
return FTappable(
onTap: onPressed,
child: DecoratedBox(
decoration: onPressed == null
? style.disabledBoxDecoration
: style.enabledBoxDecoration,
decoration: onPressed == null ? style.disabledBoxDecoration : style.enabledBoxDecoration,
child: builder(context, style),
),
);
@@ -75,8 +73,6 @@ class FButton extends StatelessWidget {
properties
..add(DiagnosticsProperty<VoidCallback?>('onPressed', onPressed))
..add(DiagnosticsProperty<FButtonDesign>('style', design))
..add(ObjectFlagProperty<
Widget Function(
BuildContext p1, FButtonStyle p2)>.has('builder', builder));
..add(ObjectFlagProperty<Widget Function(BuildContext p1, FButtonStyle p2)>.has('builder', builder));
}
}