From c402858ed451be055fe03e566a70319f2544d6ec Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:00:32 +0800 Subject: [PATCH 01/17] deps: fix dependency resolution --- melos.yaml | 4 +- .../at_backupkey_flutter/example/pubspec.yaml | 38 +++------ packages/at_backupkey_flutter/pubspec.yaml | 20 ++--- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- packages/at_chat_flutter/example/pubspec.yaml | 21 ++--- packages/at_chat_flutter/pubspec.yaml | 24 +++--- packages/at_common_flutter/pubspec.yaml | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 8 +- .../at_contacts_flutter/example/pubspec.yaml | 27 +++---- .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 1 + packages/at_contacts_flutter/pubspec.yaml | 25 +++--- .../Flutter/GeneratedPluginRegistrant.swift | 6 +- .../example/pubspec.yaml | 36 +++------ .../at_contacts_group_flutter/pubspec.yaml | 48 +++++------- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../at_events_flutter/example/pubspec.yaml | 30 +++----- packages/at_events_flutter/pubspec.yaml | 41 +++++----- .../at_follows_flutter/example/pubspec.yaml | 26 ++----- packages/at_follows_flutter/pubspec.yaml | 32 ++++---- .../Flutter/GeneratedPluginRegistrant.swift | 14 ++-- .../example/pubspec.yaml | 27 +++---- packages/at_invitation_flutter/pubspec.yaml | 21 +++-- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../at_location_flutter/example/pubspec.yaml | 28 +++---- packages/at_location_flutter/pubspec.yaml | 54 ++++++------- .../at_login_flutter/example/pubspec.yaml | 24 ++---- packages/at_login_flutter/pubspec.yaml | 33 ++++---- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../at_notify_flutter/example/pubspec.yaml | 33 +++----- packages/at_notify_flutter/pubspec.yaml | 26 +++---- .../example/pubspec.yaml | 14 ++-- packages/at_onboarding_flutter/pubspec.yaml | 56 +++++++------- .../Flutter/GeneratedPluginRegistrant.swift | 8 +- .../at_sync_ui_flutter/example/pubspec.yaml | 39 +++------- packages/at_sync_ui_flutter/pubspec.yaml | 75 +++++++++--------- .../Flutter/GeneratedPluginRegistrant.swift | 8 +- .../at_theme_flutter/example/pubspec.yaml | 27 +++---- packages/at_theme_flutter/pubspec.yaml | 77 +++++++++---------- pubspec.yaml | 68 +++++++++++++++- 40 files changed, 476 insertions(+), 556 deletions(-) diff --git a/melos.yaml b/melos.yaml index 551b59ccc..c26e0c845 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,4 +1,6 @@ name: at_widgets packages: -- packages/** + - packages/* # packages + - packages/*/*example # package examples + diff --git a/packages/at_backupkey_flutter/example/pubspec.yaml b/packages/at_backupkey_flutter/example/pubspec.yaml index 7f1b6a4eb..769121666 100644 --- a/packages/at_backupkey_flutter/example/pubspec.yaml +++ b/packages/at_backupkey_flutter/example/pubspec.yaml @@ -10,38 +10,22 @@ environment: flutter: ">=1.20.0" dependencies: - flutter: - sdk: flutter - + at_app_flutter: ^5.2.0 at_backupkey_flutter: path: ../ - at_onboarding_flutter: ^6.1.0 - - # When depending on this package from a real application you should use: - # at_backupkey_flutter: ^x.y.z - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.0 - at_app_flutter: ^5.0.0+1 + at_client_mobile: ^3.2.12 + at_onboarding_flutter: ^6.1.3 + cupertino_icons: ^1.0.6 + flutter: + sdk: flutter + path: ^1.8.3 + path_provider: ^2.1.1 dev_dependencies: - flutter_lints: ^2.0.1 - -dependency_overrides: - win32: ^5.0.5 - file_selector_windows: ^0.9.3 - permission_handler: ^10.4.1 - file_selector_linux: ^0.9.2 - file_selector: ^0.9.5 - file_selector_macos: ^0.9.3 - ffi: ^2.0.1 - at_backupkey_flutter: - path: ../ + flutter_lints: ^2.0.3 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -51,18 +35,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index 659dda6a8..dca4bb103 100644 --- a/packages/at_backupkey_flutter/pubspec.yaml +++ b/packages/at_backupkey_flutter/pubspec.yaml @@ -13,19 +13,19 @@ environment: dependencies: flutter: sdk: flutter - share_plus: ^7.0.2 - permission_handler: ^10.4.1 - path_provider: ^2.0.9 + share_plus: ^7.1.0 + permission_handler: ^11.0.0 + path_provider: ^2.1.1 at_file_saver: ^0.1.2 - at_utils: ^3.0.12 - at_client_mobile: ^3.2.11 + at_utils: ^3.0.15 + at_client_mobile: ^3.2.12 showcaseview: ^2.0.3 - device_info_plus: ^9.0.2 + device_info_plus: ^9.0.3 # desktop - dependencies - file_selector: ^0.9.5 - file_selector_macos: ^0.9.3 - file_selector_windows: ^0.9.3 - file_selector_linux: ^0.9.2 + file_selector: ^1.0.1 + file_selector_macos: ^0.9.3+2 + file_selector_windows: ^0.9.3+1 + file_selector_linux: ^0.9.2+1 dev_dependencies: flutter_test: diff --git a/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 1aba5171c..508252dd8 100644 --- a/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -11,7 +11,7 @@ import device_info_plus import file_selector_macos import package_info_plus import path_provider_foundation -import share_plus_macos +import share_plus import shared_preferences_foundation import url_launcher_macos diff --git a/packages/at_chat_flutter/example/pubspec.yaml b/packages/at_chat_flutter/example/pubspec.yaml index f2901d1da..95e15b80c 100644 --- a/packages/at_chat_flutter/example/pubspec.yaml +++ b/packages/at_chat_flutter/example/pubspec.yaml @@ -27,13 +27,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - at_app_flutter: ^5.0.1 + at_app_flutter: ^5.2.0 at_chat_flutter: # When depending on this package from a real application you should use: # at_chat_flutter: ^x.y.z @@ -41,11 +35,16 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ - at_onboarding_flutter: ^6.1.0 + at_onboarding_flutter: ^6.1.3 + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.6 + flutter: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -55,18 +54,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index df9cc0a26..5422dbcc5 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -1,5 +1,6 @@ name: at_chat_flutter -description: A Flutter plugin project to provide a chat feature between atSigns built on the atPlatform to any Flutter application. +description: A Flutter plugin project to provide a chat feature between atSigns + built on the atPlatform to any Flutter application. version: 3.0.9 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_chat_flutter @@ -10,26 +11,24 @@ environment: flutter: ">=1.20.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_contact: ^3.0.7 + at_lookup: ^3.0.40 + file_picker: ^5.5.0 flutter: sdk: flutter - at_contact: ^3.0.7 - at_common_flutter: ^2.0.11 - at_commons: ^3.0.47 - at_client_mobile: ^3.2.10 - at_lookup: ^3.0.37 - at_client: ^3.0.61 - file_picker: ^5.0.0 - dev_dependencies: - flutter_lints: ^2.0.1 - mocktail: ^0.3.0 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter + mocktail: ^0.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -54,7 +53,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_common_flutter/pubspec.yaml b/packages/at_common_flutter/pubspec.yaml index 49d8ff40e..7e78ffbe7 100644 --- a/packages/at_common_flutter/pubspec.yaml +++ b/packages/at_common_flutter/pubspec.yaml @@ -13,7 +13,7 @@ environment: dependencies: flutter: sdk: flutter - + dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 925ced397..508252dd8 100644 --- a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,18 +7,22 @@ import Foundation import at_file_saver import biometric_storage +import device_info_plus import file_selector_macos -import package_info_plus_macos +import package_info_plus import path_provider_foundation -import share_plus_macos +import share_plus +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin")) BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin")) + DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/at_contacts_flutter/example/pubspec.yaml b/packages/at_contacts_flutter/example/pubspec.yaml index 8aadeebe5..3826486cb 100644 --- a/packages/at_contacts_flutter/example/pubspec.yaml +++ b/packages/at_contacts_flutter/example/pubspec.yaml @@ -27,31 +27,30 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter + at_app_flutter: ^5.2.0 + at_backupkey_flutter: ^4.0.10 + at_contacts_flutter: + path: ../ + at_onboarding_flutter: ^6.1.3 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - at_app_flutter: 5.2.0 - at_onboarding_flutter: ^6.0.0 - at_backupkey_flutter: ^4.0.6 - at_contacts_flutter: - path: ../ + cupertino_icons: ^1.0.6 + flutter: + sdk: flutter dev_dependencies: - flutter_test: - sdk: flutter # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.4 + flutter_lints: ^2.0.3 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -60,18 +59,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_contacts_flutter/example/windows/flutter/generated_plugin_registrant.cc b/packages/at_contacts_flutter/example/windows/flutter/generated_plugin_registrant.cc index 762731d61..036f08c22 100644 --- a/packages/at_contacts_flutter/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/at_contacts_flutter/example/windows/flutter/generated_plugin_registrant.cc @@ -9,6 +9,7 @@ #include #include #include +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { @@ -18,6 +19,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FileSelectorWindows")); PermissionHandlerWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); + SharePlusWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); } diff --git a/packages/at_contacts_flutter/example/windows/flutter/generated_plugins.cmake b/packages/at_contacts_flutter/example/windows/flutter/generated_plugins.cmake index e5c7e6138..ac2736f29 100644 --- a/packages/at_contacts_flutter/example/windows/flutter/generated_plugins.cmake +++ b/packages/at_contacts_flutter/example/windows/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST at_file_saver file_selector_windows permission_handler_windows + share_plus url_launcher_windows ) diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index a5955dfef..eb2a7fa46 100644 --- a/packages/at_contacts_flutter/pubspec.yaml +++ b/packages/at_contacts_flutter/pubspec.yaml @@ -1,5 +1,6 @@ name: at_contacts_flutter -description: A Flutter plugin project to provide ease of managing contacts for an atSign using atPlatform. +description: A Flutter plugin project to provide ease of managing contacts for + an atSign using atPlatform. version: 4.0.11 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_flutter @@ -7,29 +8,27 @@ issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://docs.atsign.com/ environment: - sdk: '>=2.12.0 <4.0.0' + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_contact: ^3.0.7 + at_lookup: ^3.0.40 + at_utils: ^3.0.15 flutter: sdk: flutter flutter_slidable: ^3.0.0 - - at_client_mobile: ^3.2.11 - at_commons: ^3.0.48 - at_lookup: ^3.0.37 - at_contact: ^3.0.7 - at_common_flutter: ^2.0.11 - at_client: ^3.0.61 - at_utils: ^3.0.13 dev_dependencies: - flutter_lints: ^2.0.1 - mocktail: ^0.3.0 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - + mocktail: ^0.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index a7fdc907d..b74318456 100644 --- a/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -11,9 +11,9 @@ import device_info_plus import emoji_picker_flutter import file_selector_macos import package_info_plus -import path_provider_macos -import share_plus_macos -import shared_preferences_macos +import path_provider_foundation +import share_plus +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { diff --git a/packages/at_contacts_group_flutter/example/pubspec.yaml b/packages/at_contacts_group_flutter/example/pubspec.yaml index 6fdfca725..121d2592b 100644 --- a/packages/at_contacts_group_flutter/example/pubspec.yaml +++ b/packages/at_contacts_group_flutter/example/pubspec.yaml @@ -28,8 +28,9 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter + # at_contacts_flutter: ^4.0.0 + at_app_flutter: ^5.2.0 + at_backupkey_flutter: ^4.0.10 at_contacts_group_flutter: # When depending on this package from a real application you should use: @@ -38,38 +39,25 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ + at_onboarding_flutter: ^6.1.3 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.3 - # at_contacts_flutter: ^4.0.0 - at_app_flutter: ^5.1.1 - at_onboarding_flutter: ^6.0.2 - at_backupkey_flutter: ^4.0.9 - -dependency_overrides: - file_selector_macos: ^0.9.3 - file_selector: ^0.9.5 - file_selector_windows: ^0.9.3 - file_selector_linux: ^0.9.2 - flutter_slidable: ^3.0.0 - at_contacts_flutter: ^4.0.11 - - -dev_dependencies: - flutter_test: + cupertino_icons: ^1.0.6 + flutter: sdk: flutter +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - - # The following section is specific to Flutter. flutter: assets: @@ -79,18 +67,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index cb4ec904d..2d1d2c487 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -1,5 +1,6 @@ name: at_contacts_group_flutter -description: A Flutter plugin project to provide group functionality with contacts using atPlatform. +description: A Flutter plugin project to provide group functionality with + contacts using atPlatform. version: 4.0.13 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter @@ -8,45 +9,39 @@ issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://atsign.dev environment: - sdk: '>=2.12.0 <4.0.0' + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_contact: ^3.0.7 + at_contacts_flutter: ^4.0.11 + at_utils: ^3.0.15 + collection: ^1.17.0 + emoji_picker_flutter: ^1.6.1 + file_picker: ^5.5.0 + file_selector: ">=1.0.1" + file_selector_macos: ">=0.9.3+2" flutter: sdk: flutter - - fluttertoast: ^8.0.9 - file_picker: ^5.2.4 - emoji_picker_flutter: ^1.2.1 - flutter_slidable: '>=0.6.0 <4.0.0' - flutter_image_compress: ^2.0.3 - image_compression: ^1.0.3 - pedantic: ^1.11.0 + flutter_image_compress: ^2.0.4 + flutter_slidable: ">=3.0.0" flutter_toastr: ^1.0.3 - collection: ^1.15.0 - mocktail: ^0.3.0 - - # desktop - dependencies - file_selector: '>=0.8.4+1 <2.0.0' - file_selector_macos: '>=0.8.2 <1.0.0' - - at_client_mobile: ^3.2.9 - at_commons: ^3.0.45 - at_common_flutter: ^2.0.11 - at_contacts_flutter: ^4.0.11 - at_contact: ^3.0.7 - at_utils: ^3.0.12 + fluttertoast: ^8.2.2 + image_compression: ^1.0.4 + pedantic: ^1.11.1 dev_dependencies: - flutter_lints: ^2.0.1 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - + mocktail: ^0.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -79,7 +74,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 92cfc365e..f87cfb69b 100644 --- a/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -13,7 +13,7 @@ import file_selector_macos import geolocator_apple import package_info_plus import path_provider_foundation -import share_plus_macos +import share_plus import shared_preferences_foundation import sqflite import url_launcher_macos diff --git a/packages/at_events_flutter/example/pubspec.yaml b/packages/at_events_flutter/example/pubspec.yaml index 2c95b4e76..1d8fe1c11 100644 --- a/packages/at_events_flutter/example/pubspec.yaml +++ b/packages/at_events_flutter/example/pubspec.yaml @@ -27,13 +27,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - at_app_flutter: ^5.0.0+1 + at_app_flutter: ^5.2.0 at_events_flutter: # When depending on this package from a real application you should use: # at_events_flutter: ^x.y.z @@ -41,26 +35,26 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ - at_onboarding_flutter: ^6.0.0 + at_onboarding_flutter: ^6.1.3 -dependency_overrides: - package_info_plus: ^3.0.0 - - -dev_dependencies: - flutter_test: + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.6 + flutter: sdk: flutter +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -70,18 +64,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 1cb8b34d0..2b158f81b 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -1,5 +1,6 @@ name: at_events_flutter -description: A Flutter plugin project to manage events (time, place and attendees) using the atPlatform. +description: A Flutter plugin project to manage events (time, place and + attendees) using the atPlatform. version: 3.1.11 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_events_flutter @@ -7,40 +8,36 @@ issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://docs.atsign.com/ environment: - sdk: '>=2.12.0 <4.0.0' + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_contact: ^3.0.7 + # at_chat_flutter: ^2.0.2 + at_contacts_flutter: ^4.0.11 + at_contacts_group_flutter: ^4.0.13 + at_location_flutter: ^3.1.9 + at_lookup: ^3.0.40 + at_utils: ^3.0.15 flutter: sdk: flutter - latlong2: ^0.9.0 fluttertoast: ^8.2.2 + geolocator: ^10.0.1 + latlong2: ^0.9.0 sliding_up_panel: ^2.0.0+1 - geolocator: ^9.0.2 - - at_commons: ^3.0.51 - at_client_mobile: ^3.2.10 - at_contact: ^3.0.7 - at_lookup: ^3.0.37 - at_utils: ^3.0.14 - at_client: ^3.0.62 - - at_contacts_group_flutter: ^4.0.12 - # at_chat_flutter: ^2.0.2 - at_contacts_flutter: ^4.0.10 - at_location_flutter: ^3.1.9 - at_common_flutter: ^2.0.11 dev_dependencies: - flutter_lints: ^2.0.1 - mocktail: ^0.3.0 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - + mocktail: ^0.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -54,7 +51,6 @@ flutter: pluginClass: AtEventsFlutterPlugin ios: pluginClass: AtEventsFlutterPlugin - # To add assets to your plugin package, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg @@ -65,7 +61,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_follows_flutter/example/pubspec.yaml b/packages/at_follows_flutter/example/pubspec.yaml index 5c5f3b3bf..dbb031176 100644 --- a/packages/at_follows_flutter/example/pubspec.yaml +++ b/packages/at_follows_flutter/example/pubspec.yaml @@ -9,13 +9,7 @@ environment: sdk: ">=2.12.0 <4.0.0" dependencies: - flutter: - sdk: flutter - path_provider: ^2.0.7 - flutter_local_notifications: ^9.1.4 - at_app_flutter: ^5.0.1 - at_onboarding_flutter: ^6.0.0 - flutter_keychain: ^2.2.1 + at_app_flutter: ^5.2.0 at_follows_flutter: # When depending on this package from a real application you should use: @@ -24,24 +18,23 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ + at_onboarding_flutter: ^6.1.3 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.3 - + cupertino_icons: ^1.0.6 + flutter: + sdk: flutter + flutter_keychain: ^2.3.0 + flutter_local_notifications: ^9.9.1 + path_provider: ^2.1.1 dev_dependencies: flutter_test: sdk: flutter -dependency_overrides: - package_info_plus: ^3.0.0 - win32: ^5.0.2 - file_picker: ^5.3.2 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # The following line ensures that the Material Icons font is @@ -55,13 +48,10 @@ flutter: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_follows_flutter/pubspec.yaml b/packages/at_follows_flutter/pubspec.yaml index 8aadd16fd..b53ad3e54 100644 --- a/packages/at_follows_flutter/pubspec.yaml +++ b/packages/at_follows_flutter/pubspec.yaml @@ -1,5 +1,7 @@ name: at_follows_flutter -description: A Flutter plugin project that provides a basic social "follows" functionality for atSigns. Provides a list of followers and following for atSigns with the option to unfollow them. +description: A Flutter plugin project that provides a basic social "follows" + functionality for atSigns. Provides a list of followers and following for + atSigns with the option to unfollow them. version: 3.0.9 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets @@ -9,22 +11,22 @@ environment: flutter: ">=1.20.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_commons: ^3.0.55 + at_file_saver: ^0.1.2 + at_lookup: ^3.0.40 + at_server_status: ^1.0.3 + at_utils: ^3.0.15 + collection: ^1.17.0 flutter: sdk: flutter - provider: ^6.0.1 + flutter_local_notifications: ^9.9.1 + permission_handler: ^11.0.0 + provider: ^6.0.5 qr_code_scanner: ^1.0.1 - permission_handler: ^9.2.0 - flutter_local_notifications: ^9.1.4 - webview_flutter: ^4.0.0 - url_launcher: ^6.0.16 - collection: ^1.15.0 - at_utils: ^3.0.11 - at_commons: ^3.0.28 - at_client: ^3.0.41 - at_client_mobile: ^3.2.9 - at_server_status: ^1.0.3 - at_lookup: ^3.0.32 - at_file_saver: ^0.1.2 + url_launcher: ^6.1.14 + webview_flutter: ^4.2.4 dev_dependencies: flutter_test: @@ -32,7 +34,6 @@ dev_dependencies: # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -60,7 +61,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 5504f25f0..508252dd8 100644 --- a/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,20 +5,24 @@ import FlutterMacOS import Foundation +import at_file_saver import biometric_storage -import file_saver +import device_info_plus import file_selector_macos -import package_info_plus_macos -import path_provider_macos -import share_plus_macos +import package_info_plus +import path_provider_foundation +import share_plus +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin")) FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin")) + BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin")) + DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/at_invitation_flutter/example/pubspec.yaml b/packages/at_invitation_flutter/example/pubspec.yaml index 2b8aa898c..02bb75638 100644 --- a/packages/at_invitation_flutter/example/pubspec.yaml +++ b/packages/at_invitation_flutter/example/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -27,10 +27,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - at_app_flutter: ^4.0.1 + at_app_flutter: ^5.2.0 at_invitation_flutter: # When depending on this package from a real application you should use: # at_invitation_flutter: ^x.y.z @@ -41,24 +38,24 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.4 + cupertino_icons: ^1.0.6 + flutter: + sdk: flutter uni_links: ^0.5.1 - url_launcher: ^6.0.20 + url_launcher: ^6.1.14 dev_dependencies: - flutter_test: - sdk: flutter - # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.4 + flutter_lints: ^2.0.3 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -68,18 +65,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a @@ -98,4 +91,4 @@ flutter: # weight: 700 # # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages \ No newline at end of file + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index e95e36380..cffed8752 100644 --- a/packages/at_invitation_flutter/pubspec.yaml +++ b/packages/at_invitation_flutter/pubspec.yaml @@ -11,26 +11,25 @@ environment: flutter: ">=1.20.0" dependencies: + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_lookup: ^3.0.40 + at_utils: ^3.0.15 flutter: sdk: flutter - at_client_mobile: ^3.2.9 - at_common_flutter: ^2.0.5 - at_commons: ^3.0.5 - at_lookup: ^3.0.7 - at_utils: ^3.0.5 + pin_code_fields: ^8.0.1 - url_launcher: ^6.0.18 - uuid: ^3.0.5 - pin_code_fields: ^7.3.0 + url_launcher: ^6.1.14 + uuid: ^3.0.4 dev_dependencies: - flutter_lints: ^1.0.4 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -44,7 +43,6 @@ flutter: pluginClass: AtInvitationFlutterPlugin ios: pluginClass: AtInvitationFlutterPlugin - # To add assets to your plugin package, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg @@ -55,7 +53,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index ee6d777d7..a4d84f2b2 100644 --- a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -12,7 +12,7 @@ import file_selector_macos import geolocator_apple import package_info_plus import path_provider_foundation -import share_plus_macos +import share_plus import shared_preferences_foundation import sqflite import url_launcher_macos diff --git a/packages/at_location_flutter/example/pubspec.yaml b/packages/at_location_flutter/example/pubspec.yaml index 7085931cb..4730fc1d9 100644 --- a/packages/at_location_flutter/example/pubspec.yaml +++ b/packages/at_location_flutter/example/pubspec.yaml @@ -27,13 +27,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - at_app_flutter: ^5.0.0+1 + at_app_flutter: ^5.2.0 at_location_flutter: # When depending on this package from a real application you should use: # at_location_flutter: ^x.y.z @@ -41,23 +35,27 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ - latlong2: ^0.9.0 - at_onboarding_flutter: ^6.1.0 + at_onboarding_flutter: ^6.1.3 -dev_dependencies: - flutter_test: + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.6 + flutter: sdk: flutter + latlong2: ^0.9.0 +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -67,18 +65,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_location_flutter/pubspec.yaml b/packages/at_location_flutter/pubspec.yaml index 05aa2d556..10c19520a 100644 --- a/packages/at_location_flutter/pubspec.yaml +++ b/packages/at_location_flutter/pubspec.yaml @@ -1,5 +1,6 @@ name: at_location_flutter -description: A Flutter plugin project to share locations between two atSigns and track them on OSM (OpenStreetMap). +description: A Flutter plugin project to share locations between two atSigns and + track them on OSM (OpenStreetMap). version: 3.1.9 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_location_flutter @@ -7,48 +8,45 @@ issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://docs.atsign.com/ environment: - sdk: '>=2.14.0 <4.0.0' + sdk: ">=2.14.0 <4.0.0" flutter: ">=1.20.0" dependencies: + async: ^2.11.0 + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_contact: ^3.0.7 + at_contacts_flutter: ^4.0.11 + at_lookup: ^3.0.40 + at_utils: ^3.0.15 + cached_network_image: ^3.2.3 flutter: sdk: flutter - tuple: ^2.0.2 + flutter_image: ^4.1.8 + fluttertoast: ^8.2.2 + geolocator: ^10.0.1 + http: ^1.1.0 latlong2: ^0.9.0 + meta: ^1.9.0 + path_provider: ^2.1.1 positioned_tap_detector_2: ^1.0.4 - transparent_image: ^2.0.1 - async: ^2.11.0 - flutter_image: ^4.1.6 - cached_network_image: ^3.2.3 - path_provider: ^2.0.15 - vector_math: ^2.1.4 proj4dart: ^2.1.0 - meta: ^1.9.1 - geolocator: ^9.0.2 sliding_up_panel: ^2.0.0+1 - http: ^0.13.0 - fluttertoast: ^8.2.2 - - # at_chat_flutter: ^2.0.2 - at_client_mobile: ^3.2.10 - at_lookup: ^3.0.37 - at_commons: ^3.0.51 - at_contact: ^3.0.7 - at_utils: ^3.0.14 - at_client: ^3.0.62 - at_common_flutter: ^2.0.12 - at_contacts_flutter: ^4.0.10 + transparent_image: ^2.0.1 + tuple: ^2.0.2 + vector_math: ^2.1.4 dev_dependencies: - flutter_lints: ^2.0.1 - mocktail: ^0.3.0 - plugin_platform_interface: ^2.0.0 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter + mocktail: ^0.3.0 + plugin_platform_interface: ^2.1.6 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -66,7 +64,6 @@ flutter: # To add assets to your plugin package, add an assets section, like this: assets: - packages/at_location_flutter/assets/images/empty_group.png - # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg @@ -76,7 +73,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_login_flutter/example/pubspec.yaml b/packages/at_login_flutter/example/pubspec.yaml index ed4b89e00..f6af708d6 100644 --- a/packages/at_login_flutter/example/pubspec.yaml +++ b/packages/at_login_flutter/example/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -27,48 +27,40 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - + at_app_flutter: ^5.2.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - at_app_flutter: ^5.1.1 - -dev_dependencies: - flutter_test: + cupertino_icons: ^1.0.6 + flutter: sdk: flutter +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.3 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: - # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_login_flutter/pubspec.yaml b/packages/at_login_flutter/pubspec.yaml index b646f9db4..86151bb23 100644 --- a/packages/at_login_flutter/pubspec.yaml +++ b/packages/at_login_flutter/pubspec.yaml @@ -8,21 +8,21 @@ environment: flutter: ">=1.20.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_commons: ^3.0.55 + at_server_status: ^1.0.3 + at_utils: ^3.0.15 + basic_utils: ^5.6.1 + file_picker: ^5.5.0 flutter: sdk: flutter - provider: ^5.0.0 - permission_handler: ^8.1.2 - at_client: ^3.0.59 - at_client_mobile: ^3.2.9 - at_commons: ^3.0.0 - at_server_status: ^1.0.3 - at_utils: ^3.0.0 - file_picker: ^4.0.0 - flutter_local_notifications: ^5.0.0+1 + flutter_local_notifications: ^15.1.1 flutter_qr_reader: ^1.0.5 - http: ^0.13.3 - path_provider: ^2.0.2 - basic_utils: ^3.3.2 + http: ^1.1.0 + path_provider: ^2.1.1 + permission_handler: ^11.0.0 + provider: ^6.0.5 dev_dependencies: flutter_test: @@ -30,7 +30,6 @@ dev_dependencies: # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. @@ -46,10 +45,9 @@ flutter: pluginClass: AtLoginFlutterPlugin macos: pluginClass: AtLoginFlutterPlugin -# web: -# pluginClass: AtLoginFlutterWeb -# fileName: at_login_flutter_web.dart - + # web: + # pluginClass: AtLoginFlutterWeb + # fileName: at_login_flutter_web.dart # To add assets to your plugin package, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg @@ -60,7 +58,6 @@ flutter: # # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your plugin package, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 43169ff72..e17c66339 100644 --- a/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -12,7 +12,7 @@ import file_selector_macos import flutter_local_notifications import package_info_plus import path_provider_foundation -import share_plus_macos +import share_plus import shared_preferences_foundation import url_launcher_macos diff --git a/packages/at_notify_flutter/example/pubspec.yaml b/packages/at_notify_flutter/example/pubspec.yaml index d4767caf0..56f6df6fd 100644 --- a/packages/at_notify_flutter/example/pubspec.yaml +++ b/packages/at_notify_flutter/example/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -27,34 +27,29 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - at_app_flutter: ^5.0.0+1 + at_app_flutter: ^5.2.0 at_notify_flutter: path: ../ - at_onboarding_flutter: ^6.0.0 - + at_onboarding_flutter: ^6.1.3 - -dev_dependencies: - flutter_test: + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.6 + flutter: sdk: flutter +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -64,18 +59,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a @@ -94,4 +85,4 @@ flutter: # weight: 700 # # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages \ No newline at end of file + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/at_notify_flutter/pubspec.yaml b/packages/at_notify_flutter/pubspec.yaml index 894f80571..b70cb66d9 100644 --- a/packages/at_notify_flutter/pubspec.yaml +++ b/packages/at_notify_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_notify_flutter -description: A Flutter plugin project to send notification to any atSign in atPlatform - apps with ease. +description: A Flutter plugin project to send notification to any atSign in + atPlatform apps with ease. version: 1.0.7 homepage: https://atsign.dev repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_notify_flutter @@ -8,31 +8,27 @@ issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://docs.atsign.com/ environment: - sdk: '>=2.12.0 <4.0.0' + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 flutter: sdk: flutter - - at_client_mobile: ^3.2.10 - at_client: ^3.0.61 - at_commons: ^3.0.48 - at_common_flutter: ^2.0.11 - flutter_local_notifications: ^14.1.1 + flutter_local_notifications: ^15.1.1 dev_dependencies: - flutter_lints: ^2.0.1 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: - # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. @@ -45,18 +41,14 @@ flutter: pluginClass: AtNotifyFlutterPlugin ios: pluginClass: AtNotifyFlutterPlugin - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index 3cecca45e..6cf873e00 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -33,17 +33,12 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.5 + cupertino_icons: ^1.0.6 at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 flutter_localizations: sdk: flutter - intl: any - -dependency_overrides: - at_onboarding_flutter: - path: ../ - intl: ^0.18.0 + intl: ^0.17.0 # When depending on this package from a real application you should use in the dependencies section here we have used in dev_dependencies section: # at_onboarding_flutter: ^x.y.z # See https://dart.dev/tools/pub/dependencies#version-constraints @@ -53,7 +48,10 @@ dependency_overrides: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.4 + flutter_lints: ^2.0.3 + +dependency_overrides: + intl: ^0.17.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index ab983a21d..4a1b8088b 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -13,49 +13,45 @@ environment: flutter: ">=1.20.0" dependencies: + archive: ^3.3.9 + at_backupkey_flutter: ^4.0.10 + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_commons: ^3.0.55 + at_server_status: ^1.0.3 + at_sync_ui_flutter: ^1.0.8 + at_utils: ^3.0.15 + file_picker: ^5.5.0 + + # desktop - dependencies + file_selector: ^1.0.1 + file_selector_linux: ^0.9.2+1 + file_selector_macos: ^0.9.3+2 + file_selector_windows: ^0.9.3+1 flutter: sdk: flutter + http: ">=1.1.0" + image: ^4.0.17 - intl: ^0.18.1 - archive: ^3.3.7 - file_picker: '>=5.3.1 <=5.3.3' - qr_code_scanner: ^1.0.1 - url_launcher: ^6.1.12 - permission_handler: ^10.4.3 - path_provider: ^2.1.0 - webview_flutter: ^4.2.2 - http: '>=0.13.6 <=1.1.0' + intl: ^0.17.0 + path_provider: ^2.1.1 + permission_handler: ^11.0.0 pin_code_fields: ^8.0.1 - zxing2: ^0.2.0 - image: ^4.0.17 - shared_preferences: ^2.2.0 + qr_code_scanner: ^1.0.1 + shared_preferences: ^2.2.1 tutorial_coach_mark: ^1.2.9 + url_launcher: ^6.1.14 + webview_flutter: ^4.2.4 + zxing2: ^0.2.0 - # desktop - dependencies - file_selector: '>=0.8.4+3 <=1.0.0' - file_selector_macos: ^0.9.3+1 - file_selector_windows: ^0.9.3 - file_selector_linux: ^0.9.2 - - at_backupkey_flutter: ^4.0.10 - at_client: ^3.0.64 - at_client_mobile: ^3.2.12 - at_commons: ^3.0.53 - at_server_status: ^1.0.3 - at_utils: ^3.0.15 - at_sync_ui_flutter: ^1.0.8 -dependency_overrides: - file_selector: ^1.0.0 dev_dependencies: + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - flutter_lints: ^2.0.1 mocktail: ^0.3.0 - - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. diff --git a/packages/at_sync_ui_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_sync_ui_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index c51a923db..508252dd8 100644 --- a/packages/at_sync_ui_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_sync_ui_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,18 +7,22 @@ import Foundation import at_file_saver import biometric_storage +import device_info_plus import file_selector_macos import package_info_plus -import path_provider_macos -import share_plus_macos +import path_provider_foundation +import share_plus +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin")) BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin")) + DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/at_sync_ui_flutter/example/pubspec.yaml b/packages/at_sync_ui_flutter/example/pubspec.yaml index 603c41ba4..3fd555aaf 100644 --- a/packages/at_sync_ui_flutter/example/pubspec.yaml +++ b/packages/at_sync_ui_flutter/example/pubspec.yaml @@ -27,42 +27,30 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - at_app_flutter: ^5.0.0+1 - at_onboarding_flutter: ^6.0.0 - at_backupkey_flutter: ^4.0.6 - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - flutter_colorpicker: ^1.0.2 + at_app_flutter: ^5.2.0 + at_backupkey_flutter: ^4.0.10 + at_onboarding_flutter: ^6.1.3 at_sync_ui_flutter: path: ../ - -dependency_overrides: - # as at_onboarding_flutter is also using at_sync_ui_flutter - at_sync_ui_flutter: - path: ../ - biometric_storage: ^4.1.3 - at_file_saver: ^0.1.1 - at_client_mobile: ^3.2.6 - package_info_plus: ^3.0.0 - -dev_dependencies: - flutter_test: + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.6 + flutter: sdk: flutter + flutter_colorpicker: ^1.0.3 +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: # The following line ensures that the Material Icons font is @@ -75,13 +63,10 @@ flutter: - .env # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index 9ad0b7c9a..df697c815 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -1,5 +1,6 @@ name: at_sync_ui_flutter -description: A Flutter plugin project to provide UI widgets for displaying status of sync process in atProtocol apps. +description: A Flutter plugin project to provide UI widgets for displaying + status of sync process in atProtocol apps. version: 1.0.9 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter @@ -11,52 +12,48 @@ environment: flutter: ">=1.17.0" dependencies: + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 flutter: sdk: flutter - at_client: ^3.0.40 - at_client_mobile: ^3.2.7 - at_common_flutter: ^2.0.10 - dev_dependencies: + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - flutter_lints: ^2.0.1 mocktail: ^0.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. -flutter: - - # To add assets to your package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # To add custom fonts to your package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages +flutter: null +# To add assets to your package, add an assets section, like this: +# assets: +# - images/a_dot_burr.jpeg +# - images/a_dot_ham.jpeg +# +# For details regarding assets in packages, see +# https://flutter.dev/assets-and-images/#from-packages +# +# An image asset can refer to one or more resolution-specific "variants", see +# https://flutter.dev/assets-and-images/#resolution-aware. +# To add custom fonts to your package, add a fonts section here, +# in this "flutter" section. Each entry in this list should have a +# "family" key with the font family name, and a "fonts" key with a +# list giving the asset and other descriptors for the font. For +# example: +# fonts: +# - family: Schyler +# fonts: +# - asset: fonts/Schyler-Regular.ttf +# - asset: fonts/Schyler-Italic.ttf +# style: italic +# - family: Trajan Pro +# fonts: +# - asset: fonts/TrajanPro.ttf +# - asset: fonts/TrajanPro_Bold.ttf +# weight: 700 +# +# For details regarding fonts in packages, see +# https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index c51a923db..508252dd8 100644 --- a/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,18 +7,22 @@ import Foundation import at_file_saver import biometric_storage +import device_info_plus import file_selector_macos import package_info_plus -import path_provider_macos -import share_plus_macos +import path_provider_foundation +import share_plus +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin")) BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin")) + DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/at_theme_flutter/example/pubspec.yaml b/packages/at_theme_flutter/example/pubspec.yaml index 769b94831..141f18fd2 100644 --- a/packages/at_theme_flutter/example/pubspec.yaml +++ b/packages/at_theme_flutter/example/pubspec.yaml @@ -27,35 +27,30 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter + at_app_flutter: ^5.2.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - at_common_flutter: ^2.0.5 - cupertino_icons: ^1.0.2 + at_common_flutter: ^2.0.12 + at_onboarding_flutter: ^6.1.3 at_theme_flutter: path: ../ - at_app_flutter: ^5.0.0+1 - at_onboarding_flutter: ^6.0.0 - -dependency_overrides: - package_info_plus: ^3.0.0 - -dev_dependencies: - flutter_test: + cupertino_icons: ^1.0.6 + flutter: sdk: flutter +dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.0 + flutter_lints: ^1.0.4 + flutter_test: + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -65,18 +60,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a diff --git a/packages/at_theme_flutter/pubspec.yaml b/packages/at_theme_flutter/pubspec.yaml index 0b5d80e8e..c62443302 100644 --- a/packages/at_theme_flutter/pubspec.yaml +++ b/packages/at_theme_flutter/pubspec.yaml @@ -11,55 +11,50 @@ environment: sdk: ">=2.12.0 <4.0.0" dependencies: + at_client_mobile: ^3.2.12 + at_common_flutter: ^2.0.12 + at_commons: ^3.0.55 + at_utils: ^3.0.15 flutter: sdk: flutter - at_client_mobile: ^3.2.9 - at_common_flutter: ^2.0.11 - at_commons: ^3.0.26 - fluttertoast: ^8.0.8 - at_utils: ^3.0.11 - - + fluttertoast: ^8.2.2 dev_dependencies: - flutter_lints: ^2.0.1 + flutter_lints: ^2.0.3 flutter_test: sdk: flutter mocktail: ^0.3.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. -flutter: - - # To add assets to your package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # To add custom fonts to your package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages +flutter: null +# To add assets to your package, add an assets section, like this: +# assets: +# - images/a_dot_burr.jpeg +# - images/a_dot_ham.jpeg +# +# For details regarding assets in packages, see +# https://flutter.dev/assets-and-images/#from-packages +# +# An image asset can refer to one or more resolution-specific "variants", see +# https://flutter.dev/assets-and-images/#resolution-aware. +# To add custom fonts to your package, add a fonts section here, +# in this "flutter" section. Each entry in this list should have a +# "family" key with the font family name, and a "fonts" key with a +# list giving the asset and other descriptors for the font. For +# example: +# fonts: +# - family: Schyler +# fonts: +# - asset: fonts/Schyler-Regular.ttf +# - asset: fonts/Schyler-Italic.ttf +# style: italic +# - family: Trajan Pro +# fonts: +# - asset: fonts/TrajanPro.ttf +# - asset: fonts/TrajanPro_Bold.ttf +# weight: 700 +# +# For details regarding fonts in packages, see +# https://flutter.dev/custom-fonts/#from-packages diff --git a/pubspec.yaml b/pubspec.yaml index 83075b777..dc5617aa1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,71 @@ name: at_widgets_workspace environment: - sdk: ">=2.18.0 <4.0.0" + sdk: ">=2.12.0 <4.0.0" + flutter: ">=1.20.0" dev_dependencies: - melos: ^3.0.1 \ No newline at end of file + flutter_lints: ^2.0.3 + flutter_test: + sdk: flutter + melos: ^3.1.1 + mocktail: ^0.3.0 + plugin_platform_interface: ^2.1.6 + +dependencies: + archive: ^3.3.9 + async: ^2.11.0 + at_client: ^3.0.64 + at_client_mobile: ^3.2.12 + at_commons: ^3.0.55 + at_contact: ^3.0.7 + at_file_saver: ^0.1.2 + at_server_status: ^1.0.3 + at_lookup: ^3.0.40 + at_utils: ^3.0.15 + basic_utils: ^5.6.1 + cached_network_image: ^3.2.3 + collection: ^1.17.0 + device_info_plus: ^9.0.3 + emoji_picker_flutter: ^1.6.1 + file_picker: ^5.5.0 + file_selector: ^1.0.1 + file_selector_linux: ^0.9.2+1 + file_selector_macos: ^0.9.3+2 + file_selector_windows: ^0.9.3+1 + flutter: + sdk: flutter + flutter_image: ^4.1.8 + flutter_image_compress: ^2.0.4 + flutter_local_notifications: ^15.1.1 + flutter_qr_reader: ^1.0.5 + flutter_slidable: ^3.0.0 + flutter_toastr: ^1.0.3 + fluttertoast: ^8.2.2 + geolocator: ^10.0.1 + http: ^1.1.0 + image: ^4.0.17 + image_compression: ^1.0.4 + intl: ^0.17.0 + latlong2: ^0.9.0 + meta: ^1.9.0 + path_provider: ^2.1.1 + pedantic: ^1.11.1 + permission_handler: ^11.0.0 + pin_code_fields: ^8.0.1 + positioned_tap_detector_2: ^1.0.4 + proj4dart: ^2.1.0 + provider: ^6.0.5 + qr_code_scanner: ^1.0.1 + share_plus: ^7.1.0 + shared_preferences: ^2.2.1 + showcaseview: ^2.0.3 + sliding_up_panel: ^2.0.0+1 + transparent_image: ^2.0.1 + tuple: ^2.0.2 + tutorial_coach_mark: ^1.2.9 + url_launcher: ^6.1.14 + uuid: ^3.0.4 + vector_math: ^2.1.4 + webview_flutter: ^4.2.4 + zxing2: ^0.2.0 From 70bd470cbb4f9c1a67010a6c1e916c5025512def Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:08:03 +0800 Subject: [PATCH 02/17] deps: fix dependency issue --- melos.yaml | 5 ++-- .../example/pubspec.yaml | 25 +++++-------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/melos.yaml b/melos.yaml index c26e0c845..eae6375e7 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,6 +1,5 @@ name: at_widgets packages: - - packages/* # packages - - packages/*/*example # package examples - + - packages/* + - packages/*/*example diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index 6cf873e00..f36983483 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Demonstrates how to use the at_onboarding_flutter plugin. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -27,35 +27,26 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.6 at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 + at_onboarding_flutter: ^6.1.3 + cupertino_icons: ^1.0.6 + flutter: + sdk: flutter flutter_localizations: sdk: flutter intl: ^0.17.0 - # When depending on this package from a real application you should use in the dependencies section here we have used in dev_dependencies section: - # at_onboarding_flutter: ^x.y.z - # See https://dart.dev/tools/pub/dependencies#version-constraints - # The example app is bundled with the plugin so we use a path dependency on - # the parent directory to use the current plugin's version. dev_dependencies: + flutter_lints: ^2.0.3 flutter_test: sdk: flutter - flutter_lints: ^2.0.3 dependency_overrides: intl: ^0.17.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec - # The following section is specific to Flutter. flutter: assets: @@ -66,18 +57,14 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a From 014ee21bade2680023f4a3db11ff08d826302609 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:08:34 +0800 Subject: [PATCH 03/17] deps(at_backupkey_flutter): uptake file_selector 1.0.1 --- .../lib/widgets/backup_key_widget.dart | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart index 405c594de..315867809 100644 --- a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart +++ b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart @@ -156,9 +156,9 @@ class BackupKeyWidget extends StatelessWidget { child: Showcase( key: key, description: - '''Each atSign has a unique key used to verify ownership and encrypt your data. You will get this key when you first activate your atSign, and you will need it to pair your atSign with other devices and all atPlatform apps. - -PLEASE SECURELY SAVE YOUR KEYS. WE DO NOT HAVE ACCESS TO THEM AND CANNOT CREATE A BACKUP OR RESET THEM.''', + 'Each atSign has a unique key used to verify ownership and encrypt your data. You will get this key when you first activate your atSign, and you will need it to pair your atSign with other devices and all atPlatform apps.' + '' + 'PLEASE SECURELY SAVE YOUR KEYS. WE DO NOT HAVE ACCESS TO THEM AND CANNOT CREATE A BACKUP OR RESET THEM.', targetShapeBorder: const CircleBorder(), disableMovingAnimation: true, targetBorderRadius: @@ -335,21 +335,25 @@ PLEASE SECURELY SAVE YOUR KEYS. WE DO NOT HAVE ACCESS TO THEM AND CANNOT CREATE }, ); } else if (Platform.isIOS) { - var size = MediaQuery.of(context).size; - await Share.shareXFiles( - [XFile(tempFilePath)], - sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2), - ).then((ShareResult shareResult) { - if (shareResult.status == ShareResultStatus.success) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('File saved successfully'))); - } - }); + if (context.mounted) { + var size = MediaQuery.of(context).size; + await Share.shareXFiles( + [XFile(tempFilePath)], + sharePositionOrigin: + Rect.fromLTWH(0, 0, size.width, size.height / 2), + ).then((ShareResult shareResult) { + if (shareResult.status == ShareResultStatus.success) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('File saved successfully'))); + } + }); + } } else { - final path = - await getSavePath(suggestedName: '$atsign${Strings.backupKeyName}'); + final path = await getSaveLocation( + suggestedName: '$atsign${Strings.backupKeyName}'); + if (path == null) return; final file = XFile(tempFilePath); - await file.saveTo(path ?? ''); + await file.saveTo(path.path); if (context.mounted) { showSnackBar( context: context, From 1db83ec64d67b6e1319415bddfad1afa16591753 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:09:16 +0800 Subject: [PATCH 04/17] deps(at_sync_ui_flutter): migrate from deprecated syncService api in tests --- .../at_sync_ui_flutter/test/at_sync_ui_flutter_test.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/at_sync_ui_flutter/test/at_sync_ui_flutter_test.dart b/packages/at_sync_ui_flutter/test/at_sync_ui_flutter_test.dart index c64b98e58..5c35d1bd8 100644 --- a/packages/at_sync_ui_flutter/test/at_sync_ui_flutter_test.dart +++ b/packages/at_sync_ui_flutter/test/at_sync_ui_flutter_test.dart @@ -4,7 +4,6 @@ import 'package:at_sync_ui_flutter/at_sync_ui_flutter.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; -import 'package:at_client/src/service/sync_service.dart'; class MockSyncService extends Mock implements SyncService {} @@ -18,7 +17,7 @@ void main() { group('sync service test', () { test('AtSyncUIService init', () { AtSyncUIService().syncService = mockSyncService; - AtClientManager.getInstance().syncService = mockSyncService; + AtClientManager.getInstance().atClient.syncService = mockSyncService; AtSyncUIService().init( appNavigator: _key, @@ -69,7 +68,7 @@ void main() { test('AtSyncUIService sync', () { AtSyncUIService().syncService = mockSyncService; - AtClientManager.getInstance().syncService = mockSyncService; + AtClientManager.getInstance().atClient.syncService = mockSyncService; AtSyncUIService().init( appNavigator: _key, From 7fe18ff6f665e48efc83e5bede56295a1e3a2323 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:15:50 +0800 Subject: [PATCH 05/17] deps(at_login_flutter): uptake new apis --- .../at_login_flutter/example/lib/main.dart | 64 ++++++++++--------- .../at_login_flutter/example/pubspec.yaml | 10 +-- .../lib/services/notification_service.dart | 13 ++-- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/packages/at_login_flutter/example/lib/main.dart b/packages/at_login_flutter/example/lib/main.dart index 5f916f234..b4ea65337 100644 --- a/packages/at_login_flutter/example/lib/main.dart +++ b/packages/at_login_flutter/example/lib/main.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:at_client_mobile/at_client_mobile.dart'; import 'package:at_onboarding_flutter/at_onboarding_flutter.dart'; import 'package:path_provider/path_provider.dart' as path_provider; import 'package:at_app_flutter/at_app_flutter.dart'; @@ -19,7 +18,6 @@ Future loadAtClientPreference() async { ..hiveStoragePath = dir.path ..commitLogPath = dir.path ..isLocalStoreRequired = true - ..syncStrategy = SyncStrategy.onDemand // TODO set the rest of your AtClientPreference here ; } @@ -27,7 +25,7 @@ Future loadAtClientPreference() async { class MyApp extends StatefulWidget { const MyApp({Key? key}) : super(key: key); @override - _MyAppState createState() => _MyAppState(); + State createState() => _MyAppState(); } class _MyAppState extends State { @@ -50,31 +48,38 @@ class _MyAppState extends State { child: TextButton( onPressed: () async { atClientPreference = await futurePreference; - final result = await AtOnboarding.onboard( - context: context, - config: AtOnboardingConfig( - atClientPreference: atClientPreference!, - domain: AtEnv.rootDomain, - rootEnvironment: AtEnv.rootEnvironment, - appAPIKey: AtEnv.appApiKey, - ), - ); - - switch (result.status) { - case AtOnboardingResultStatus.success: - Navigator.push(context, - MaterialPageRoute(builder: (_) => const HomeScreen())); - break; - case AtOnboardingResultStatus.error: - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - backgroundColor: Colors.red, - content: Text('An error has occurred'), - ), - ); - break; - case AtOnboardingResultStatus.cancel: - break; + if (context.mounted) { + final result = await AtOnboarding.onboard( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference!, + domain: AtEnv.rootDomain, + rootEnvironment: AtEnv.rootEnvironment, + appAPIKey: AtEnv.appApiKey, + ), + ); + switch (result.status) { + case AtOnboardingResultStatus.success: + if (context.mounted) { + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => const HomeScreen())); + } + break; + case AtOnboardingResultStatus.error: + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + backgroundColor: Colors.red, + content: Text('An error has occurred'), + ), + ); + } + break; + case AtOnboardingResultStatus.cancel: + break; + } } }, child: const Text( @@ -98,7 +103,8 @@ class HomeScreen extends StatelessWidget { // * Get the AtContext from build context // ! NOTE: Only use this after successfully onboarding the @sign - var currentAtSign = AtClientManager.getInstance().atClient.getCurrentAtSign(); + var currentAtSign = + AtClientManager.getInstance().atClient.getCurrentAtSign(); // * Example Uses /// AtClientService atClientService = atContext.atClientService; diff --git a/packages/at_login_flutter/example/pubspec.yaml b/packages/at_login_flutter/example/pubspec.yaml index f6af708d6..06fedeea3 100644 --- a/packages/at_login_flutter/example/pubspec.yaml +++ b/packages/at_login_flutter/example/pubspec.yaml @@ -28,19 +28,13 @@ environment: # versions available, run `flutter pub outdated`. dependencies: at_app_flutter: ^5.2.0 - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. + at_onboarding_flutter: ^6.1.3 cupertino_icons: ^1.0.6 flutter: sdk: flutter + path_provider: ^2.1.1 dev_dependencies: - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. flutter_lints: ^2.0.3 flutter_test: sdk: flutter diff --git a/packages/at_login_flutter/lib/services/notification_service.dart b/packages/at_login_flutter/lib/services/notification_service.dart index 1ac38abd7..0e1b398f4 100644 --- a/packages/at_login_flutter/lib/services/notification_service.dart +++ b/packages/at_login_flutter/lib/services/notification_service.dart @@ -27,15 +27,16 @@ class NotificationService { setOnNotificationClick(Function onNotificationClick) async { await _notificationsPlugin.initialize(initializationSettings, - onSelectNotification: (String? payload) async { - onNotificationClick(payload); - }); + onDidReceiveNotificationResponse: (NotificationResponse payload) { + onNotificationClick(payload); + }); } initializePlatformSpecifics() { var initializationSettingsAndroid = AndroidInitializationSettings('notification_icon'); - var initializationSettingsIOS = IOSInitializationSettings( + var initializationSettingsIOS = + DarwinInitializationSettings( requestAlertPermission: true, requestBadgePermission: true, requestSoundPermission: false, @@ -65,13 +66,13 @@ class NotificationService { AndroidNotificationDetails( 'CHANNEL_ID', 'CHANNEL_NAME', - 'CHANNEL_DESCRIPTION', + channelDescription: 'CHANNEL_DESCRIPTION', importance: Importance.max, priority: Priority.high, showWhen: false, styleInformation: BigTextStyleInformation(''), ); - var iosChannelSpecifics = IOSNotificationDetails(); + var iosChannelSpecifics = DarwinNotificationDetails(); var platformChannelSpecifics = NotificationDetails( android: androidPlatformChannelSpecifics, iOS: iosChannelSpecifics); From 8f6b6652c2eabaa8f13ecd0e18ad1fa569003e22 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:18:18 +0800 Subject: [PATCH 06/17] deps(at_invitation_flutter): use new onboarding widget --- .../example/lib/main.dart | 73 +++++++++---------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/packages/at_invitation_flutter/example/lib/main.dart b/packages/at_invitation_flutter/example/lib/main.dart index a85039338..95b1e9dc2 100644 --- a/packages/at_invitation_flutter/example/lib/main.dart +++ b/packages/at_invitation_flutter/example/lib/main.dart @@ -3,8 +3,7 @@ import 'dart:async'; import 'package:at_invitation_flutter_example/second_screen.dart'; import 'package:flutter/material.dart'; import 'package:at_client_mobile/at_client_mobile.dart'; -import 'package:at_onboarding_flutter/at_onboarding_flutter.dart' - show Onboarding; +import 'package:at_onboarding_flutter/at_onboarding_flutter.dart'; import 'package:at_utils/at_logger.dart' show AtSignLogger; import 'package:path_provider/path_provider.dart' show getApplicationSupportDirectory; @@ -67,42 +66,40 @@ class _MyAppState extends State { Center( child: ElevatedButton( onPressed: () async { - var preference = await futurePreference; - setState(() { - atClientPreference = preference; - }); - Onboarding( - context: context, - atClientPreference: atClientPreference, - domain: AtEnv.rootDomain, - rootEnvironment: AtEnv.rootEnvironment, - appAPIKey: '477b-876u-bcez-c42z-6a3d', - onboard: (Map value, - String? atsign) async { - atClientService = value[atsign]; - await Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) => const SecondScreen())); - }, - onError: (error) async { - _logger.severe('Onboarding throws $error error'); - await showDialog( - context: context, - builder: (BuildContext context) { - return AlertDialog( - content: const Text('Something went wrong'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(context).pop(); - }, - child: const Text('ok')) - ], - ); - }); - }, - ); + atClientPreference = await futurePreference; + if (context.mounted) { + final result = await AtOnboarding.onboard( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference, + domain: AtEnv.rootDomain, + rootEnvironment: AtEnv.rootEnvironment, + appAPIKey: AtEnv.appApiKey, + ), + ); + switch (result.status) { + case AtOnboardingResultStatus.success: + if (context.mounted) { + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => const SecondScreen())); + } + break; + case AtOnboardingResultStatus.error: + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + backgroundColor: Colors.red, + content: Text('An error has occurred'), + ), + ); + } + break; + case AtOnboardingResultStatus.cancel: + break; + } + } }, child: const Text('Start onboarding'), ), From 3f31680303ca67a937a6a613f4e15cfacddca9da Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:19:07 +0800 Subject: [PATCH 07/17] deps(at_chat_flutter): add flutter_test to dev deps --- packages/at_chat_flutter/example/pubspec.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/at_chat_flutter/example/pubspec.yaml b/packages/at_chat_flutter/example/pubspec.yaml index 95e15b80c..a03846371 100644 --- a/packages/at_chat_flutter/example/pubspec.yaml +++ b/packages/at_chat_flutter/example/pubspec.yaml @@ -54,6 +54,10 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true + +dev_dependencies: + flutter_test: + sdk: flutter # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg From 2956bbc0df4a9ade2c9ca2c8081b6352b516800a Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:24:55 +0800 Subject: [PATCH 08/17] chore: remove deps used for tracking purposes --- pubspec.yaml | 63 ---------------------------------------------------- 1 file changed, 63 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index dc5617aa1..7271c2c63 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,67 +5,4 @@ environment: flutter: ">=1.20.0" dev_dependencies: - flutter_lints: ^2.0.3 - flutter_test: - sdk: flutter melos: ^3.1.1 - mocktail: ^0.3.0 - plugin_platform_interface: ^2.1.6 - -dependencies: - archive: ^3.3.9 - async: ^2.11.0 - at_client: ^3.0.64 - at_client_mobile: ^3.2.12 - at_commons: ^3.0.55 - at_contact: ^3.0.7 - at_file_saver: ^0.1.2 - at_server_status: ^1.0.3 - at_lookup: ^3.0.40 - at_utils: ^3.0.15 - basic_utils: ^5.6.1 - cached_network_image: ^3.2.3 - collection: ^1.17.0 - device_info_plus: ^9.0.3 - emoji_picker_flutter: ^1.6.1 - file_picker: ^5.5.0 - file_selector: ^1.0.1 - file_selector_linux: ^0.9.2+1 - file_selector_macos: ^0.9.3+2 - file_selector_windows: ^0.9.3+1 - flutter: - sdk: flutter - flutter_image: ^4.1.8 - flutter_image_compress: ^2.0.4 - flutter_local_notifications: ^15.1.1 - flutter_qr_reader: ^1.0.5 - flutter_slidable: ^3.0.0 - flutter_toastr: ^1.0.3 - fluttertoast: ^8.2.2 - geolocator: ^10.0.1 - http: ^1.1.0 - image: ^4.0.17 - image_compression: ^1.0.4 - intl: ^0.17.0 - latlong2: ^0.9.0 - meta: ^1.9.0 - path_provider: ^2.1.1 - pedantic: ^1.11.1 - permission_handler: ^11.0.0 - pin_code_fields: ^8.0.1 - positioned_tap_detector_2: ^1.0.4 - proj4dart: ^2.1.0 - provider: ^6.0.5 - qr_code_scanner: ^1.0.1 - share_plus: ^7.1.0 - shared_preferences: ^2.2.1 - showcaseview: ^2.0.3 - sliding_up_panel: ^2.0.0+1 - transparent_image: ^2.0.1 - tuple: ^2.0.2 - tutorial_coach_mark: ^1.2.9 - url_launcher: ^6.1.14 - uuid: ^3.0.4 - vector_math: ^2.1.4 - webview_flutter: ^4.2.4 - zxing2: ^0.2.0 From 53459f693f2f0e0c880f5b264dcc9a247b4f11a0 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:42:08 +0800 Subject: [PATCH 09/17] fix: string formatting --- .../at_backupkey_flutter/lib/widgets/backup_key_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart index 315867809..09b2199a4 100644 --- a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart +++ b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart @@ -157,7 +157,7 @@ class BackupKeyWidget extends StatelessWidget { key: key, description: 'Each atSign has a unique key used to verify ownership and encrypt your data. You will get this key when you first activate your atSign, and you will need it to pair your atSign with other devices and all atPlatform apps.' - '' + '\n\n' 'PLEASE SECURELY SAVE YOUR KEYS. WE DO NOT HAVE ACCESS TO THEM AND CANNOT CREATE A BACKUP OR RESET THEM.', targetShapeBorder: const CircleBorder(), disableMovingAnimation: true, From fa5299bf63a27967e441238d76075c4e37e33833 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:49:25 +0800 Subject: [PATCH 10/17] deps: only allow minor version differences --- packages/at_contacts_group_flutter/pubspec.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index 2d1d2c487..d0b96210b 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -22,12 +22,12 @@ dependencies: collection: ^1.17.0 emoji_picker_flutter: ^1.6.1 file_picker: ^5.5.0 - file_selector: ">=1.0.1" - file_selector_macos: ">=0.9.3+2" + file_selector: ^1.0.1 + file_selector_macos: ^0.9.3+2 flutter: sdk: flutter flutter_image_compress: ^2.0.4 - flutter_slidable: ">=3.0.0" + flutter_slidable: ^3.0.0 flutter_toastr: ^1.0.3 fluttertoast: ^8.2.2 From 94ccd56ce9e900b91c650e5bd5138555a67a6018 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:53:47 +0800 Subject: [PATCH 11/17] chore(deps): remove unused dep --- packages/at_events_flutter/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 2b158f81b..b8a257017 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: at_common_flutter: ^2.0.12 at_commons: ^3.0.55 at_contact: ^3.0.7 - # at_chat_flutter: ^2.0.2 at_contacts_flutter: ^4.0.11 at_contacts_group_flutter: ^4.0.13 at_location_flutter: ^3.1.9 From 0b4cd27bf21ca2cae277152501266dbfc1e8b1cb Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 18:05:40 +0800 Subject: [PATCH 12/17] deps: only allow minor version differences --- packages/at_onboarding_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 4a1b8088b..3c52638e8 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: file_selector_windows: ^0.9.3+1 flutter: sdk: flutter - http: ">=1.1.0" + http: ^1.1.0 image: ^4.0.17 intl: ^0.17.0 From fd8bea3af5ffa08374950d87d5a9a9bcab4387a6 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Thu, 21 Sep 2023 15:39:07 +0800 Subject: [PATCH 13/17] chore(deps): update all version numbers and changelogs --- packages/at_backupkey_flutter/CHANGELOG.md | 4 ++++ packages/at_backupkey_flutter/pubspec.yaml | 2 +- packages/at_chat_flutter/CHANGELOG.md | 4 ++++ packages/at_chat_flutter/pubspec.yaml | 2 +- packages/at_contacts_flutter/CHANGELOG.md | 4 ++++ packages/at_contacts_flutter/pubspec.yaml | 2 +- packages/at_contacts_group_flutter/CHANGELOG.md | 4 ++++ packages/at_contacts_group_flutter/pubspec.yaml | 2 +- packages/at_events_flutter/CHANGELOG.md | 4 ++++ packages/at_events_flutter/pubspec.yaml | 2 +- packages/at_follows_flutter/CHANGELOG.md | 4 ++++ packages/at_follows_flutter/pubspec.yaml | 2 +- packages/at_invitation_flutter/CHANGELOG.md | 4 ++++ packages/at_invitation_flutter/pubspec.yaml | 2 +- packages/at_location_flutter/CHANGELOG.md | 4 ++++ packages/at_location_flutter/pubspec.yaml | 2 +- packages/at_login_flutter/CHANGELOG.md | 5 +++++ packages/at_login_flutter/pubspec.yaml | 2 +- packages/at_notify_flutter/CHANGELOG.md | 4 ++++ packages/at_notify_flutter/pubspec.yaml | 2 +- packages/at_onboarding_flutter/CHANGELOG.md | 5 +++++ packages/at_onboarding_flutter/pubspec.yaml | 2 +- packages/at_sync_ui_flutter/CHANGELOG.md | 3 +++ packages/at_sync_ui_flutter/pubspec.yaml | 2 +- packages/at_theme_flutter/CHANGELOG.md | 3 +++ packages/at_theme_flutter/pubspec.yaml | 2 +- 26 files changed, 65 insertions(+), 13 deletions(-) diff --git a/packages/at_backupkey_flutter/CHANGELOG.md b/packages/at_backupkey_flutter/CHANGELOG.md index 7e8cfdadf..b76559d10 100644 --- a/packages/at_backupkey_flutter/CHANGELOG.md +++ b/packages/at_backupkey_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.11: +- **CHORE**: Bumped all dependency versions + - Major version increase of permission_handler from ^10.4.1 to ^11.0.0 + ## 4.0.10: - **CHORE**: Improved pub score diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index dca4bb103..4c3ea1922 100644 --- a/packages/at_backupkey_flutter/pubspec.yaml +++ b/packages/at_backupkey_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_backupkey_flutter description: A Flutter plugin project for saving the backup key of any atSign that is being onboarded with atPlatform apps. The backup key can be used to authenticate in other atPlatform apps. -version: 4.0.10 +version: 4.0.11 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_backupkey_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_chat_flutter/CHANGELOG.md b/packages/at_chat_flutter/CHANGELOG.md index a70df6e4e..c2fffce0e 100644 --- a/packages/at_chat_flutter/CHANGELOG.md +++ b/packages/at_chat_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.10 + +- **CHORE**: Bumped all dependency versions + ## 3.0.9 - **CHORE**: Updated documentation link and addressed pub analyze issues diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index 5422dbcc5..8fc02dc4e 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_chat_flutter description: A Flutter plugin project to provide a chat feature between atSigns built on the atPlatform to any Flutter application. -version: 3.0.9 +version: 3.0.10 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_chat_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_contacts_flutter/CHANGELOG.md b/packages/at_contacts_flutter/CHANGELOG.md index f192a5c68..4f529cd6f 100644 --- a/packages/at_contacts_flutter/CHANGELOG.md +++ b/packages/at_contacts_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.12 + +- **CHORE**: Bumped all dependency versions + ## 4.0.11 - **CHORE**: Updated dependency and improved pub score diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index eb2a7fa46..1dd26c641 100644 --- a/packages/at_contacts_flutter/pubspec.yaml +++ b/packages/at_contacts_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_contacts_flutter description: A Flutter plugin project to provide ease of managing contacts for an atSign using atPlatform. -version: 4.0.11 +version: 4.0.12 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_contacts_group_flutter/CHANGELOG.md b/packages/at_contacts_group_flutter/CHANGELOG.md index 3b72bd09a..23756f0c0 100644 --- a/packages/at_contacts_group_flutter/CHANGELOG.md +++ b/packages/at_contacts_group_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.14 + +- **CHORE**: Bumped all dependency versions + ## 4.0.13 - **CHORE**: Updated dependency and improved pub score diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index d0b96210b..c0d66c6ec 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_contacts_group_flutter description: A Flutter plugin project to provide group functionality with contacts using atPlatform. -version: 4.0.13 +version: 4.0.14 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter diff --git a/packages/at_events_flutter/CHANGELOG.md b/packages/at_events_flutter/CHANGELOG.md index 99ed93140..08724698c 100644 --- a/packages/at_events_flutter/CHANGELOG.md +++ b/packages/at_events_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.1.12 + +- **CHORE**: Bumped all dependency versions + ## 3.1.11 - **CHORE**: Upgraded dependencies diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index b8a257017..969525623 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_events_flutter description: A Flutter plugin project to manage events (time, place and attendees) using the atPlatform. -version: 3.1.11 +version: 3.1.12 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_events_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_follows_flutter/CHANGELOG.md b/packages/at_follows_flutter/CHANGELOG.md index 9345b6678..1e967cddd 100644 --- a/packages/at_follows_flutter/CHANGELOG.md +++ b/packages/at_follows_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.10 +- **CHORE**: Bumped all dependency versions + - Major version increase of permission_handler from ^9.2.0 to ^11.0.0 + ## 3.0.9 - **CHORE**: Replaced file_saver with at_file_saver diff --git a/packages/at_follows_flutter/pubspec.yaml b/packages/at_follows_flutter/pubspec.yaml index b53ad3e54..63cd4c542 100644 --- a/packages/at_follows_flutter/pubspec.yaml +++ b/packages/at_follows_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: at_follows_flutter description: A Flutter plugin project that provides a basic social "follows" functionality for atSigns. Provides a list of followers and following for atSigns with the option to unfollow them. -version: 3.0.9 +version: 3.0.10 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets diff --git a/packages/at_invitation_flutter/CHANGELOG.md b/packages/at_invitation_flutter/CHANGELOG.md index 41d14cc56..a8df366b4 100644 --- a/packages/at_invitation_flutter/CHANGELOG.md +++ b/packages/at_invitation_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.1 + +- **CHORE**: Bumped all dependency versions + - Major version increase of pin_code_fields from ^7.3.0 to ^8.0.1 ## 2.0.0 - **DOCS**: Updated documentation - **CHORE**: Updated dependencies diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index cffed8752..7b0baf305 100644 --- a/packages/at_invitation_flutter/pubspec.yaml +++ b/packages/at_invitation_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_invitation_flutter description: A Flutter package to invite contacts into apps that use atProtocol. -version: 2.0.0 +version: 2.0.1 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_invitation_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_location_flutter/CHANGELOG.md b/packages/at_location_flutter/CHANGELOG.md index 7ff1d0857..5d02f6ae8 100644 --- a/packages/at_location_flutter/CHANGELOG.md +++ b/packages/at_location_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +# 3.1.10 +- **CHORE**: Bumped all dependency versions + - Major version increase of geolocator from ^9.0.2 to ^10.0.1 + # 3.1.9 - **CHORE**: Improved pub score of package diff --git a/packages/at_location_flutter/pubspec.yaml b/packages/at_location_flutter/pubspec.yaml index 10c19520a..09966c29c 100644 --- a/packages/at_location_flutter/pubspec.yaml +++ b/packages/at_location_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_location_flutter description: A Flutter plugin project to share locations between two atSigns and track them on OSM (OpenStreetMap). -version: 3.1.9 +version: 3.1.10 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_location_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_login_flutter/CHANGELOG.md b/packages/at_login_flutter/CHANGELOG.md index 41cc7d819..30b81878e 100644 --- a/packages/at_login_flutter/CHANGELOG.md +++ b/packages/at_login_flutter/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.0.2 + +- **CHORE**: Bumped all dependency versions + - Major version increase of flutter_local_notifications from ^5.0.0+1 to ^15.1.1 + ## 0.0.1 * TODO: Describe initial release. diff --git a/packages/at_login_flutter/pubspec.yaml b/packages/at_login_flutter/pubspec.yaml index 86151bb23..e49c0a55c 100644 --- a/packages/at_login_flutter/pubspec.yaml +++ b/packages/at_login_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_login_flutter description: A flutter library for zero trust logins using the atProtocol -version: 0.0.1 +version: 0.0.2 homepage: https://docs.atsign.com/ environment: diff --git a/packages/at_notify_flutter/CHANGELOG.md b/packages/at_notify_flutter/CHANGELOG.md index f280bcdc8..eddcb3c71 100644 --- a/packages/at_notify_flutter/CHANGELOG.md +++ b/packages/at_notify_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.8 +- **CHORE**: Bumped all dependency versions + - Major version increase of flutter_local_notifications from ^14.1.1 to ^15.1.1 + ## 1.0.7 - **CHORE**: Improved pub score diff --git a/packages/at_notify_flutter/pubspec.yaml b/packages/at_notify_flutter/pubspec.yaml index b70cb66d9..79b3794f3 100644 --- a/packages/at_notify_flutter/pubspec.yaml +++ b/packages/at_notify_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_notify_flutter description: A Flutter plugin project to send notification to any atSign in atPlatform apps with ease. -version: 1.0.7 +version: 1.0.8 homepage: https://atsign.dev repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_notify_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index 089d357f5..afcbb0de6 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,8 @@ +## 6.1.4 +- **CHORE**: Bumped all dependency versions + - Major version increase of permission_handler from ^10.4.3 to ^11.0.0 + - Major version increase of file_selector from >=0.8.4+3 <=1.0.0 to ^1.1.0 + ## 6.1.3 - **CHORE**: Updated at_client_mobile package to fix onboarding issue on Windows diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 3c52638e8..aeb450f8d 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: at_onboarding_flutter description: A Flutter plugin project for onboarding any atSign in atPlatform apps with ease. Provides a QRscanner option and an upload key file option to authenticate. -version: 6.1.3 +version: 6.1.4 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_onboarding_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_sync_ui_flutter/CHANGELOG.md b/packages/at_sync_ui_flutter/CHANGELOG.md index d67693a25..0331bf68c 100644 --- a/packages/at_sync_ui_flutter/CHANGELOG.md +++ b/packages/at_sync_ui_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.10 +- **CHORE**: Bumped all dependency versions + ## 1.0.9 - **REFACTOR**: Deprecated `sync()` method and moved it's implementation to init. - **CHORE**: Improved pub score diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index df697c815..578c58771 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_sync_ui_flutter description: A Flutter plugin project to provide UI widgets for displaying status of sync process in atProtocol apps. -version: 1.0.9 +version: 1.0.10 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_theme_flutter/CHANGELOG.md b/packages/at_theme_flutter/CHANGELOG.md index 848c24e45..5cdda1e1d 100644 --- a/packages/at_theme_flutter/CHANGELOG.md +++ b/packages/at_theme_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.6 +- **CHORE**: Bumped all dependency versions + ## 1.0.5 - **CHORE**: Improved pub score diff --git a/packages/at_theme_flutter/pubspec.yaml b/packages/at_theme_flutter/pubspec.yaml index c62443302..f947efa91 100644 --- a/packages/at_theme_flutter/pubspec.yaml +++ b/packages/at_theme_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_theme_flutter description: A Flutter plugin project to provide theme selection in atPlatform apps with ease. -version: 1.0.5 +version: 1.0.6 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues From 579a208f474ad127c0c288d90af5c4397b294f14 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Thu, 21 Sep 2023 16:40:00 +0800 Subject: [PATCH 14/17] chore(deps): use local path for onboarding example --- packages/at_onboarding_flutter/example/pubspec.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index f36983483..e59328e0d 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -29,7 +29,8 @@ environment: dependencies: at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 - at_onboarding_flutter: ^6.1.3 + at_onboarding_flutter: + path: ../packages/at_onboarding_flutter cupertino_icons: ^1.0.6 flutter: sdk: flutter From bcad99a020e812acadc328d1b5177fbac911954b Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Thu, 21 Sep 2023 16:40:38 +0800 Subject: [PATCH 15/17] chore(at_sync_ui_flutter): merge 1.0.10 changes into 1.0.9 and rollback version --- packages/at_sync_ui_flutter/CHANGELOG.md | 4 +--- packages/at_sync_ui_flutter/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/at_sync_ui_flutter/CHANGELOG.md b/packages/at_sync_ui_flutter/CHANGELOG.md index 0331bf68c..aede5ad5b 100644 --- a/packages/at_sync_ui_flutter/CHANGELOG.md +++ b/packages/at_sync_ui_flutter/CHANGELOG.md @@ -1,7 +1,5 @@ -## 1.0.10 -- **CHORE**: Bumped all dependency versions - ## 1.0.9 +- **CHORE**: Bumped all dependency versions - **REFACTOR**: Deprecated `sync()` method and moved it's implementation to init. - **CHORE**: Improved pub score diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index 578c58771..df697c815 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: at_sync_ui_flutter description: A Flutter plugin project to provide UI widgets for displaying status of sync process in atProtocol apps. -version: 1.0.10 +version: 1.0.9 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues From 294a0a2dc7504ad14c486ce39c9820dbca8c8e09 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Thu, 21 Sep 2023 16:55:11 +0800 Subject: [PATCH 16/17] fix: warnings on publish for at_follows_flutter --- .../lib/services/connections_service.dart | 2 -- .../at_follows_flutter/lib/services/sdk_service.dart | 4 +--- packages/at_follows_flutter/lib/widgets/followers.dart | 6 +++--- .../at_follows_flutter/lib/widgets/web_view_screen.dart | 2 -- .../test/unit_tests/connections_service_test.dart | 9 +++++++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/at_follows_flutter/lib/services/connections_service.dart b/packages/at_follows_flutter/lib/services/connections_service.dart index d8f0997f1..790e19489 100644 --- a/packages/at_follows_flutter/lib/services/connections_service.dart +++ b/packages/at_follows_flutter/lib/services/connections_service.dart @@ -3,10 +3,8 @@ import 'package:at_follows_flutter/domain/atsign.dart'; import 'package:at_follows_flutter/domain/connection_model.dart'; import 'package:at_follows_flutter/services/sdk_service.dart'; import 'package:at_follows_flutter/utils/app_constants.dart'; -import 'package:at_commons/at_commons.dart'; import 'package:at_follows_flutter/utils/strings.dart'; import 'package:at_utils/at_logger.dart'; -import 'package:at_lookup/at_lookup.dart'; import 'package:at_client_mobile/at_client_mobile.dart'; import 'package:at_client/at_client.dart'; diff --git a/packages/at_follows_flutter/lib/services/sdk_service.dart b/packages/at_follows_flutter/lib/services/sdk_service.dart index d6d5c1940..4efeb9b4b 100644 --- a/packages/at_follows_flutter/lib/services/sdk_service.dart +++ b/packages/at_follows_flutter/lib/services/sdk_service.dart @@ -1,8 +1,6 @@ import 'dart:convert'; -import 'package:at_client/src/service/notification_service.dart'; import 'package:at_client_mobile/at_client_mobile.dart'; -import 'package:at_commons/at_commons.dart'; import 'package:at_follows_flutter/exceptions/at_follows_exceptions.dart'; import 'package:at_follows_flutter/services/connections_service.dart'; import 'package:at_follows_flutter/utils/app_constants.dart'; @@ -154,7 +152,7 @@ class SDKService { : AppConstants.followersKey; await this.put(newKey, value.value); value = await this.get(newKey); - if (value != null && value.value != null) { + if (value.value != null) { await this.delete(scanKey[0]); } } diff --git a/packages/at_follows_flutter/lib/widgets/followers.dart b/packages/at_follows_flutter/lib/widgets/followers.dart index a4ab6d537..57da6a933 100644 --- a/packages/at_follows_flutter/lib/widgets/followers.dart +++ b/packages/at_follows_flutter/lib/widgets/followers.dart @@ -68,7 +68,7 @@ class _FollowersState extends State { ), ); } else if (provider.status == Status.done) { - WidgetsBinding.instance!.addPostFrameCallback((_) async { + WidgetsBinding.instance.addPostFrameCallback((_) async { widget.count!(); }); if (_connectionsService.followerAtsign != null) { @@ -257,7 +257,7 @@ class _FollowersState extends State { } else if (provider.status == Status.error) { return AtExceptionHandler().handle(provider.error, context); } else { - WidgetsBinding.instance!.addPostFrameCallback((_) async { + WidgetsBinding.instance.addPostFrameCallback((_) async { await provider.getAtsignsList(isFollowing: widget.isFollowing); }); return SizedBox(); @@ -273,7 +273,7 @@ class _FollowersState extends State { return; } - WidgetsBinding.instance!.addPostFrameCallback((_) async { + WidgetsBinding.instance.addPostFrameCallback((_) async { _isDialogOpen = true; showDialog( context: context, diff --git a/packages/at_follows_flutter/lib/widgets/web_view_screen.dart b/packages/at_follows_flutter/lib/widgets/web_view_screen.dart index 6ddae2fbc..ae2695697 100644 --- a/packages/at_follows_flutter/lib/widgets/web_view_screen.dart +++ b/packages/at_follows_flutter/lib/widgets/web_view_screen.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:at_follows_flutter/utils/app_constants.dart'; import 'package:at_follows_flutter/utils/color_constants.dart'; import 'package:at_follows_flutter/widgets/custom_appbar.dart'; diff --git a/packages/at_follows_flutter/test/unit_tests/connections_service_test.dart b/packages/at_follows_flutter/test/unit_tests/connections_service_test.dart index b78b91b4b..b5ba7029b 100644 --- a/packages/at_follows_flutter/test/unit_tests/connections_service_test.dart +++ b/packages/at_follows_flutter/test/unit_tests/connections_service_test.dart @@ -1,3 +1,6 @@ +// ignoring this for the entire file to make it easier to detect real issues when doing review for publishing +// ignore_for_file: unused_local_variable + import 'dart:async'; import 'dart:convert'; import 'dart:io'; @@ -10,7 +13,6 @@ import 'package:at_follows_flutter/services/sdk_service.dart'; import 'package:at_follows_flutter/utils/app_constants.dart'; import 'package:flutter_test/flutter_test.dart'; import '../at_demo_credentials.dart' as demo_data; -import 'package:at_commons/at_commons.dart'; SDKService _sdkService = SDKService(); ConnectionsService _connectionsService = ConnectionsService(); @@ -23,7 +25,9 @@ void main() { final atClientManager = AtClientManager.getInstance(); _connectionsService.init(senderAtsign); ConnectionProvider().init(senderAtsign); - atClientManager.notificationService.subscribe().listen((notification) { + atClientManager.atClient.notificationService + .subscribe() + .listen((notification) { monitorCallBack(notification); }); }); @@ -34,6 +38,7 @@ void main() { await setUpFunc(receiverAtsign); AtClientManager.getInstance() + .atClient .notificationService .subscribe() .listen((notification) { From 032910e600aa87a03814d9ce789e558a9562db06 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Thu, 21 Sep 2023 16:59:16 +0800 Subject: [PATCH 17/17] fix: warnings in at_invitation_flutter --- .../lib/services/invitation_service.dart | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/at_invitation_flutter/lib/services/invitation_service.dart b/packages/at_invitation_flutter/lib/services/invitation_service.dart index 44bd1a1e5..2c9e333e3 100644 --- a/packages/at_invitation_flutter/lib/services/invitation_service.dart +++ b/packages/at_invitation_flutter/lib/services/invitation_service.dart @@ -46,7 +46,8 @@ class InvitationService { // called again if outbound connection is dropped Future startMonitor() async { if (!hasMonitorStarted) { - AtClientManager.getInstance().atClient + AtClientManager.getInstance() + .atClient .notificationService .subscribe(shouldDecrypt: true) .listen((notification) { @@ -91,7 +92,7 @@ class InvitationService { // build and fetch self key AtKey atKey = AtKey()..metadata = Metadata(); - atKey.key = invitationKey + '.' + (receivedInformation.identifier ?? ''); + atKey.key = '$invitationKey.${receivedInformation.identifier ?? ''}'; atKey.metadata?.ttr = -1; var result = await AtClientManager.getInstance().atClient.get(atKey); MessageShareModel sentInformation = @@ -107,6 +108,7 @@ class InvitationService { .put(atKey, jsonEncode(sentInformation.message)) .catchError((e) { _logger.severe('Error in sharing saved message => $e'); + throw e; }); } } @@ -122,15 +124,16 @@ class InvitationService { passcode: passcode, identifier: keyID, message: jsonData); AtKey atKey = AtKey()..metadata = Metadata(); - atKey.key = invitationKey + '.' + keyID; + atKey.key = '$invitationKey.$keyID'; atKey.metadata?.ttr = -1; var result = await AtClientManager.getInstance() .atClient .put(atKey, jsonEncode(messageContent)) .catchError((e) { _logger.severe('Error in saving shared data => $e'); + throw e; }); - if (result == true) { + if (result && context.mounted) { showDialog( context: context, builder: (context) => ShareDialog( @@ -151,7 +154,7 @@ class InvitationService { builder: (context) => const OTPDialog(), ); AtKey atKey = AtKey()..metadata = Metadata(); - atKey.key = invitationAckKey + '.' + data; + atKey.key = '$invitationAckKey.$data'; atKey.sharedWith = atsign; atKey.metadata?.ttr = -1; MessageShareModel messageContent = MessageShareModel( @@ -161,6 +164,7 @@ class InvitationService { .put(atKey, jsonEncode(messageContent)) .catchError((e) { _logger.severe('Error in saving acknowledge message => $e'); + throw e; }); } }