From 02cd1834030e70c8fb2069c3837722d5cfded8c0 Mon Sep 17 00:00:00 2001 From: Reuben Turner Date: Fri, 3 Feb 2023 12:16:46 -0500 Subject: [PATCH] Version 1.9.1 (#341) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 * 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 * 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 Co-authored-by: Minas Giannekas * 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 https://github.com/GroovinChip/macos_ui/issues/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 * 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 * chore: fix typo in pr template * feat: gh action to auto-generate releases on push to stable * chore: update release action with latest from stable * feat: add action to publish to pub * docs: update readme * Addresses #237 * Adds MacosColorWell to selectors section * Adds code snippets for date & time pickers * fix: 1.7.1 Fixes issue where end sidebar window breakpoint wasn’t being respected * Tab view padding (#285) * fix: use prepared title wrapped with a DefaultTextStyle instead of the raw title (#289) * chore: fix typo Closes #290 * feat: add `backgroundColor` to `MacosSheet` (#291) * chore: fix Flutter 3.3 warnings * fix: address ScrollController bug in MacosPopupButton (#300) * fix(tests): account for Jan -> Dec & Dec -> Jan date_picker_test.dart was failing due to not accounting for going from January to December and vice-versa. * fix(plugin): Ensure the native color panel releases when closed * Update flutter_analysis.yml Closes #334 * Various bug fixes & minor updates (#338) * Macos slider (#337) * chore: run flutter format . * chore: fix analysis * chore: Bump version and update CHANGELOG.md * chore: Update images to self taken ones as MacOS images are outdated * fix: fix position offset by a small value * fix: PR review feedback * Update lib/src/indicators/slider.dart --------- Co-authored-by: Reuben Turner * Adds `intialDate` to `MacosDatePicker` (#329) * Adds `intialDate` to `MacosDatePicker` * Bumps `macos_ui` version to `1.7.7` * Apply suggestions from code review * spelling correction --------- Co-authored-by: Reuben Turner --------- Co-authored-by: Minas Giannekas Co-authored-by: Jon Saw Co-authored-by: Minas Giannekas Co-authored-by: st merlhin <77164238+stMerlHin@users.noreply.github.com> Co-authored-by: jtdLab <72231111+jtdLab@users.noreply.github.com> Co-authored-by: Norbert Kozsir Co-authored-by: Elijah Luckey --- CHANGELOG.md | 35 +++++++++++++----------- README.md | 2 +- example/pubspec.lock | 2 +- lib/src/selectors/date_picker.dart | 12 +++++++-- pubspec.yaml | 2 +- test/selectors/date_picker_test.dart | 40 +++++++++++++++++++++++++++- 6 files changed, 71 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e63f9e..343ebb3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ +## [1.9.1] +* Adds optional `initialDate` to `MacosDatePicker` + ## [1.9.0] * Implement `MacosSlider` ## [1.8.0] 🚨 Breaking Changes 🚨 -* `ContentArea.builder` has been changed from a `ScrollableWidgetBuilder` to a `WidgetBuilder` due to +* `ContentArea.builder` has been changed from a `ScrollableWidgetBuilder` to a `WidgetBuilder` due to changes in Flutter 3.7. The `MacosScrollBar` widget needs to undergo radical changes in order to achieve the native macOS scrollbar look and feel in the future, so this will be revisited at that time. @@ -34,20 +37,20 @@ Other changes ## [1.7.0] * ✨ New - * `MacosImageIcon` widget. Identical to the `ImageIcon` from `flutter/widgets.dart` except it will obey a + * `MacosImageIcon` widget. Identical to the `ImageIcon` from `flutter/widgets.dart` except it will obey a `MacosIconThemeData` instead of an `IconThemeData` * `SidebarItemSize` enum, which determines the height of sidebar items and the maximum size their `leading` widgets. * `SidebarItem` now accepts an optional `trailing` widget. * 🔄 Updated - * `SidebarItems` now supports `SidebarItemSize` via the `itemSize` property, which defaults to -`SidebarItemSize.medium`. The widget has been updated to manage the item's height, the maximum size of the item's + * `SidebarItems` now supports `SidebarItemSize` via the `itemSize` property, which defaults to +`SidebarItemSize.medium`. The widget has been updated to manage the item's height, the maximum size of the item's leading widget, and the font size of the item's label widget according to the given `SidebarItemSize`. * The example app has been tweaked to use some icons from the SF Symbols 4 Beta via the new `MacosImageIcon` widget. ## [1.6.0] * New widgets: `MacosTabView` and `MacosTabView` * BREAKING CHANGE: `Label.yAxis` has been renamed to `Label.crossAxisAlignment` -* BREAKING CHANGE: `TooltipTheme` and `TooltipThemeData` have been renamed to `MacosTooltipTheme` and +* BREAKING CHANGE: `TooltipTheme` and `TooltipThemeData` have been renamed to `MacosTooltipTheme` and `MacosTooltipThemeData` ## [1.5.1] @@ -64,14 +67,14 @@ leading widget, and the font size of the item's label widget according to the gi * Update `pubspec.yaml` with `repository` and new `homepage` field. ## [1.4.1] -* Fixes an issue where if the app was displayed in full screen mode, an opaque empty toolbar would appear at the top [#249](https://github.com/GroovinChip/macos_ui/issues/249) - +* Fixes an issue where if the app was displayed in full screen mode, an opaque empty toolbar would appear at the top [#249](https://github.com/GroovinChip/macos_ui/issues/249) + ## [1.4.0] * Migration to Flutter 3.0 * Minimum dart sdk version is now 2.17.0 * Use new super parameters feature * Update to `flutter_lints: ^2.0.1` with subsequent fixes - * `MacosScrollbar` API more closely matches its material counterpart + * `MacosScrollbar` API more closely matches its material counterpart * Update `MacosColor` to more closely match the `Color` class * Adds `MacosColor.fromARGB` constructor * Adds `MacosColor.fromRGBO` constructor @@ -86,7 +89,7 @@ leading widget, and the font size of the item's label widget according to the gi * Fix `MacosApp` documentation ## [1.2.1] -* Fixes issue with error thrown when toolbar actions are modified programmatically [#239](https://github.com/GroovinChip/macos_ui/issues/239) +* Fixes issue with error thrown when toolbar actions are modified programmatically [#239](https://github.com/GroovinChip/macos_ui/issues/239) ## [1.2.0] * Improved styling for `MacosTooltip`: @@ -144,7 +147,7 @@ leading widget, and the font size of the item's label widget according to the gi * Switch over to `flutter_lints` ## [0.12.4+1] -* Improve visual design of `MacosPopupButton` and `MacosPulldownButton`, to better match the styling and translucency effect of Apple design. +* Improve visual design of `MacosPopupButton` and `MacosPulldownButton`, to better match the styling and translucency effect of Apple design. * Remove unnecessary properties of `MacosPopupButton` ## [0.12.4] @@ -194,7 +197,7 @@ leading widget, and the font size of the item's label widget according to the gi ## [0.10.0] * New widget - `MacosIcon`! `MacosIcon` is identical to regular icons, with the exception that it respects a `MacosTheme`. Also includes corresponding theme classes -* `MacosThemeData` now sets a global, configurable `iconTheme` for `MacosIcon`s +* `MacosThemeData` now sets a global, configurable `iconTheme` for `MacosIcon`s ## [0.9.3] * Update to `PushButton`: @@ -257,7 +260,7 @@ leading widget, and the font size of the item's label widget according to the gi ## [0.6.0] * Improved `MacosAlertDialog` design * Added `showMacosAlertDialog` to display a `MacosAlertDialog` with standard macOS animations and behaviour. - + ## [0.5.2] * Fixes maximum height issue with `MacosAlertDialog` @@ -372,11 +375,11 @@ leading widget, and the font size of the item's label widget according to the gi ## [0.0.4] * Major theme refactor that more closely resembles flutter/material and flutter/cupertino * The `Style` class is now `MacosThemeData` - * `MacosTheme` is now a `StatelessWidget` that returns a private `_InheritedMacosTheme`. + * `MacosTheme` is now a `StatelessWidget` that returns a private `_InheritedMacosTheme`. The static `MacosTheme.of(context)` is now defined here. - * `MacosApp` now takes a `theme` and `darkTheme` rather than `style` and `darkStyle`. - Additionally, there are minor changes to the way `MacosApp` is built that more closely - resemble how `MaterialApp` is built. + * `MacosApp` now takes a `theme` and `darkTheme` rather than `style` and `darkStyle`. + Additionally, there are minor changes to the way `MacosApp` is built that more closely + resemble how `MaterialApp` is built. ## [0.0.3] diff --git a/README.md b/README.md index f88241c4..a697ca0c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Guides, codelabs, and other documentation can be found at https://macosui.dev -## 🚨 Usage notes +## 🚨 Usage notes ### Platform Compatibility pub.dev shows that `macos_ui` only supports macOS. This is because `macos_ui` calls some native code, and therefore diff --git a/example/pubspec.lock b/example/pubspec.lock index 47da932b..b0517c99 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -97,7 +97,7 @@ packages: path: ".." relative: true source: path - version: "1.9.0" + version: "1.9.1" matcher: dependency: transitive description: diff --git a/lib/src/selectors/date_picker.dart b/lib/src/selectors/date_picker.dart index 32c1501d..d11d3d4b 100644 --- a/lib/src/selectors/date_picker.dart +++ b/lib/src/selectors/date_picker.dart @@ -43,6 +43,7 @@ class MacosDatePicker extends StatefulWidget { super.key, this.style = DatePickerStyle.combined, required this.onDateChanged, + this.initialDate, }); /// The [DatePickerStyle] to use. @@ -53,12 +54,19 @@ class MacosDatePicker extends StatefulWidget { /// {macro onDateChanged} final OnDateChanged onDateChanged; + /// Set an initial date for the picker. + /// + /// Defaults to `DateTime.now()`. + final DateTime? initialDate; + @override State createState() => _MacosDatePickerState(); } class _MacosDatePickerState extends State { - final _initialDate = DateTime.now(); + final _today = DateTime.now(); + late final _initialDate = widget.initialDate ?? _today; + late int _selectedDay; late int _selectedMonth; late int _selectedYear; @@ -474,7 +482,7 @@ class _MacosDatePickerState extends State { DateTime(_selectedYear, _selectedMonth, _selectedDay), dayToBuild, ); - final isToday = DateUtils.isSameDay(_initialDate, dayToBuild); + final isToday = DateUtils.isSameDay(_today, dayToBuild); BoxDecoration? decoration; Widget? dayText; diff --git a/pubspec.yaml b/pubspec.yaml index db2162f8..4ffe3e99 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: macos_ui description: Flutter widgets and themes implementing the current macOS design language. -version: 1.9.0 +version: 1.9.1 homepage: "https://macosui.dev" repository: "https://github.com/GroovinChip/macos_ui" diff --git a/test/selectors/date_picker_test.dart b/test/selectors/date_picker_test.dart index 5823869e..80e00bf8 100644 --- a/test/selectors/date_picker_test.dart +++ b/test/selectors/date_picker_test.dart @@ -6,7 +6,45 @@ import 'package:macos_ui/macos_ui.dart'; void main() { group('MacosDatePicker tests', () { testWidgets( - 'Textual MacosDatePicker renders the expected date', + 'Textual MacosDatePicker renders the expected initial date', + (tester) async { + final initialDate = DateTime.now().add(const Duration(days: 30)); + await tester.pumpWidget( + MacosApp( + home: MacosWindow( + child: MacosScaffold( + children: [ + ContentArea( + builder: (context) { + return Center( + child: MacosDatePicker( + onDateChanged: (date) {}, + initialDate: initialDate, + style: DatePickerStyle.textual, + ), + ); + }, + ), + ], + ), + ), + ), + ); + + expect(find.text('/'), findsNWidgets(2)); + expect(find.text('${initialDate.year}'), findsOneWidget); + if (initialDate.month == initialDate.day) { + expect(find.text('${initialDate.day}'), findsNWidgets(2)); + expect(find.text('${initialDate.month}'), findsNWidgets(2)); + } else { + expect(find.text('${initialDate.day}'), findsOneWidget); + expect(find.text('${initialDate.month}'), findsOneWidget); + } + }, + ); + + testWidgets( + "Textual MacosDatePicker renders the today's date by default", (tester) async { final today = DateTime.now(); await tester.pumpWidget(