Merge branch 'develop'

.metadata

@@ -4,20 +4,20 @@
 # This file should be version controlled.
 
 version:
- revision: 096162697a9cdc79f4e47f7230d70935fa81fd24
- channel: beta
+ revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+ channel: stable
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
  platforms:
  - platform: root
- create_revision: 096162697a9cdc79f4e47f7230d70935fa81fd24
- base_revision: 096162697a9cdc79f4e47f7230d70935fa81fd24
- - platform: windows
- create_revision: 096162697a9cdc79f4e47f7230d70935fa81fd24
- base_revision: 096162697a9cdc79f4e47f7230d70935fa81fd24
+ create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+ base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+ - platform: macos
+ create_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
+ base_revision: 4f9d92fbbdf072a70a70d2179a9f87392b94104c
 
  # User provided section
 

ios/Podfile.lock

@@ -73,7 +73,7 @@ PODS:
  - Flutter
  - path_provider_ios (0.0.1):
  - Flutter
- - "permission_handler (5.1.0+2)":
+ - permission_handler_apple (9.0.4):
  - Flutter
  - printing (1.0.0):
  - Flutter
@@ -93,6 +93,8 @@ PODS:
  - Flutter
  - sign_in_with_apple (0.0.1):
  - Flutter
+ - smart_auth (0.0.1):
+ - Flutter
  - sqflite (0.0.2):
  - Flutter
  - FMDB (>= 2.7.5)
@@ -116,12 +118,13 @@ DEPENDENCIES:
  - package_info (from `.symlinks/plugins/package_info/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
+ - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
  - printing (from `.symlinks/plugins/printing/ios`)
  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
  - share (from `.symlinks/plugins/share/ios`)
  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
+ - smart_auth (from `.symlinks/plugins/smart_auth/ios`)
  - sqflite (from `.symlinks/plugins/sqflite/ios`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
@@ -165,8 +168,8 @@ EXTERNAL SOURCES:
  :path: ".symlinks/plugins/package_info_plus/ios"
  path_provider_ios:
  :path: ".symlinks/plugins/path_provider_ios/ios"
- permission_handler:
- :path: ".symlinks/plugins/permission_handler/ios"
+ permission_handler_apple:
+ :path: ".symlinks/plugins/permission_handler_apple/ios"
  printing:
  :path: ".symlinks/plugins/printing/ios"
  sentry_flutter:
@@ -177,6 +180,8 @@ EXTERNAL SOURCES:
  :path: ".symlinks/plugins/shared_preferences_ios/ios"
  sign_in_with_apple:
  :path: ".symlinks/plugins/sign_in_with_apple/ios"
+ smart_auth:
+ :path: ".symlinks/plugins/smart_auth/ios"
  sqflite:
  :path: ".symlinks/plugins/sqflite/ios"
  url_launcher_ios:
@@ -204,14 +209,15 @@ SPEC CHECKSUMS:
  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
- permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
+ permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
  printing: eafa00acb682c0ca029d4d98d0798f55a1e27102
  SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e
  Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341
  sentry_flutter: efb3df2c203cd03aad255892a8d628a458656d14
  share: 0b2c3e82132f5888bccca3351c504d0003b3b410
  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
  sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
+ smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
  SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863

ios/Runner.xcodeproj/project.pbxproj

@@ -376,15 +376,15 @@
  CLANG_ENABLE_MODULES = YES;
  CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
  "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
- CURRENT_PROJECT_VERSION = 92;
+ CURRENT_PROJECT_VERSION = 93;
  DEVELOPMENT_TEAM = NPC44Y2C98;
  ENABLE_BITCODE = NO;
  INFOPLIST_FILE = Runner/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 5.0.92;
+ MARKETING_VERSION = 5.0.93;
  PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -508,15 +508,15 @@
  CLANG_ENABLE_MODULES = YES;
  CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
  "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
- CURRENT_PROJECT_VERSION = 92;
+ CURRENT_PROJECT_VERSION = 93;
  DEVELOPMENT_TEAM = NPC44Y2C98;
  ENABLE_BITCODE = NO;
  INFOPLIST_FILE = Runner/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 5.0.92;
+ MARKETING_VERSION = 5.0.93;
  PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -534,15 +534,15 @@
  CLANG_ENABLE_MODULES = YES;
  CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
  "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
- CURRENT_PROJECT_VERSION = 92;
+ CURRENT_PROJECT_VERSION = 93;
  DEVELOPMENT_TEAM = NPC44Y2C98;
  ENABLE_BITCODE = NO;
  INFOPLIST_FILE = Runner/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 5.0.92;
+ MARKETING_VERSION = 5.0.93;
  PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

lib/main_app.dart

@@ -666,5 +666,6 @@ class MyCustomScrollBehavior extends MaterialScrollBehavior {
  Set<PointerDeviceKind> get dragDevices => {
  PointerDeviceKind.touch,
  PointerDeviceKind.mouse,
+ PointerDeviceKind.trackpad,
  };
 }

lib/redux/transaction/transaction_state.dart

@@ -55,8 +55,10 @@ abstract class TransactionUIState extends Object
  implements Built<TransactionUIState, TransactionUIStateBuilder> {
  factory TransactionUIState(PrefStateSortField sortField) {
  return _$TransactionUIState._(
- listUIState: ListUIState(sortField?.field ?? TransactionFields.date,
- sortAscending: sortField?.ascending),
+ listUIState: ListUIState(
+ sortField?.field ?? TransactionFields.date,
+ sortAscending: sortField?.ascending,
+ ),
  editing: TransactionEntity(),
  selectedId: '',
  tabIndex: 0,

macos/Podfile.lock

@@ -1,6 +1,4 @@
 PODS:
- - bitsdojo_window_macos (0.0.1):
- - FlutterMacOS
  - FlutterMacOS (1.0.0)
  - FMDB (2.7.5):
  - FMDB/standard (= 2.7.5)
@@ -17,13 +15,13 @@ PODS:
  - FlutterMacOS
  - screen_retriever (0.0.1):
  - FlutterMacOS
- - Sentry (7.11.0):
- - Sentry/Core (= 7.11.0)
- - Sentry/Core (7.11.0)
+ - Sentry (7.23.0):
+ - Sentry/Core (= 7.23.0)
+ - Sentry/Core (7.23.0)
  - sentry_flutter (0.0.1):
  - Flutter
  - FlutterMacOS
- - Sentry (~> 7.11.0)
+ - Sentry (~> 7.23.0)
  - shared_preferences_macos (0.0.1):
  - FlutterMacOS
  - sign_in_with_apple (0.0.1):
@@ -39,7 +37,6 @@ PODS:
  - FlutterMacOS
 
 DEPENDENCIES:
- - bitsdojo_window_macos (from `Flutter/ephemeral/.symlinks/plugins/bitsdojo_window_macos/macos`)
  - FlutterMacOS (from `Flutter/ephemeral`)
  - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`)
  - package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`)
@@ -61,8 +58,6 @@ SPEC REPOS:
  - Sentry
 
 EXTERNAL SOURCES:
- bitsdojo_window_macos:
- :path: Flutter/ephemeral/.symlinks/plugins/bitsdojo_window_macos/macos
  FlutterMacOS:
  :path: Flutter/ephemeral
  in_app_review:
@@ -93,17 +88,16 @@ EXTERNAL SOURCES:
  :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
 
 SPEC CHECKSUMS:
- bitsdojo_window_macos: 44e3b8fe3dd463820e0321f6256c5b1c16bb6a00
- FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
+ FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
  in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0
  package_info: 6eba2fd8d3371dda2d85c8db6fe97488f24b74b2
  package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c
  path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f
  printing: e4b7e232ff3d5d50a70b20d959aa71035a5c31f9
  screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
- Sentry: 0c5cd63d714187b4a39c331c1f0eb04ba7868341
- sentry_flutter: efb3df2c203cd03aad255892a8d628a458656d14
+ Sentry: a0d4563fa4ddacba31fdcc35daaa8573d87224d6
+ sentry_flutter: 8bde7d0e57a721727fe573f13bb292c497b5a249
  shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727
  sign_in_with_apple: a9e97e744e8edc36aefc2723111f652102a7a727
  smart_auth: b38e3ab4bfe089eacb1e233aca1a2340f96c28e9

macos/Runner.xcodeproj/project.pbxproj

@@ -421,14 +421,14 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 92;
+ CURRENT_PROJECT_VERSION = 93;
  DEVELOPMENT_TEAM = NPC44Y2C98;
  INFOPLIST_FILE = Runner/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/../Frameworks",
  );
- MARKETING_VERSION = 5.0.92;
+ MARKETING_VERSION = 5.0.93;
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_VERSION = 5.0;
  };
@@ -551,14 +551,14 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 92;
+ CURRENT_PROJECT_VERSION = 93;
  DEVELOPMENT_TEAM = NPC44Y2C98;
  INFOPLIST_FILE = Runner/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/../Frameworks",
  );
- MARKETING_VERSION = 5.0.92;
+ MARKETING_VERSION = 5.0.93;
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
  SWIFT_VERSION = 5.0;
@@ -575,14 +575,14 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 92;
+ CURRENT_PROJECT_VERSION = 93;
  DEVELOPMENT_TEAM = NPC44Y2C98;
  INFOPLIST_FILE = Runner/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = (
  "$(inherited)",
  "@executable_path/../Frameworks",
  );
- MARKETING_VERSION = 5.0.92;
+ MARKETING_VERSION = 5.0.93;
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_VERSION = 5.0;
  };

pubspec.lock

@@ -1070,7 +1070,7 @@ packages:
  name: screen_retriever
  url: "https://pub.dartlang.org"
  source: hosted
- version: "0.1.2"
+ version: "0.1.3"
  sentry:
  dependency: transitive
  description: