Skip to content

Commit

Permalink
Version 1.7.4 (#295)
Browse files Browse the repository at this point in the history
* 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>

* 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)

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>
Co-authored-by: st merlhin <77164238+stMerlHin@users.noreply.github.com>
Co-authored-by: jtdLab <72231111+jtdLab@users.noreply.github.com>
  • Loading branch information
6 people authored Aug 20, 2022
1 parent fd8d3ed commit de69606
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 37 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## [1.7.4]
* Added `backgroundColor` to `MacosSheet`

## [1.7.3]
* Fixed an issue where the `title` property of `TitleBar` did not apply a fitting `DefaultTextStyle`

Expand Down
48 changes: 19 additions & 29 deletions example/lib/pages/dialogs_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ class _DialogsPageState extends State<DialogsPage> {
onPressed: () {
showMacosSheet(
context: context,
builder: (_) => const MacosuiSheet(),
barrierDismissible: true,
builder: (_) => const DemoSheet(),
);
},
),
Expand Down Expand Up @@ -206,8 +207,8 @@ class _DoNotNotifyRowState extends State<DoNotNotifyRow> {
}
}

class MacosuiSheet extends StatelessWidget {
const MacosuiSheet({super.key});
class DemoSheet extends StatelessWidget {
const DemoSheet({super.key});

@override
Widget build(BuildContext context) {
Expand All @@ -227,34 +228,23 @@ class MacosuiSheet extends StatelessWidget {
),
),
const SizedBox(height: 24),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: const [
MacosListTile(
leading: MacosIcon(CupertinoIcons.lightbulb),
title: Text(
'A robust library of Flutter components for macOS',
//style: MacosTheme.of(context).typography.headline,
),
subtitle: Text(
'Create native looking macOS applications using Flutter',
),
),
],
const MacosListTile(
leading: MacosIcon(CupertinoIcons.lightbulb),
title: Text(
'A robust library of Flutter components for macOS',
//style: MacosTheme.of(context).typography.headline,
),
subtitle: Text(
'Create native looking macOS applications using Flutter',
),
),
const SizedBox(height: 16),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: const [
MacosListTile(
leading: MacosIcon(CupertinoIcons.bolt),
title: Text(
'Create beautiful macOS applications in minutes',
//style: MacosTheme.of(context).typography.headline,
),
),
SizedBox(width: 10),
],
const MacosListTile(
leading: MacosIcon(CupertinoIcons.bolt),
title: Text(
'Create beautiful macOS applications in minutes',
//style: MacosTheme.of(context).typography.headline,
),
),
const Spacer(),
PushButton(
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.7.3"
version: "1.7.4"
matcher:
dependency: transitive
description:
Expand Down
21 changes: 17 additions & 4 deletions lib/src/sheets/macos_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class MacosSheet extends StatelessWidget {
this.insetPadding = _defaultInsetPadding,
this.insetAnimationDuration = const Duration(milliseconds: 100),
this.insetAnimationCurve = Curves.decelerate,
this.backgroundColor,
});

/// The widget below this widget in the tree.
Expand All @@ -36,6 +37,17 @@ class MacosSheet extends StatelessWidget {
/// into the space that the dialog is placed in.
final Curve insetAnimationCurve;

/// The background color for this widget.
///
/// Defaults to
/// ```dart
/// brightness.resolve(
/// CupertinoColors.systemGrey6.color,
/// MacosColors.controlBackgroundColor.darkColor,
/// )
/// ```
final Color? backgroundColor;

@override
Widget build(BuildContext context) {
assert(debugCheckHasMacosTheme(context));
Expand All @@ -60,10 +72,11 @@ class MacosSheet extends StatelessWidget {
curve: insetAnimationCurve,
child: DecoratedBox(
decoration: BoxDecoration(
color: brightness.resolve(
CupertinoColors.systemGrey6.color,
MacosColors.controlBackgroundColor.darkColor,
),
color: backgroundColor ??
brightness.resolve(
CupertinoColors.systemGrey6.color,
MacosColors.controlBackgroundColor.darkColor,
),
borderRadius: _kSheetBorderRadius,
),
child: Container(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ packages:
name: dart_code_metrics
url: "https://pub.dartlang.org"
source: hosted
version: "4.17.0"
version: "4.17.1"
dart_style:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: macos_ui
description: Flutter widgets and themes implementing the current macOS design language.
version: 1.7.3
version: 1.7.4
homepage: "https://macosui.dev"
repository: "https://github.com/GroovinChip/macos_ui"

Expand All @@ -15,7 +15,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
dart_code_metrics: ^4.17.0
dart_code_metrics: ^4.17.1
flutter_lints: ^2.0.1
mocktail: ^0.3.0

Expand Down

0 comments on commit de69606

Please sign in to comment.