Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6e3aa4c
Sidebar top (#244)
GroovinChip May 11, 2022
41c56a2
chore: update issue templates
GroovinChip May 11, 2022
de258e5
chore: update pr_prelaunch script
GroovinChip May 11, 2022
4bb29a8
Merge branch 'stable' into dev
GroovinChip May 11, 2022
e4c37d6
Flutter 3 upgrade & MacosColor update (#248)
GroovinChip May 13, 2022
ac6870c
Merge branch 'stable' into dev
GroovinChip May 13, 2022
ab47743
Starter app (#251)
GroovinChip May 13, 2022
880c308
Full screen opaque toolbar issue (closes #249) (#252)
whiplashoo May 16, 2022
eb06cc4
Merge branch 'stable' into dev
GroovinChip May 16, 2022
77778ed
Version 1.4.1 (#255)
GroovinChip May 16, 2022
ee2297f
Merge branch 'stable' into dev
GroovinChip May 16, 2022
ba99684
Merge branch 'stable' into dev
GroovinChip May 16, 2022
3f0d09e
chore: repository, homepage fields
GroovinChip May 16, 2022
3f6d9ac
Merge branch 'stable' into dev
GroovinChip May 16, 2022
1857b58
chore: update readme
GroovinChip May 16, 2022
1dbab59
feat(starter_app): Version 1.1.0
GroovinChip May 16, 2022
99cce50
feat(starter_app): multi-window support
GroovinChip May 17, 2022
a7b34dd
feat: starter_app 1.2.1
GroovinChip May 21, 2022
f6cb9cd
chore: move brick to its own repo & go back to old pana action
GroovinChip May 23, 2022
a4e85c3
Expand remaining part of row in MacosListTile (#265)
jonsaw Jun 24, 2022
6d89861
End sidebar (#267)
GroovinChip Jun 26, 2022
9b8f75d
Merge branch 'stable' into dev
GroovinChip Jun 30, 2022
098c22f
fix: Correct the placement of the leading widget in disclosure sideba…
GroovinChip Jul 1, 2022
c7719c2
chore: Update changelog
GroovinChip Jul 2, 2022
5687498
test: fix issues with date_picker_test
GroovinChip Jul 7, 2022
f09843c
Update Actions (#279)
GroovinChip Jul 7, 2022
d534f79
Version 1.6.0 - `MacosTabView` & `MacosSegmentedControl` (#273)
GroovinChip Jul 9, 2022
4f13234
Version 1.7.0: `MacosImageIcon` & sidebar updates (#274)
GroovinChip Jul 10, 2022
fa1deed
Merge branch 'stable' into dev
GroovinChip Jul 10, 2022
1d33004
chore: fix typo in pr template
GroovinChip Jul 10, 2022
7487f97
feat: gh action to auto-generate releases on push to stable
GroovinChip Jul 10, 2022
91de6b7
Merge branch 'stable' into dev
GroovinChip Jul 10, 2022
85eaed4
chore: update release action with latest from stable
GroovinChip Jul 10, 2022
285c398
feat: add action to publish to pub
GroovinChip Jul 10, 2022
6c90a36
docs: update readme
GroovinChip Jul 9, 2022
eae4c3d
fix: 1.7.1
GroovinChip Jul 27, 2022
085c44c
Merge branch 'stable' into dev
GroovinChip Jul 27, 2022
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
End sidebar (#267)
* chore: add missing trailing comma

* chore: improve MacosIconButton animation curve

* chore: remove false_secrets from pubspec.yaml

* feat: end sidebar

Also fixes the tests portion of the pr_prelaunch_tasks script

* feat: add "isEndSidebarShown" to MacosWindowScope
  • Loading branch information
GroovinChip authored Jun 26, 2022
commit 6d89861f0b627f88c7b270539640d360a7f4be46
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## [1.5.0]
* Adds `endSidebar` to `MacosWindow`

## [1.4.2]
* Fixes RenderFlex overflowed in `MacosListTile` [#264](https://github.com/GroovinChip/macos_ui/issues/264)
* Fixes RenderFlex overflowed in `MacosListTile` [#264](https://github.com/GroovinChip/macos_ui/issues/264)

## [1.4.1+1]
* Update `pubspec.yaml` with `repository` and new `homepage` field.
Expand Down
11 changes: 11 additions & 0 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,17 @@ class _WidgetGalleryState extends State<WidgetGallery> {
subtitle: Text('tim@apple.com'),
),
),
endSidebar: Sidebar(
startWidth: 200,
minWidth: 200,
maxWidth: 300,
shownByDefault: false,
builder: (context, scrollController) {
return const Center(
child: Text('End Sidebar'),
);
},
),
child: IndexedStack(
index: pageIndex,
children: pages,
Expand Down
28 changes: 25 additions & 3 deletions example/lib/pages/buttons_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,35 @@ class _ButtonsPageState extends State<ButtonsPage> {
toolBar: ToolBar(
title: const Text('Buttons'),
titleWidth: 150.0,
leading: MacosTooltip(
message: 'Toggle Sidebar',
useMousePosition: false,
child: MacosIconButton(
icon: MacosIcon(
CupertinoIcons.sidebar_left,
color: MacosTheme.brightnessOf(context).resolve(
const Color.fromRGBO(0, 0, 0, 0.5),
const Color.fromRGBO(255, 255, 255, 0.5),
),
size: 20.0,
),
boxConstraints: const BoxConstraints(
minHeight: 20,
minWidth: 20,
maxWidth: 48,
maxHeight: 38,
),
onPressed: () => MacosWindowScope.of(context).toggleSidebar(),
),
),
actions: [
ToolBarIconButton(
label: 'Toggle Sidebar',
label: 'Toggle End Sidebar',
tooltipMessage: 'Toggle End Sidebar',
icon: const MacosIcon(
CupertinoIcons.sidebar_left,
CupertinoIcons.sidebar_right,
),
onPressed: () => MacosWindowScope.of(context).toggleSidebar(),
onPressed: () => MacosWindowScope.of(context).toggleEndSidebar(),
showLabel: false,
),
],
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ packages:
path: ".."
relative: true
source: path
version: "1.4.1+1"
version: "1.5.0"
matcher:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion lib/src/buttons/icon_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class MacosIconButtonState extends State<MacosIconButton>
vsync: this,
);
_opacityAnimation = _animationController
.drive(CurveTween(curve: Curves.decelerate))
.drive(CurveTween(curve: const Interval(0.0, 0.25)))
.drive(_opacityTween);
_setTween();
}
Expand Down
8 changes: 8 additions & 0 deletions lib/src/layout/sidebar/sidebar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Sidebar {
this.top,
this.bottom,
this.topOffset = 51.0,
this.shownByDefault = true,
}) : dragClosedBuffer = dragClosedBuffer ?? minWidth / 2;

/// The builder that creates a child to display in this widget, which will
Expand Down Expand Up @@ -111,4 +112,11 @@ class Sidebar {
///
/// Defaults to `51.0` which levels it up with the default height of the [TitleBar]
final double topOffset;

/// Whether the sidebar should be open by default or not.
///
/// Most useful for end sidebars.
///
/// Defaults to `true`.
final bool shownByDefault;
}
Loading