Merge pull request #30 from TNorbury/development

Sync dev w/ main
TNorbury · Jan 26, 2023 · ff5bb56 · ff5bb56
2 parents 1095d42 + cfd9cfd
commit ff5bb56
Show file tree

Hide file tree

Showing 18 changed files with 243 additions and 187 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.3.7",
+  "flutterSdkVersion": "3.7.0",
   "flavors": {}
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ on:
       - opened
 
 env:
-  flutter_version: 3.3.7
+  flutter_version: 3.7.0
 
 jobs:
   lint:
@@ -26,12 +26,11 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: '12'
-      - uses: actions/cache@v3
-        with:
-          path: /opt/hostedtoolcache/flutter
-          key: ${{ github.ref }}-${{ env.flutter_version }}
       - uses: subosito/flutter-action@v2
         with:
+          cache: true
+          cache-path: /opt/hostedtoolcache/flutter
+          cache-key: flutter-${{ env.flutter_version }}
           flutter-version: ${{ env.flutter_version }}
       - name: Install Dependencies
         run: flutter pub get
@@ -49,12 +48,11 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: '12'
-      - uses: actions/cache@v3
-        with:
-          path: /opt/hostedtoolcache/flutter
-          key: ${{ github.ref }}-${{ env.flutter_version }}
       - uses: subosito/flutter-action@v2
         with:
+          cache: true
+          cache-path: /opt/hostedtoolcache/flutter
+          cache-key: flutter-${{ env.flutter_version }}
           flutter-version: ${{ env.flutter_version }}
       - name: Install Dependencies
         run: flutter pub get

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,24 @@
+name: Publish to pub.dev
+
+on:
+  push:
+    tags:
+    - 'v[0-9]+.[0-9]+.[0-9]+*'
+
+jobs:
+  publish:
+    name: Publish Release to Pub.dev
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    with:
+      environment: pub.dev
+
+  release:
+    name: Create Release on GH
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ncipollo/release-action@v1
+      with:
+        generateReleaseNotes: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Changed
+- Create two named constructors for actions: `CommandPaletteAction.single` and `CommandPaletteAction.nested`. These handle the setting of the `actionType` and makes the required parameters for each explicit. The unnamed constructor has been marked as deprecated, but I have no plans to remove anytime soon.
+- upgrade to Flutter 3.7.0 and update deprecations in style
+
 ## 0.7.0 - 2023-01-22
 ### Added
 - Scroll to highlighted action

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -65,36 +65,32 @@ class _MyHomePageState extends State<MyHomePage> {
               showInstructions: true,
             ),
             actions: [
-              CommandPaletteAction(
+              CommandPaletteAction.single(
                 label: "Close Command Palette",
                 description: "Closes the command palette",
-                actionType: CommandPaletteActionType.single,
                 shortcut: ["esc"],
                 leading: Icon(Icons.close),
                 onSelect: () {
                   Navigator.of(context).pop();
                 },
               ),
-              CommandPaletteAction(
+              CommandPaletteAction.nested(
                 id: "change-theme", // ids can be strings
                 label: "Change Theme",
-                actionType: CommandPaletteActionType.nested,
                 description: "Change the color theme of the app",
                 shortcut: ["ctrl", "t"],
                 leading: Icon(Icons.format_paint),
                 childrenActions: [
-                  CommandPaletteAction(
+                  CommandPaletteAction.single(
                     label: "Light",
-                    actionType: CommandPaletteActionType.single,
                     onSelect: () {
                       setState(() {
                         themeMode = ThemeMode.light;
                       });
                     },
                   ),
-                  CommandPaletteAction(
+                  CommandPaletteAction.single(
                     label: "Dark",
-                    actionType: CommandPaletteActionType.single,
                     onSelect: () {
                       setState(() {
                         themeMode = ThemeMode.dark;
@@ -103,18 +99,16 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                 ],
               ),
-              CommandPaletteAction(
+              CommandPaletteAction.nested(
                 id: 1, // or numbers (or really anything...)
                 label: "Set User",
-                actionType: CommandPaletteActionType.nested,
                 shortcut: ["ctrl", "shift", "s"],
                 leading: Icon(Icons.account_circle),
                 childrenActions: [
                   ...["Maria", "Kurt", "Susanne", "Larissa", "Simon", "Admin"]
                       .map(
-                    (e) => CommandPaletteAction(
+                    (e) => CommandPaletteAction.single(
                       label: e,
-                      actionType: CommandPaletteActionType.single,
                       onSelect: () => setState(() {
                         _currentUser = e;
                         color = Colors.transparent;
@@ -124,19 +118,17 @@ class _MyHomePageState extends State<MyHomePage> {
                 ],
               ),
               if (_currentUser == "Admin")
-                CommandPaletteAction(
+                CommandPaletteAction.single(
                   label: "Some sorta super secret admin action",
-                  actionType: CommandPaletteActionType.single,
                   onSelect: () {
                     setState(() {
                       color = Color(Random().nextInt(0xFFFFFF)).withAlpha(255);
                     });
                   },
                 ),
               if (_currentUser.isNotEmpty)
-                CommandPaletteAction(
+                CommandPaletteAction.single(
                   label: "Log out",
-                  actionType: CommandPaletteActionType.single,
                   shortcut: ["l", "o"],
                   description: "Logs the current user out",
                   onSelect: () {

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,37 +5,42 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.10.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   command_palette:
     dependency: "direct main"
     description:
@@ -47,7 +52,8 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   flutter:
@@ -59,40 +65,53 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_lorem
-      url: "https://pub.dartlang.org"
+      sha256: "004e1af5b030b632628d8cc1eb2f90451f48b6c0080f43069f69baa4959e9fe5"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.2"
   sky_engine:
@@ -104,65 +123,74 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   substring_highlight:
     dependency: transitive
     description:
       name: substring_highlight
-      url: "https://pub.dartlang.org"
+      sha256: "96c61e8316098831f6bee87d2386617e4be6aaf87fbc89402dc049d371b67efb"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.33"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.16"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   woozy_search:
     dependency: transitive
     description:
       name: woozy_search
-      url: "https://pub.dartlang.org"
+      sha256: c453181e0c3d03002b68094fe1869a8a5033d844541d48937288a75b3b923a15
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.18.0 <4.0.0"
   flutter: ">=1.17.0"