diff --git a/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 508252dd8..591d027b4 100644 --- a/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { 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")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_chat_flutter/example/pubspec.yaml b/packages/at_chat_flutter/example/pubspec.yaml index e497ce7fb..1aecaf290 100644 --- a/packages/at_chat_flutter/example/pubspec.yaml +++ b/packages/at_chat_flutter/example/pubspec.yaml @@ -35,7 +35,7 @@ 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 + at_onboarding_flutter: ^6.1.7 at_client_mobile: ^3.2.13 at_utils: ^3.0.15 path_provider: ^2.1.1 diff --git a/packages/at_chat_flutter/lib/services/chat_service.dart b/packages/at_chat_flutter/lib/services/chat_service.dart index 9edb60860..a3da060bc 100644 --- a/packages/at_chat_flutter/lib/services/chat_service.dart +++ b/packages/at_chat_flutter/lib/services/chat_service.dart @@ -160,7 +160,7 @@ class ChatService { ..sharedBy = currentAtSign! ..sharedWith = chatWithAtSign ..metadata = Metadata(); - key.metadata?.ccd = true; + key.metadata.ccd = true; var keyValue = await atClientManager.atClient.get(key).catchError((e) { return AtValue(); }); @@ -262,8 +262,8 @@ class ChatService { ..sharedBy = currentAtSign! ..sharedWith = chatWithAtSign ..metadata = Metadata(); - key.metadata?.ccd = true; - key.metadata?.ttr = -1; + key.metadata.ccd = true; + key.metadata.ttr = -1; chatHistoryMessages.insert(0, message.toJson()); if (message.contentType == MessageContentType.image) { @@ -295,7 +295,7 @@ class ChatService { ..sharedBy = currentAtSign! ..sharedWith = chatWithAtSign ..metadata = Metadata(); - key.metadata?.ccd = true; + key.metadata.ccd = true; try { for (var i = 0; i < chatHistoryMessages.length; i++) { var message = Message.fromJson(chatHistoryMessages[i]); @@ -326,7 +326,7 @@ class ChatService { ..sharedBy = currentAtSign! ..sharedWith = chatWithAtSign ..metadata = Metadata(); - key.metadata?.ccd = true; + key.metadata.ccd = true; try { for (var i = 0; i < chatHistoryMessages.length; i++) { @@ -369,9 +369,9 @@ class ChatService { ..sharedBy = currentAtSign! ..sharedWith = chatWithAtSign ..metadata = Metadata(); - key.metadata?.ccd = true; - key.metadata?.ttr = -1; - key.metadata?.isBinary = true; + key.metadata.ccd = true; + key.metadata.ttr = -1; + key.metadata.isBinary = true; if (isGroupChat) { await Future.forEach(groupChatMembers!, (dynamic member) async { @@ -422,14 +422,14 @@ class ChatService { var key = AtKey(); Map keyFields = fieldSeparator(savedKey); // construct key - key.key = keyFields['key']; + key.key = keyFields['key'] ?? ""; key.sharedBy = keyFields['sharedBy']; key.sharedWith = keyFields['sharedWith']; // prepare metadata key.metadata = Metadata(); - key.metadata?.ccd = true; - key.metadata?.ttr = -1; - key.metadata?.isBinary = true; + key.metadata.ccd = true; + key.metadata.ttr = -1; + key.metadata.isBinary = true; return key; } diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index 2fcf8aed3..000837f8b 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -11,13 +11,13 @@ environment: flutter: ">=1.20.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 - at_contact: ^3.0.7 + at_commons: ^4.0.1 + at_contact: ^3.0.8 at_lookup: ^3.0.40 - file_picker: ^5.5.0 + file_picker: ^6.1.1 flutter: sdk: flutter diff --git a/packages/at_chat_flutter/test/unit_test/chat_screen_test.dart b/packages/at_chat_flutter/test/unit_test/chat_screen_test.dart index 4bde2bf24..dd3e2981e 100644 --- a/packages/at_chat_flutter/test/unit_test/chat_screen_test.dart +++ b/packages/at_chat_flutter/test/unit_test/chat_screen_test.dart @@ -25,7 +25,7 @@ class MockAtClient extends Mock implements AtClient { bool isDedicated = false, GetRequestOptions? getRequestOptions, }) async { - if (key.metadata?.isBinary == true) { + if (key.metadata.isBinary == true) { return AtValue()..value = Uint8List(5); } else { var atSign = "@83apedistinct"; diff --git a/packages/at_contacts_flutter/example/ios/Podfile.lock b/packages/at_contacts_flutter/example/ios/Podfile.lock index 7bce96573..da555c062 100644 --- a/packages/at_contacts_flutter/example/ios/Podfile.lock +++ b/packages/at_contacts_flutter/example/ios/Podfile.lock @@ -9,6 +9,8 @@ PODS: - Flutter - biometric_storage (0.0.1): - Flutter + - device_info_plus (0.0.1): + - Flutter - DKImagePickerController/Core (4.3.4): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource @@ -43,6 +45,8 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - file_selector_ios (0.0.1): + - Flutter - Flutter (1.0.0) - flutter_keychain (0.0.1): - Flutter @@ -52,7 +56,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.0.4): + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -77,7 +81,9 @@ DEPENDENCIES: - at_file_saver (from `.symlinks/plugins/at_file_saver/ios`) - at_onboarding_flutter (from `.symlinks/plugins/at_onboarding_flutter/ios`) - biometric_storage (from `.symlinks/plugins/biometric_storage/ios`) + - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) - Flutter (from `Flutter`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) @@ -108,8 +114,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/at_onboarding_flutter/ios" biometric_storage: :path: ".symlinks/plugins/biometric_storage/ios" + device_info_plus: + :path: ".symlinks/plugins/device_info_plus/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" Flutter: :path: Flutter flutter_keychain: @@ -137,23 +147,25 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/project.pbxproj index 4d7aedae7..157662f13 100644 --- a/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a33..a6b826db2 100644 --- a/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_contacts_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =1.20.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 - at_contact: ^3.0.7 + at_commons: ^4.0.1 + at_contact: ^3.0.8 at_lookup: ^3.0.40 at_utils: ^3.0.15 flutter: 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 b74318456..ec77aea7a 100644 --- a/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,6 +10,7 @@ import biometric_storage import device_info_plus import emoji_picker_flutter import file_selector_macos +import flutter_image_compress_macos import package_info_plus import path_provider_foundation import share_plus @@ -22,7 +23,8 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_contacts_group_flutter/example/pubspec.yaml b/packages/at_contacts_group_flutter/example/pubspec.yaml index 121d2592b..370bf4451 100644 --- a/packages/at_contacts_group_flutter/example/pubspec.yaml +++ b/packages/at_contacts_group_flutter/example/pubspec.yaml @@ -39,13 +39,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.3 + at_onboarding_flutter: ^6.1.7 # 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 +dependency_overrides: + at_commons: ^4.0.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 diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index c0d66c6ec..8d5b9ddd7 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -16,12 +16,12 @@ 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_contact: ^3.0.8 + at_contacts_flutter: ^4.0.13 at_utils: ^3.0.15 collection: ^1.17.0 emoji_picker_flutter: ^1.6.1 - file_picker: ^5.5.0 + file_picker: ^6.1.1 file_selector: ^1.0.1 file_selector_macos: ^0.9.3+2 flutter: @@ -34,6 +34,9 @@ dependencies: image_compression: ^1.0.4 pedantic: ^1.11.1 +dependency_overrides: + at_commons: ^4.0.1 + dev_dependencies: flutter_lints: ^2.0.3 flutter_test: diff --git a/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index f87cfb69b..36c638cad 100644 --- a/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,6 +10,7 @@ import biometric_storage import device_info_plus import emoji_picker_flutter import file_selector_macos +import flutter_image_compress_macos import geolocator_apple import package_info_plus import path_provider_foundation @@ -24,8 +25,9 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_events_flutter/example/pubspec.yaml b/packages/at_events_flutter/example/pubspec.yaml index 1d8fe1c11..3a99587bb 100644 --- a/packages/at_events_flutter/example/pubspec.yaml +++ b/packages/at_events_flutter/example/pubspec.yaml @@ -35,7 +35,7 @@ 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 + at_onboarding_flutter: ^6.1.7 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -43,6 +43,10 @@ dependencies: flutter: sdk: flutter +dependency_overrides: + at_commons: ^4.0.1 + file_picker: ^6.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 diff --git a/packages/at_events_flutter/lib/services/contact_service.dart b/packages/at_events_flutter/lib/services/contact_service.dart index 07ed90199..5ad0608c7 100644 --- a/packages/at_events_flutter/lib/services/contact_service.dart +++ b/packages/at_events_flutter/lib/services/contact_service.dart @@ -82,7 +82,7 @@ Future> getContactDetails(atSign) async { } // profile picture - key.metadata!.isBinary = true; + key.metadata.isBinary = true; key.key = contactFields[2]; result = await EventKeyStreamService().atClientManager.atClient.get(key); var image = result.value; diff --git a/packages/at_events_flutter/lib/services/event_key_stream_service.dart b/packages/at_events_flutter/lib/services/event_key_stream_service.dart index e46fb0ecb..6ad32970f 100644 --- a/packages/at_events_flutter/lib/services/event_key_stream_service.dart +++ b/packages/at_events_flutter/lib/services/event_key_stream_service.dart @@ -559,8 +559,8 @@ class EventKeyStreamService { case ATKEY_TYPE_ENUM.ACKNOWLEDGEEVENT: var key = AtKey() ..metadata = Metadata() - ..metadata!.ttr = -1 - ..metadata!.ccd = true + ..metadata.ttr = -1 + ..metadata.ccd = true ..sharedWith = sharedWith ..sharedBy = sharedBy; diff --git a/packages/at_events_flutter/lib/services/event_services.dart b/packages/at_events_flutter/lib/services/event_services.dart index 4deb573b4..af392161a 100644 --- a/packages/at_events_flutter/lib/services/event_services.dart +++ b/packages/at_events_flutter/lib/services/event_services.dart @@ -156,8 +156,8 @@ class EventService { var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = -1 - ..metadata!.ccd = true + ..metadata.ttr = -1 + ..metadata.ccd = true ..key = 'createevent-${DateTime.now().microsecondsSinceEpoch}' ..sharedBy = eventNotification.atsignCreator; @@ -461,9 +461,9 @@ class EventService { /// returns [AtKey] of [regexKey] AtKey getAtKey(String regexKey) { var atKey = AtKey.fromString(regexKey); - atKey.metadata!.ttr = -1; + atKey.metadata.ttr = -1; // atKey.metadata.ttl = MixedConstants.maxTTL; // 7 days - atKey.metadata!.ccd = true; + atKey.metadata.ccd = true; return atKey; } diff --git a/packages/at_events_flutter/lib/services/venues_services.dart b/packages/at_events_flutter/lib/services/venues_services.dart index 5c31a3d3f..aee2730f5 100644 --- a/packages/at_events_flutter/lib/services/venues_services.dart +++ b/packages/at_events_flutter/lib/services/venues_services.dart @@ -26,8 +26,8 @@ class VenuesServices { try { var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = -1 - ..metadata!.ccd = true + ..metadata.ttr = -1 + ..metadata.ccd = true ..key = venueLatLngKey; var value = await AtClientManager.getInstance() .atClient @@ -80,8 +80,8 @@ class VenuesServices { try { var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = -1 - ..metadata!.ccd = true + ..metadata.ttr = -1 + ..metadata.ccd = true ..key = venueLatLngKey; var _convertedObject = _tempVenues diff --git a/packages/at_events_flutter/lib/utils/init_events_service.dart b/packages/at_events_flutter/lib/utils/init_events_service.dart index 0f3c5a40d..dc958625f 100644 --- a/packages/at_events_flutter/lib/utils/init_events_service.dart +++ b/packages/at_events_flutter/lib/utils/init_events_service.dart @@ -80,8 +80,8 @@ Future createEvent(EventNotificationModel eventData) async { try { var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = -1 - ..key = eventData.key + ..metadata.ttr = -1 + ..key = eventData.key ?? "" ..sharedWith = eventData.group!.members!.elementAt(0).atSign ..sharedBy = eventData.atsignCreator; var eventJson = diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 969525623..19ada3a88 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -12,11 +12,11 @@ environment: flutter: ">=1.20.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 at_commons: ^3.0.55 - at_contact: ^3.0.7 + at_contact: ^3.0.8 at_contacts_flutter: ^4.0.11 at_contacts_group_flutter: ^4.0.13 at_location_flutter: ^3.1.9 @@ -29,6 +29,10 @@ dependencies: latlong2: ^0.9.0 sliding_up_panel: ^2.0.0+1 +dependency_overrides: + at_commons: ^4.0.1 + file_picker: ^6.1.1 + dev_dependencies: flutter_lints: ^2.0.3 flutter_test: diff --git a/packages/at_follows_flutter/example/lib/services/at_service.dart b/packages/at_follows_flutter/example/lib/services/at_service.dart index 815084cf9..9bef0da85 100644 --- a/packages/at_follows_flutter/example/lib/services/at_service.dart +++ b/packages/at_follows_flutter/example/lib/services/at_service.dart @@ -41,13 +41,13 @@ class AtService { } Future put({String? key, var value}) async { - var atKey = at_commons.AtKey()..key = key; + var atKey = at_commons.AtKey()..key = key ?? ""; // ..metadata = metaData; return await atClientInstance!.put(atKey, value); } Future delete({String? key}) async { - var atKey = at_commons.AtKey()..key = key; + var atKey = at_commons.AtKey()..key = key ?? ""; return await atClientInstance!.delete(atKey); } diff --git a/packages/at_follows_flutter/example/pubspec.yaml b/packages/at_follows_flutter/example/pubspec.yaml index dbb031176..a57dfd025 100644 --- a/packages/at_follows_flutter/example/pubspec.yaml +++ b/packages/at_follows_flutter/example/pubspec.yaml @@ -18,7 +18,7 @@ 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 + at_onboarding_flutter: ^6.1.7 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. diff --git a/packages/at_follows_flutter/lib/services/connections_service.dart b/packages/at_follows_flutter/lib/services/connections_service.dart index ccc2f76a9..a6b65075b 100644 --- a/packages/at_follows_flutter/lib/services/connections_service.dart +++ b/packages/at_follows_flutter/lib/services/connections_service.dart @@ -118,7 +118,7 @@ class ConnectionsService { //change metadata to private to notify if (result) { atKey..sharedWith = atsign; - atMetadata?..isPublic = false; + atMetadata..isPublic = false; atKey..metadata = atMetadata; await _sdkService.notify( atKey, atsign!, OperationEnum.update, _onNotifyDone, _onNotifyError); @@ -140,7 +140,7 @@ class ConnectionsService { //notify @sign about delete if (result) { atKey..sharedWith = atsign; - atMetadata?..isPublic = false; + atMetadata..isPublic = false; atKey..metadata = atMetadata; await _sdkService.notify( atKey, atsign, OperationEnum.delete, _onNotifyDone, _onNotifyError); @@ -153,7 +153,7 @@ class ConnectionsService { //notify @sign about delete if (result) { atKey..sharedWith = atsign; - atMetadata?..isPublic = false; + atMetadata..isPublic = false; atKey..metadata = atMetadata; await _sdkService.notify( atKey, atsign, OperationEnum.delete, _onNotifyDone, _onNotifyError); @@ -171,7 +171,7 @@ class ConnectionsService { var result = await _modifyKey(atsign, this.following, atKey); if (result) { atKey..sharedWith = atsign; - atMetadata?..isPublic = false; + atMetadata..isPublic = false; atKey..metadata = atMetadata; await _sdkService.notify( atKey, atsign!, OperationEnum.delete, _onNotifyDone, _onNotifyError); @@ -320,7 +320,7 @@ class ConnectionsService { this.followers.create(followersValue); if (followersValue.metadata != null) { connectionProvider.connectionslistStatus.isFollowersPrivate = - !followersValue.metadata!.isPublic!; + !followersValue.metadata!.isPublic; await _sdkService.sync(); } } else { @@ -332,7 +332,7 @@ class ConnectionsService { if (followingValue.metadata != null) { connectionProvider.connectionslistStatus.isFollowingPrivate = - !followingValue.metadata!.isPublic!; + !followingValue.metadata!.isPublic; await _sdkService.sync(); } } @@ -354,13 +354,13 @@ class ConnectionsService { atKey = AtKey() ..metadata = atMetadata ..key = AppConstants.followingKey - ..sharedWith = atMetadata.isPublic! ? null : atSign; + ..sharedWith = atMetadata.isPublic ? null : atSign; } else { var atMetadata = Metadata()..isPublic = !followers.isPrivate; atKey = AtKey() ..metadata = atMetadata ..key = AppConstants.followersKey - ..sharedWith = atMetadata.isPublic! ? null : atSign; + ..sharedWith = atMetadata.isPublic ? null : atSign; } return atKey; } @@ -389,20 +389,20 @@ class ConnectionsService { //performs plookup if the data is not in cache. if (atValue.value == null) { //plookup for wavi keys. - atKey.metadata!.isCached = false; + atKey.metadata.isCached = false; /// remove cached key.replaceAll('cached:', ''); - atKey.key?.replaceAll('cached:', ''); + atKey.key.replaceAll('cached:', ''); atValue = await _sdkService.get(atKey); //cache lookup for persona keys if (atValue.value == null) { - atKey.key = PublicData.personaMap[key]; - atKey.metadata!.isCached = true; + atKey.key = PublicData.personaMap[key] ?? ""; + atKey.metadata.isCached = true; atValue = await _sdkService.get(atKey); //plookup for persona keys. if (atValue.value == null) { - atKey.metadata!.isCached = false; + atKey.metadata.isCached = false; atValue = await _sdkService.get(atKey); } } diff --git a/packages/at_follows_flutter/lib/services/sdk_service.dart b/packages/at_follows_flutter/lib/services/sdk_service.dart index 48c28f78f..e114bf5a0 100644 --- a/packages/at_follows_flutter/lib/services/sdk_service.dart +++ b/packages/at_follows_flutter/lib/services/sdk_service.dart @@ -134,7 +134,7 @@ class SDKService { onTimeout: () => _onTimeOut()); int index = scanKey.length - 1; for (int i = 0; i < scanKey.length; i++) { - if (scanKey[i].key!.endsWith("self.at_follows") && + if (scanKey[i].key.endsWith("self.at_follows") && scanKey[i].namespace == "wavi" && scanKey[i].sharedWith == null) { index = i; @@ -148,7 +148,7 @@ class SDKService { _isOldKey(scanKey[0].key) && value.value != null) { var newKey = AtKey()..metadata = scanKey[0].metadata; - newKey.key = scanKey[0].key!.contains('following') + newKey.key = scanKey[0].key.contains('following') ? AppConstants.followingKey : AppConstants.followersKey; await this.put(newKey, value.value); diff --git a/packages/at_follows_flutter/pubspec.yaml b/packages/at_follows_flutter/pubspec.yaml index 1ca34e6b2..47019bb94 100644 --- a/packages/at_follows_flutter/pubspec.yaml +++ b/packages/at_follows_flutter/pubspec.yaml @@ -11,9 +11,9 @@ environment: flutter: ">=1.20.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 - at_commons: ^3.0.55 + at_commons: ^4.0.1 at_file_saver: ^0.1.2 at_lookup: ^3.0.40 at_server_status: ^1.0.3 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 14a8f1ec7..5a1c1c313 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 @@ -151,7 +151,7 @@ void main() { connectionProvider.connectionslistStatus.isFollowingPrivate, false); var result = await _connectionsService.changeListPublicStatus(true, true); expect(result, true); - expect(_connectionsService.following.getKey!.atKey.metadata!.isPublic, + expect(_connectionsService.following.getKey!.atKey.metadata.isPublic, false); }); test('change from private to public', () async { @@ -168,7 +168,7 @@ void main() { await _connectionsService.changeListPublicStatus(true, false); expect(result, true); expect( - _connectionsService.following.getKey!.atKey.metadata!.isPublic, true); + _connectionsService.following.getKey!.atKey.metadata.isPublic, true); }); }); @@ -254,10 +254,10 @@ void main() { await _sdkService.put(atKey1, '@sameerajađź› ,@sitaramđź› '); await _connectionsService.getAtsignsList(); expect( - _connectionsService.following.getKey!.atKey.metadata!.isPublic, true); + _connectionsService.following.getKey!.atKey.metadata.isPublic, true); var result = await _connectionsService.changeListPublicStatus(true, true); expect(result, true); - expect(_connectionsService.following.getKey!.atKey.metadata!.isPublic, + expect(_connectionsService.following.getKey!.atKey.metadata.isPublic, false); }); @@ -270,7 +270,7 @@ void main() { ..metadata = atMetadata; await _sdkService.put(atKey1, '@sameerajađź› ,@sitaramđź› '); await _connectionsService.getAtsignsList(); - expect(_connectionsService.following.getKey!.atKey.metadata!.isPublic, + expect(_connectionsService.following.getKey!.atKey.metadata.isPublic, false); var result = diff --git a/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 508252dd8..591d027b4 100644 --- a/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_invitation_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { 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")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_invitation_flutter/example/pubspec.yaml b/packages/at_invitation_flutter/example/pubspec.yaml index d8c47253e..04281f6e9 100644 --- a/packages/at_invitation_flutter/example/pubspec.yaml +++ b/packages/at_invitation_flutter/example/pubspec.yaml @@ -35,7 +35,7 @@ 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.5 + at_onboarding_flutter: ^6.1.7 at_client_mobile: ^3.2.13 at_utils: ^3.0.15 flutter_keychain: ^2.4.0 diff --git a/packages/at_invitation_flutter/lib/services/invitation_service.dart b/packages/at_invitation_flutter/lib/services/invitation_service.dart index 59a6a8c8b..e08aeb3de 100644 --- a/packages/at_invitation_flutter/lib/services/invitation_service.dart +++ b/packages/at_invitation_flutter/lib/services/invitation_service.dart @@ -92,7 +92,7 @@ class InvitationService { // build and fetch self key AtKey atKey = AtKey()..metadata = Metadata(); atKey.key = '$invitationKey.${receivedInformation.identifier ?? ''}'; - atKey.metadata?.ttr = -1; + atKey.metadata.ttr = -1; var result = await AtClientManager.getInstance().atClient.get(atKey); MessageShareModel sentInformation = MessageShareModel.fromJson(jsonDecode(result.value)); @@ -124,7 +124,7 @@ class InvitationService { AtKey atKey = AtKey()..metadata = Metadata(); atKey.key = '$invitationKey.$keyID'; - atKey.metadata?.ttr = -1; + atKey.metadata.ttr = -1; var result = await AtClientManager.getInstance() .atClient .put(atKey, jsonEncode(messageContent)) @@ -155,7 +155,7 @@ class InvitationService { AtKey atKey = AtKey()..metadata = Metadata(); atKey.key = '$invitationAckKey.$data'; atKey.sharedWith = atsign; - atKey.metadata?.ttr = -1; + atKey.metadata.ttr = -1; MessageShareModel messageContent = MessageShareModel( passcode: otp, identifier: data, message: 'invite acknowledgement'); await AtClientManager.getInstance() diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index 549591add..61f911dfd 100644 --- a/packages/at_invitation_flutter/pubspec.yaml +++ b/packages/at_invitation_flutter/pubspec.yaml @@ -13,7 +13,7 @@ environment: dependencies: at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 + at_commons: ^4.0.1 at_lookup: ^3.0.40 at_utils: ^3.0.15 flutter: diff --git a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index a4d84f2b2..a61ce2a1c 100644 --- a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -23,7 +23,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_location_flutter/example/pubspec.yaml b/packages/at_location_flutter/example/pubspec.yaml index 4730fc1d9..4d6fc2717 100644 --- a/packages/at_location_flutter/example/pubspec.yaml +++ b/packages/at_location_flutter/example/pubspec.yaml @@ -35,7 +35,7 @@ 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 + at_onboarding_flutter: ^6.1.7 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -44,6 +44,9 @@ dependencies: sdk: flutter latlong2: ^0.9.0 +dependency_overrides: + at_commons: ^4.0.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 diff --git a/packages/at_location_flutter/lib/service/contact_service.dart b/packages/at_location_flutter/lib/service/contact_service.dart index 19e6bcf1a..98d1fa248 100644 --- a/packages/at_location_flutter/lib/service/contact_service.dart +++ b/packages/at_location_flutter/lib/service/contact_service.dart @@ -74,7 +74,7 @@ Future> getContactDetails(atSign) async { } // profile picture - key.metadata!.isBinary = true; + key.metadata.isBinary = true; key.key = contactFields[2]; result = await KeyStreamService().atClientInstance!.get(key); var image = result.value; diff --git a/packages/at_location_flutter/lib/service/notify_and_put.dart b/packages/at_location_flutter/lib/service/notify_and_put.dart index 96a7e6fe3..96a69f6eb 100644 --- a/packages/at_location_flutter/lib/service/notify_and_put.dart +++ b/packages/at_location_flutter/lib/service/notify_and_put.dart @@ -64,9 +64,9 @@ class NotifyAndPut { AtKey removeNamespaceFromKey(AtKey atKey) { if (AtClientManager.getInstance().atClient.getPreferences()!.namespace != null) { - if (atKey.key!.contains( + if (atKey.key.contains( '.${AtClientManager.getInstance().atClient.getPreferences()!.namespace!}')) { - atKey.key = atKey.key!.replaceAll( + atKey.key = atKey.key.replaceAll( ('.${AtClientManager.getInstance().atClient.getPreferences()!.namespace!}'), ''); } diff --git a/packages/at_location_flutter/lib/service/request_location_service.dart b/packages/at_location_flutter/lib/service/request_location_service.dart index 521fab3bf..f8cd1f409 100644 --- a/packages/at_location_flutter/lib/service/request_location_service.dart +++ b/packages/at_location_flutter/lib/service/request_location_service.dart @@ -305,15 +305,15 @@ class RequestLocationService { if ((locationNotificationModel.isAccepted) && (locationNotificationModel.from != null) && (locationNotificationModel.to != null)) { - key.metadata!.ttl = locationNotificationModel.to! + key.metadata.ttl = locationNotificationModel.to! .difference(locationNotificationModel.from!) .inMinutes * 60000; - key.metadata!.ttr = locationNotificationModel.to! + key.metadata.ttr = locationNotificationModel.to! .difference(locationNotificationModel.from!) .inMinutes * 60000; - key.metadata!.expiresAt = locationNotificationModel.to; + key.metadata.expiresAt = locationNotificationModel.to; } locationNotificationModel.isAcknowledgment = true; @@ -438,14 +438,14 @@ class RequestLocationService { {int? ttl, DateTime? expiresAt}) { var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = ttr - ..metadata!.ccd = true + ..metadata.ttr = ttr + ..metadata.ccd = true ..key = key ..sharedWith = sharedWith ..sharedBy = AtLocationNotificationListener().atClientInstance!.getCurrentAtSign(); - if (ttl != null) atKey.metadata!.ttl = ttl; - if (expiresAt != null) atKey.metadata!.expiresAt = expiresAt; + if (ttl != null) atKey.metadata.ttl = ttl; + if (expiresAt != null) atKey.metadata.expiresAt = expiresAt; return atKey; } diff --git a/packages/at_location_flutter/lib/service/send_location_notification.dart b/packages/at_location_flutter/lib/service/send_location_notification.dart index 4ca98034e..38d526f93 100644 --- a/packages/at_location_flutter/lib/service/send_location_notification.dart +++ b/packages/at_location_flutter/lib/service/send_location_notification.dart @@ -526,12 +526,12 @@ class SendLocationNotification { : atClient!.getCurrentAtSign()!; var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = ttr - ..metadata!.ccd = true + ..metadata.ttr = ttr + ..metadata.ccd = true ..key = key ..sharedWith = sharedWith ..sharedBy = sharedBy; - if (ttl != null) atKey.metadata!.ttl = ttl; + if (ttl != null) atKey.metadata.ttl = ttl; return atKey; } diff --git a/packages/at_location_flutter/lib/service/sharing_location_service.dart b/packages/at_location_flutter/lib/service/sharing_location_service.dart index ddbb6e9a1..04b4cd12f 100644 --- a/packages/at_location_flutter/lib/service/sharing_location_service.dart +++ b/packages/at_location_flutter/lib/service/sharing_location_service.dart @@ -244,15 +244,15 @@ class SharingLocationService { if ((locationNotificationModel.from != null) && (locationNotificationModel.to != null)) { - key.metadata!.ttl = locationNotificationModel.to! + key.metadata.ttl = locationNotificationModel.to! .difference(locationNotificationModel.from!) .inMinutes * 60000; - key.metadata!.ttr = locationNotificationModel.to! + key.metadata.ttr = locationNotificationModel.to! .difference(locationNotificationModel.from!) .inMinutes * 60000; - key.metadata!.expiresAt = locationNotificationModel.to; + key.metadata.expiresAt = locationNotificationModel.to; } if (shouldCheckForTimeChanges) { @@ -365,13 +365,13 @@ class SharingLocationService { {int? ttl, DateTime? expiresAt}) { var atKey = AtKey() ..metadata = Metadata() - ..metadata!.ttr = ttr - ..metadata!.ccd = true + ..metadata.ttr = ttr + ..metadata.ccd = true ..key = key ..sharedWith = sharedWith ..sharedBy = AtLocationNotificationListener().currentAtSign; - if (ttl != null) atKey.metadata!.ttl = ttl; - if (expiresAt != null) atKey.metadata!.expiresAt = expiresAt; + if (ttl != null) atKey.metadata.ttl = ttl; + if (expiresAt != null) atKey.metadata.expiresAt = expiresAt; return atKey; } } diff --git a/packages/at_location_flutter/lib/utils/constants/init_location_service.dart b/packages/at_location_flutter/lib/utils/constants/init_location_service.dart index 33c5da98e..64b82cfc1 100644 --- a/packages/at_location_flutter/lib/utils/constants/init_location_service.dart +++ b/packages/at_location_flutter/lib/utils/constants/init_location_service.dart @@ -100,8 +100,8 @@ void deleteAllLocationData() { /// returns the 'AtKey' of the [regexKey] AtKey getAtKey(String regexKey) { var atKey = AtKey.fromString(regexKey); - atKey.metadata!.ttr = -1; - atKey.metadata!.ccd = true; + atKey.metadata.ttr = -1; + atKey.metadata.ccd = true; return atKey; } diff --git a/packages/at_location_flutter/pubspec.yaml b/packages/at_location_flutter/pubspec.yaml index d354fa23f..95aae3fec 100644 --- a/packages/at_location_flutter/pubspec.yaml +++ b/packages/at_location_flutter/pubspec.yaml @@ -13,11 +13,11 @@ environment: dependencies: async: ^2.11.0 - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 at_commons: ^3.0.55 - at_contact: ^3.0.7 + at_contact: ^3.0.8 at_contacts_flutter: ^4.0.11 at_lookup: ^3.0.40 at_utils: ^3.0.15 @@ -38,6 +38,9 @@ dependencies: tuple: ^2.0.2 vector_math: ^2.1.4 +dependency_overrides: + at_commons: ^4.0.1 + dev_dependencies: flutter_lints: ^2.0.3 flutter_test: diff --git a/packages/at_login_flutter/example/pubspec.yaml b/packages/at_login_flutter/example/pubspec.yaml index 06fedeea3..1d0f6bb8b 100644 --- a/packages/at_login_flutter/example/pubspec.yaml +++ b/packages/at_login_flutter/example/pubspec.yaml @@ -28,7 +28,7 @@ environment: # versions available, run `flutter pub outdated`. dependencies: at_app_flutter: ^5.2.0 - at_onboarding_flutter: ^6.1.3 + at_onboarding_flutter: ^6.1.7 cupertino_icons: ^1.0.6 flutter: sdk: flutter diff --git a/packages/at_login_flutter/lib/services/at_login_service.dart b/packages/at_login_flutter/lib/services/at_login_service.dart index a37e629ea..dfe07b938 100644 --- a/packages/at_login_flutter/lib/services/at_login_service.dart +++ b/packages/at_login_flutter/lib/services/at_login_service.dart @@ -155,7 +155,7 @@ class AtLoginService { ..isHidden = true ..ttl = 30; var atKey = AtKey() - ..key = atLoginObj.location + ..key = atLoginObj.location ?? "" ..metadata = metadata; var data = signature; _logger.info('putLoginProof|atKey:$atKey'); diff --git a/packages/at_login_flutter/pubspec.yaml b/packages/at_login_flutter/pubspec.yaml index c37574c60..d2ad264d5 100644 --- a/packages/at_login_flutter/pubspec.yaml +++ b/packages/at_login_flutter/pubspec.yaml @@ -8,13 +8,13 @@ environment: flutter: ">=1.20.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 - at_commons: ^3.0.55 + at_commons: ^4.0.1 at_server_status: ^1.0.3 at_utils: ^3.0.15 basic_utils: ^5.6.1 - file_picker: ^5.5.0 + file_picker: ^6.1.1 flutter: sdk: flutter flutter_local_notifications: ^15.1.1 diff --git a/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index e17c66339..3d327f05f 100644 --- a/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -22,7 +22,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_notify_flutter/example/pubspec.yaml b/packages/at_notify_flutter/example/pubspec.yaml index 56f6df6fd..6a4161657 100644 --- a/packages/at_notify_flutter/example/pubspec.yaml +++ b/packages/at_notify_flutter/example/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: at_app_flutter: ^5.2.0 at_notify_flutter: path: ../ - at_onboarding_flutter: ^6.1.3 + at_onboarding_flutter: ^6.1.7 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. diff --git a/packages/at_notify_flutter/pubspec.yaml b/packages/at_notify_flutter/pubspec.yaml index 79b3794f3..b0a46c6f4 100644 --- a/packages/at_notify_flutter/pubspec.yaml +++ b/packages/at_notify_flutter/pubspec.yaml @@ -12,10 +12,10 @@ environment: flutter: ">=1.20.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 + at_commons: ^4.0.1 flutter: sdk: flutter flutter_local_notifications: ^15.1.1 diff --git a/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 508252dd8..591d027b4 100644 --- a/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_theme_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { 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")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/packages/at_theme_flutter/example/pubspec.yaml b/packages/at_theme_flutter/example/pubspec.yaml index 141f18fd2..82ec791bf 100644 --- a/packages/at_theme_flutter/example/pubspec.yaml +++ b/packages/at_theme_flutter/example/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. at_common_flutter: ^2.0.12 - at_onboarding_flutter: ^6.1.3 + at_onboarding_flutter: ^6.1.7 at_theme_flutter: path: ../ cupertino_icons: ^1.0.6 diff --git a/packages/at_theme_flutter/lib/services/theme_service.dart b/packages/at_theme_flutter/lib/services/theme_service.dart index 7c6b3f2cf..1f13904d6 100644 --- a/packages/at_theme_flutter/lib/services/theme_service.dart +++ b/packages/at_theme_flutter/lib/services/theme_service.dart @@ -59,8 +59,8 @@ class ThemeService { AtKey atKey = AtKey() ..key = MixedConstants.theme_key ..metadata = metaData - ..metadata!.ttr = -1 - ..metadata!.ccd = true; + ..metadata.ttr = -1 + ..metadata.ccd = true; return atKey; } diff --git a/packages/at_theme_flutter/pubspec.yaml b/packages/at_theme_flutter/pubspec.yaml index f947efa91..79b063dd4 100644 --- a/packages/at_theme_flutter/pubspec.yaml +++ b/packages/at_theme_flutter/pubspec.yaml @@ -13,7 +13,7 @@ environment: dependencies: at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 + at_commons: ^4.0.1 at_utils: ^3.0.15 flutter: sdk: flutter