Skip to content

Commit 77d7c0e

Browse files
GroovinChipwhiplashoojonsaw
authored
Version 1.7.0 (#282)
* Sidebar top (#244) * chore: refactor dir structure * feat: Sidebar top & updated default control color * feat(example): search results in top * chore: bump version, changelog * chore: run flutter pub upgrade * Update CHANGELOG.md * Update lib/src/layout/sidebar/sidebar.dart Co-authored-by: Minas Giannekas <whiplashoo@users.noreply.github.com> * chore: update issue templates * chore: update pr_prelaunch script * Flutter 3 upgrade & MacosColor update (#248) * chore: Update pubspec.yaml files to support Flutter 3 * chore: run dart fix --apply * chore: migrate Scrollbar to Flutter 3 * chore: update flutter_lints & subsequent fixes * feat: add missing functions to MacosColor the Color class has a number of functions that MacosColor had not implemented * chore: use super parameters * chore: update changelog * chore: tweak example app Uses the new PlatformMenuBar. Also update product name. * chore: small changelog tweak * chore: run flutter format . * chore: run dart fix --apply * chore: run flutter format . * chore: remove unused code in example * chore: remove unused import * chore: remove unused code * Starter app (#251) * chore: Update pubspec.yaml files to support Flutter 3 * chore: run dart fix --apply * chore: migrate Scrollbar to Flutter 3 * chore: update flutter_lints & subsequent fixes * feat: add missing functions to MacosColor the Color class has a number of functions that MacosColor had not implemented * chore: use super parameters * chore: update changelog * chore: tweak example app Uses the new PlatformMenuBar. Also update product name. * chore: small changelog tweak * chore: run flutter format . * chore: run dart fix --apply * chore: run flutter format . * chore: remove unused code in example * chore: remove unused import * feat: first pass at starter app brick * chore: improve starter app brick * chore: fix widget test in starter app * feat: conditional prompts & running pub get * chore: finalize brick * chore: run flutter format * chore: exclude starter app from analyzer * Full screen opaque toolbar issue (closes #249) (#252) * fix: don't show app window toolbar when in full screen * chore: update README * chore: update brick app window code * chore: update pubspec and changelog * chore: update actions Co-authored-by: Reuben Turner <groovinchip@gmail.com> * Version 1.4.1 (#255) * Sidebar top (#244) * chore: refactor dir structure * feat: Sidebar top & updated default control color * feat(example): search results in top * chore: bump version, changelog * chore: run flutter pub upgrade * Update CHANGELOG.md * Update lib/src/layout/sidebar/sidebar.dart Co-authored-by: Minas Giannekas <whiplashoo@users.noreply.github.com> * chore: update issue templates * chore: update pr_prelaunch script * Flutter 3 upgrade & MacosColor update (#248) * chore: Update pubspec.yaml files to support Flutter 3 * chore: run dart fix --apply * chore: migrate Scrollbar to Flutter 3 * chore: update flutter_lints & subsequent fixes * feat: add missing functions to MacosColor the Color class has a number of functions that MacosColor had not implemented * chore: use super parameters * chore: update changelog * chore: tweak example app Uses the new PlatformMenuBar. Also update product name. * chore: small changelog tweak * chore: run flutter format . * chore: run dart fix --apply * chore: run flutter format . * chore: remove unused code in example * chore: remove unused import * chore: remove unused code * Starter app (#251) * chore: Update pubspec.yaml files to support Flutter 3 * chore: run dart fix --apply * chore: migrate Scrollbar to Flutter 3 * chore: update flutter_lints & subsequent fixes * feat: add missing functions to MacosColor the Color class has a number of functions that MacosColor had not implemented * chore: use super parameters * chore: update changelog * chore: tweak example app Uses the new PlatformMenuBar. Also update product name. * chore: small changelog tweak * chore: run flutter format . * chore: run dart fix --apply * chore: run flutter format . * chore: remove unused code in example * chore: remove unused import * feat: first pass at starter app brick * chore: improve starter app brick * chore: fix widget test in starter app * feat: conditional prompts & running pub get * chore: finalize brick * chore: run flutter format * chore: exclude starter app from analyzer * Full screen opaque toolbar issue (closes #249) (#252) * fix: don't show app window toolbar when in full screen * chore: update README * chore: update brick app window code * chore: update pubspec and changelog * chore: update actions Co-authored-by: Reuben Turner <groovinchip@gmail.com> Co-authored-by: Minas Giannekas <whiplashoo@users.noreply.github.com> * chore: repository, homepage fields * chore: update readme * feat(starter_app): Version 1.1.0 * feat(starter_app): multi-window support * feat: starter_app 1.2.1 * chore: move brick to its own repo & go back to old pana action * Expand remaining part of row in MacosListTile (#265) * Expand remaining part of row #264 * Increment to version 1.4.2 * 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 * fix: Correct the placement of the leading widget in disclosure sidebar items (#272) * chore: Update changelog * test: fix issues with date_picker_test * Account for cases where the month and the day are the same * Fix offstage warnings by removing tester taps that disabled the caret controls * Update Actions (#279) * Update flutter_analysis.yml * Update dart_code_metrics.yaml * Update gh_pages.yml * Update pana_analysis.yml * Update codecov.yaml * fix syntax issue * Version 1.6.0 - `MacosTabView` & `MacosSegmentedControl` (#273) * feat: MacosTabView & MacosSegmentedControl * chore: fixup scripts * test: tests for segmented control & tab view * chore: remove unused code * chore: run flutter format . * chore: bump code metrics * docs: dartdoc updates * docs: fix a documentation error * chore: run flutter format . * refactor: make active property of MacosTab optional, since it is handled via MacosSegmentedControl * chore: fix import change * refactor: change colors to match default native app design * docs: update tab view screenshot in readme * chore: update README example for MacosTabView * chore: fix typo in MacosSegmentedControl * chore: fix typo in MacosSegmentedControl docstring * test: remove explicitly setting active property of MacosTabs Co-authored-by: Minas Giannekas <whiplashoo721@gmail.com> * Version 1.7.0: `MacosImageIcon` & sidebar updates (#274) * feat: MacosTabView & MacosSegmentedControl * chore: fixup scripts * test: tests for segmented control & tab view * chore: remove unused code * chore: run flutter format . * chore: bump code metrics * docs: dartdoc updates * docs: fix a documentation error * chore: run flutter format . * feat: MacosImageIcon & sidebar updates * test: fix issues with date_picker_test * Account for cases where the month and the day are the same * Fix offstage warnings by removing tester taps that disabled the caret controls * refactor: make active property of MacosTab optional, since it is handled via MacosSegmentedControl * chore: fix import change * refactor: change colors to match default native app design * docs: update tab view screenshot in readme * chore: fix README * test: fix date picker test Co-authored-by: Minas Giannekas <whiplashoo721@gmail.com> Co-authored-by: Minas Giannekas <whiplashoo@users.noreply.github.com> Co-authored-by: Jon Saw <jon.saw@gmail.com> Co-authored-by: Minas Giannekas <whiplashoo721@gmail.com>
1 parent 692cb3d commit 77d7c0e

15 files changed

+283
-37
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## [1.7.0]
2+
* ✨ New
3+
* `MacosImageIcon` widget. Identical to the `ImageIcon` from `flutter/widgets.dart` except it will obey a
4+
`MacosIconThemeData` instead of an `IconThemeData`
5+
* `SidebarItemSize` enum, which determines the height of sidebar items and the maximum size their `leading` widgets.
6+
* `SidebarItem` now accepts an optional `trailing` widget.
7+
* 🔄 Updated
8+
* `SidebarItems` now supports `SidebarItemSize` via the `itemSize` property, which defaults to
9+
`SidebarItemSize.medium`. The widget has been updated to manage the item's height, the maximum size of the item's
10+
leading widget, and the font size of the item's label widget according to the given `SidebarItemSize`.
11+
* The example app has been tweaked to use some icons from the SF Symbols 4 Beta via the new `MacosImageIcon` widget.
12+
113
## [1.6.0]
214
* New widgets: `MacosTabView` and `MacosTabView`
315
* BREAKING CHANGE: `Label.yAxis` has been renamed to `Label.crossAxisAlignment`

‎example/assets/sf_symbols/button_programmable_2x.png‎

1.57 KB
Loading

‎example/assets/sf_symbols/character_cursor_ibeam_2x.png‎

969 Bytes
Loading

‎example/assets/sf_symbols/filemenu_and_selection_2x.png‎

847 Bytes
Loading

‎example/assets/sf_symbols/lines_measurement_horizontal_2x.png‎

686 Bytes
Loading

‎example/assets/sf_symbols/rectangle_3_group_2x.png‎

1.01 KB
Loading

‎example/lib/main.dart‎

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -176,47 +176,77 @@ class _WidgetGalleryState extends State<WidgetGallery> {
176176
currentIndex: pageIndex,
177177
onChanged: (i) => setState(() => pageIndex = i),
178178
scrollController: controller,
179-
items: const [
180-
SidebarItem(
181-
leading: MacosIcon(CupertinoIcons.square_on_circle),
179+
itemSize: SidebarItemSize.large,
180+
items: [
181+
const SidebarItem(
182+
// leading: MacosIcon(CupertinoIcons.square_on_circle),
183+
leading: MacosImageIcon(
184+
AssetImage(
185+
'assets/sf_symbols/button_programmable_2x.png',
186+
),
187+
),
182188
label: Text('Buttons'),
183189
),
184-
SidebarItem(
185-
leading: MacosIcon(CupertinoIcons.arrow_2_circlepath),
190+
const SidebarItem(
191+
leading: MacosImageIcon(
192+
AssetImage(
193+
'assets/sf_symbols/lines_measurement_horizontal_2x.png',
194+
),
195+
),
186196
label: Text('Indicators'),
187197
),
188-
SidebarItem(
189-
leading: MacosIcon(CupertinoIcons.textbox),
198+
const SidebarItem(
199+
leading: MacosImageIcon(
200+
AssetImage(
201+
'assets/sf_symbols/character_cursor_ibeam_2x.png',
202+
),
203+
),
190204
label: Text('Fields'),
191205
),
192206
SidebarItem(
193-
leading: Icon(CupertinoIcons.folder),
194-
label: Text('Disclosure'),
207+
leading: const MacosIcon(CupertinoIcons.folder),
208+
label: const Text('Disclosure'),
209+
trailing: Text(
210+
'2',
211+
style: TextStyle(
212+
color: MacosTheme.brightnessOf(context) == Brightness.dark
213+
? MacosColors.tertiaryLabelColor.darkColor
214+
: MacosColors.tertiaryLabelColor,
215+
),
216+
),
195217
disclosureItems: [
196-
SidebarItem(
197-
leading: MacosIcon(CupertinoIcons.infinite),
218+
const SidebarItem(
219+
leading: MacosImageIcon(
220+
AssetImage(
221+
'assets/sf_symbols/rectangle_3_group_2x.png',
222+
),
223+
),
198224
label: Text('Colors'),
199225
),
200-
SidebarItem(
226+
const SidebarItem(
201227
leading: MacosIcon(CupertinoIcons.infinite),
202228
label: Text('Item 3'),
203229
),
204230
],
205231
),
206-
SidebarItem(
207-
leading: MacosIcon(CupertinoIcons.rectangle),
232+
const SidebarItem(
233+
leading: MacosIcon(CupertinoIcons.square_on_square),
208234
label: Text('Dialogs & Sheets'),
209235
),
210-
SidebarItem(
236+
const SidebarItem(
211237
leading: MacosIcon(CupertinoIcons.macwindow),
212238
label: Text('Toolbar'),
213239
),
214-
SidebarItem(
215-
leading: MacosIcon(CupertinoIcons.calendar),
240+
const SidebarItem(
241+
leading: MacosImageIcon(
242+
AssetImage(
243+
'assets/sf_symbols/filemenu_and_selection_2x.png',
244+
),
245+
),
216246
label: Text('Selectors'),
217247
),
218-
SidebarItem(
219-
leading: MacosIcon(CupertinoIcons.table_fill),
248+
const SidebarItem(
249+
leading: MacosIcon(CupertinoIcons.uiwindow_split_2x1),
220250
label: Text('TabView'),
221251
),
222252
],

‎example/pubspec.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ packages:
4949
name: cupertino_icons
5050
url: "https://pub.dartlang.org"
5151
source: hosted
52-
version: "1.0.4"
52+
version: "1.0.5"
5353
fake_async:
5454
dependency: transitive
5555
description:
@@ -87,7 +87,7 @@ packages:
8787
path: ".."
8888
relative: true
8989
source: path
90-
version: "1.6.0"
90+
version: "1.7.0"
9191
matcher:
9292
dependency: transitive
9393
description:
@@ -129,7 +129,7 @@ packages:
129129
name: provider
130130
url: "https://pub.dartlang.org"
131131
source: hosted
132-
version: "6.0.2"
132+
version: "6.0.3"
133133
sky_engine:
134134
dependency: transitive
135135
description: flutter

‎example/pubspec.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ dependencies:
1010
flutter:
1111
sdk: flutter
1212

13-
cupertino_icons: ^1.0.4
13+
cupertino_icons: ^1.0.5
1414
macos_ui:
1515
path: ..
16-
provider: ^6.0.2
16+
provider: ^6.0.3
1717

1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
2121
flutter_lints: ^2.0.1
22+
23+
flutter:
24+
assets:
25+
- assets/sf_symbols/

‎lib/macos_ui.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export 'src/buttons/toolbar/toolbar_pulldown_button.dart';
3030
export 'src/dialogs/macos_alert_dialog.dart';
3131
export 'src/fields/search_field.dart';
3232
export 'src/fields/text_field.dart';
33+
export 'src/icon/image_icon.dart';
3334
export 'src/icon/macos_icon.dart';
3435
export 'src/indicators/capacity_indicators.dart';
3536
export 'src/indicators/progress_indicators.dart';

0 commit comments

Comments
 (0)