Skip to content

Commit 9c8ed13

Browse files
GroovinChipwhiplashoojonsaw
authored
1.5.1 & Update actions (#280)
* 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 Co-authored-by: Minas Giannekas <whiplashoo@users.noreply.github.com> Co-authored-by: Jon Saw <jon.saw@gmail.com>
1 parent 75707a4 commit 9c8ed13

File tree

11 files changed

+44
-47
lines changed

11 files changed

+44
-47
lines changed

‎.github/workflows/codecov.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
GITHUB_TOKEN: ${{ github.token }}
1515
steps:
1616
- uses: actions/checkout@master
17-
- uses: subosito/flutter-action@v1
17+
- uses: subosito/flutter-action@v2
1818
with:
1919
channel: stable
2020
- name: Get flutter packages
@@ -24,7 +24,7 @@ jobs:
2424
- name: Upload coverage to Codecov
2525
run: curl -s https://codecov.io/bash
2626
shell: bash
27-
- uses: codecov/codecov-action@v2
27+
- uses: codecov/codecov-action@v3
2828
with:
2929
token: ${{secrets.CODECOV_TOKEN}}
30-
file: ./coverage/lcov.info
30+
files: ./coverage/lcov.info

‎.github/workflows/dart_code_metrics.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ jobs:
66
runs-on: ubuntu-latest
77

88
steps:
9-
- uses: actions/checkout@v2
10-
- name: Install Flutter
11-
uses: subosito/flutter-action@master
12-
with:
13-
channel: stable
9+
- uses: actions/checkout@v3
1410

15-
- name: Check directory
16-
run: ls
17-
- name: Install Code Metrics
18-
run: flutter pub global activate dart_code_metrics
19-
- name: Run Code Metrics
20-
run: flutter pub global run dart_code_metrics:metrics --reporter=github lib
11+
- name: Run Dart Code Metrics
12+
uses: dart-code-checker/dart-code-metrics-action@v2
13+
with:
14+
github_token: ${{ secrets.GITHUB_TOKEN }}
15+
pull_request_comment: true
16+
fatal_warnings: true
17+
fatal_performance: true
18+
fatal_style: true

‎.github/workflows/flutter_analysis.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ jobs:
66
runs-on: ubuntu-latest
77

88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v3
1010
- name: Install Flutter
11-
uses: subosito/flutter-action@master
11+
uses: subosito/flutter-action@v2
1212
with:
1313
channel: stable
1414

15-
- name: install dependencies
15+
- name: Install dependencies
1616
run: flutter pub get
1717

18-
- name: format code
18+
- name: Format code
1919
run: flutter format --set-exit-if-changed .
2020

21-
- name: analyze code
22-
run: flutter analyze .
21+
- name: Analyze code
22+
run: flutter analyze --fatal-infos .
2323

24-
- name: test code
24+
- name: Test code
2525
run: flutter test
2626

‎.github/workflows/gh_pages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
env:
1414
GITHUB_TOKEN: ${{ github.token }}
1515
steps:
16-
- uses: actions/checkout@v2
17-
- uses: subosito/flutter-action@v1
16+
- uses: actions/checkout@v3
17+
- uses: subosito/flutter-action@v2
1818
with:
1919
channel: stable
2020
- name: Install Dependencies
@@ -33,4 +33,4 @@ jobs:
3333
git checkout -b gh-pages
3434
git add .
3535
git commit -m "update"
36-
git push --force secure-origin gh-pages
36+
git push --force secure-origin gh-pages

‎.github/workflows/pana_analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77

88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v3
1010

1111
- uses: axel-op/dart-package-analyzer@v3
1212
# set an id for the current step
@@ -33,4 +33,4 @@ jobs:
3333
env:
3434
JSON_OUTPUT: ${{ steps.analysis.outputs.json_output }}
3535
run: |
36-
TOTAL_SCORE=$(jq -r '.scores.grantedPoints' <<< "$JSON_OUTPUT")
36+
TOTAL_SCORE=$(jq -r '.scores.grantedPoints' <<< "$JSON_OUTPUT")

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.5.1]
2+
* Correct the placement of the leading widget in disclosure sidebar items [#268](https://github.com/GroovinChip/macos_ui/issues/268)
3+
* Improve the sizing of the disclosure item indicator
4+
15
## [1.5.0]
26
* Adds `endSidebar` to `MacosWindow`
37

‎example/lib/main.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ class _WidgetGalleryState extends State<WidgetGallery> {
188188
label: Text('Fields'),
189189
),
190190
SidebarItem(
191+
leading: Icon(CupertinoIcons.folder),
191192
label: Text('Disclosure'),
192193
disclosureItems: [
193194
SidebarItem(

‎example/pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ packages:
8787
path: ".."
8888
relative: true
8989
source: path
90-
version: "1.5.0"
90+
version: "1.5.1"
9191
matcher:
9292
dependency: transitive
9393
description:

‎lib/src/layout/sidebar/sidebar_items.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,20 +338,21 @@ class __DisclosureSidebarItemState extends State<_DisclosureSidebarItem>
338338
label: widget.item.label,
339339
leading: Row(
340340
children: [
341-
if (widget.item.leading != null)
342-
Padding(
343-
padding: EdgeInsets.only(right: spacing),
344-
child: widget.item.leading!,
345-
),
346341
RotationTransition(
347342
turns: _iconTurns,
348343
child: Icon(
349344
CupertinoIcons.chevron_right,
345+
size: 12.0,
350346
color: theme.brightness == Brightness.light
351347
? MacosColors.black
352348
: MacosColors.white,
353349
),
354350
),
351+
if (widget.item.leading != null)
352+
Padding(
353+
padding: EdgeInsets.only(left: spacing),
354+
child: widget.item.leading!,
355+
),
355356
],
356357
),
357358
unselectedColor: MacosColors.transparent,

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: macos_ui
22
description: Flutter widgets and themes implementing the current macOS design language.
3-
version: 1.5.0
3+
version: 1.5.1
44
homepage: "https://macosui.dev"
55
repository: "https://github.com/GroovinChip/macos_ui"
66

0 commit comments

Comments
 (0)