Merge branch 'master' into order-ui

# Conflicts: # app/pubspec.lock # apple_passkit/example/pubspec.lock # passkit/lib/passkit.dart # passkit/lib/src/order/pk_order.dart # passkit_ui/example/pubspec.lock # passkit_ui/pubspec.yaml
ueman · Oct 11, 2024 · 64b52ba · 64b52ba
2 parents b8d7ce2 + b9913aa
commit 64b52ba
Show file tree

Hide file tree

Showing 55 changed files with 2,145 additions and 353 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,10 @@
 
 This repo contains various packages to deal with PkPass files.
 
-| Package                          | Description                                                            | Pub.dev                                | Version                                                                                                  |
-|----------------------------------|------------------------------------------------------------------------|----------------------------------------|----------------------------------------------------------------------------------------------------------|
-| [`app`](app)                     | App which makes use of the various libraries. Android only.            |                                        |                                                                                                          |
-| [`apple_passkit`](apple_passkit) | Package to interface with the native functionality on iOS              | https://pub.dev/packages/apple_passkit | [![pub package](https://img.shields.io/pub/v/apple_passkit.svg)](https://pub.dev/packages/apple_passkit) |
-| [`passkit`](passkit)             | Pure Dart package to read PkPass files. Can be used on server side too | https://pub.dev/packages/passkit       | [![pub package](https://img.shields.io/pub/v/passkit.svg)](https://pub.dev/packages/passkit)             |
-| [`passkit_ui`](passkit_ui)       | Pure Flutter package to show PkPass files. Makes use of `passkit`      | https://pub.dev/packages/passkit_ui    | [![pub package](https://img.shields.io/pub/v/passkit_ui.svg)](https://pub.dev/packages/passkit_ui)       |
+| Package                            | Description                                                            | Version                                                                                                    | Likes                                                                                                      | Popularity                                                                                                           | Points                                                                                                           |
+| ---------------------------------- | ---------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
+| [`app`](app)                       | App which makes use of the various libraries. Android only.            |                                                                                                            |                                                                                                            |                                                                                                                      |                                                                                                                  |
+| [`apple_passkit`](apple_passkit)   | Package to interface with the native functionality on iOS              | [![pub package](https://img.shields.io/pub/v/apple_passkit.svg)](https://pub.dev/packages/apple_passkit)   | [![likes](https://img.shields.io/pub/likes/apple_passkit)](https://pub.dev/packages/apple_passkit/score)   | [![popularity](https://img.shields.io/pub/popularity/apple_passkit)](https://pub.dev/packages/apple_passkit/score)   | [![pub points](https://img.shields.io/pub/points/apple_passkit)](https://pub.dev/packages/apple_passkit/score)   |
+| [`passkit_server`](passkit_server) | Dart package to add PassKit enpoints to a shelf server.                | [![pub package](https://img.shields.io/pub/v/passkit_server.svg)](https://pub.dev/packages/passkit_server) | [![likes](https://img.shields.io/pub/likes/passkit_server)](https://pub.dev/packages/passkit_server/score) | [![popularity](https://img.shields.io/pub/popularity/passkit_server)](https://pub.dev/packages/passkit_server/score) | [![pub points](https://img.shields.io/pub/points/passkit_server)](https://pub.dev/packages/passkit_server/score) |
+| [`passkit_ui`](passkit_ui)         | Pure Flutter package to show PkPass files. Makes use of `passkit`      | [![pub package](https://img.shields.io/pub/v/passkit_ui.svg)](https://pub.dev/packages/passkit_ui)         | [![likes](https://img.shields.io/pub/likes/passkit_ui)](https://pub.dev/packages/passkit_ui/score)         | [![popularity](https://img.shields.io/pub/popularity/passkit_ui)](https://pub.dev/packages/passkit_ui/score)         | [![pub points](https://img.shields.io/pub/points/passkit_ui)](https://pub.dev/packages/passkit_ui/score)         |
+| [`passkit`](passkit)               | Pure Dart package to read PkPass files. Can be used on server side too | [![pub package](https://img.shields.io/pub/v/passkit.svg)](https://pub.dev/packages/passkit)               | [![likes](https://img.shields.io/pub/likes/passkit)](https://pub.dev/packages/passkit/score)               | [![popularity](https://img.shields.io/pub/popularity/passkit)](https://pub.dev/packages/passkit/score)               | [![pub points](https://img.shields.io/pub/points/passkit)](https://pub.dev/packages/passkit/score)               |
diff --git a/app/lib/import_pass/import_page.dart b/app/lib/import_pass/import_page.dart
@@ -22,7 +22,7 @@ class PkPassImportSource {
 
   final String? contentResolverPath;
   final String? filePath;
-  final List<int>? bytes;
+  final Uint8List? bytes;
 
   Future<PkPass> getPass() async {
     if (contentResolverPath != null) {
@@ -101,7 +101,7 @@ class _ImportPassPageState extends State<ImportPassPage> {
               await db.passEntryDao.insertPassEntry(
                 PassEntry(
                   id: pass!.pass.serialNumber,
-                  pass: Uint8List.fromList(pass!.sourceData),
+                  pass: pass!.sourceData!,
                   description: pass!.pass.description,
                 ),
               );

diff --git a/app/lib/pass_backside/pass_backside_page.dart b/app/lib/pass_backside/pass_backside_page.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:app/db/db.dart';
 import 'package:app/db/pass_entry.dart';
@@ -17,10 +16,10 @@ import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:geocoding/geocoding.dart' as geocoding;
 import 'package:passkit/passkit.dart';
 import 'package:passkit_ui/passkit_ui.dart';
+import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:path/path.dart' as p;
 
 class PassBackSidePageArgs {
   PassBackSidePageArgs(this.pass, this.showDelete);
@@ -49,7 +48,6 @@ class PassBacksidePage extends StatefulWidget {
       PassType.eventTicket => pass.pass.eventTicket?.backFields,
       PassType.generic => pass.pass.generic?.backFields,
       PassType.storeCard => pass.pass.storeCard?.backFields,
-      PassType.unknown => null,
     };
   }
 }
@@ -229,15 +227,15 @@ class _PassBacksidePageState extends State<PassBacksidePage> {
       PassEntry(
         id: updatedPass.pass.serialNumber,
         description: updatedPass.pass.description,
-        pass: Uint8List.fromList(updatedPass.sourceData),
+        pass: updatedPass.sourceData!,
       ),
     );
 
     unawaited(passListNotifier.loadPasses());
   }
 
   void _sharePass() {
-    final data = Uint8List.fromList(widget.pass.sourceData);
+    final data = widget.pass.sourceData!;
     Share.shareXFiles([XFile.fromData(data)]);
   }
 

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -5,18 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "67.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.1"
+    version: "6.7.0"
   android_intent_plus:
     dependency: "direct main"
     description:
@@ -109,18 +114,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
+      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.11"
+    version: "2.4.12"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.1"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -225,14 +230,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.8"
   dart_style:
     dependency: transitive
     description:
@@ -593,18 +590,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -645,6 +642,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
@@ -657,18 +662,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
@@ -707,7 +712,7 @@ packages:
       path: "../passkit"
       relative: true
     source: path
-    version: "0.0.6"
+    version: "0.0.7"
   passkit_ui:
     dependency: "direct main"
     description:
@@ -831,10 +836,10 @@ packages:
     dependency: transitive
     description:
       name: process_run
-      sha256: c917dfb5f7afad4c7485bc00a4df038621248fce046105020cea276d1a87c820
+      sha256: "112a77da35be50617ed9e2230df68d0817972f225e7f97ce8336f76b4e601606"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   pub_semver:
     dependency: transitive
     description:
@@ -1044,10 +1049,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4"
+      sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.4+2"
   sqflite_common_ffi:
     dependency: transitive
     description:
@@ -1060,10 +1065,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common_ffi_web
-      sha256: e9d1cb35a5ff7c43072968ed734e0a1a859564fd2b2c8654e0c6244a57dc82a8
+      sha256: "5aa15408f29eca8cc8dcca653c38d66cf9a5fb5a2c1e9826a75ce4ae4938dec1"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.4"
+    version: "0.4.5+2"
   sqlite3:
     dependency: transitive
     description:
@@ -1132,10 +1137,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
+      sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0+1"
+    version: "3.2.0"
   term_glyph:
     dependency: transitive
     description:
@@ -1148,10 +1153,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   timezone:
     dependency: transitive
     description:
@@ -1196,10 +1201,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79
+      sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.9"
+    version: "6.3.10"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1268,10 +1273,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
   wakelock_plus:
     dependency: "direct main"
     description:
@@ -1353,5 +1358,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.22.3"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.1"