From 6bbf787ab07bbaddd4253c58c796c5583d146bb7 Mon Sep 17 00:00:00 2001 From: HamdaanAliQuatil Date: Tue, 6 Jun 2023 22:36:38 +0530 Subject: [PATCH 001/176] fix: improve pub score of at_onboarding_flutter --- .../analysis_options.yaml | 35 ++++++++++--------- .../example/android/app/build.gradle | 2 +- .../example/lib/main.dart | 4 +-- .../Flutter/GeneratedPluginRegistrant.swift | 4 ++- .../example/pubspec.yaml | 1 + .../screen/at_onboarding_accounts_screen.dart | 13 ++++--- .../screen/at_onboarding_activate_screen.dart | 6 ++-- .../screen/at_onboarding_generate_screen.dart | 3 +- .../lib/screen/at_onboarding_otp_screen.dart | 4 +-- .../at_onboarding_backup_service.dart | 2 +- .../at_onboarding_tutorial_service.dart | 20 +++++++---- .../lib/utils/at_onboarding_strings.dart | 2 +- .../lib/widgets/at_onboarding_dialog.dart | 2 +- packages/at_onboarding_flutter/pubspec.yaml | 5 +-- .../at_onboarding_generate_screen_test.dart | 2 ++ .../at_onboarding_reference_screen_test.dart | 2 ++ .../services/onboarding_service_test.dart | 1 - .../test/services/sdk_service_test.dart | 2 -- .../widgets/at_onboarding_button_test.dart | 4 +-- 19 files changed, 61 insertions(+), 53 deletions(-) diff --git a/packages/at_onboarding_flutter/analysis_options.yaml b/packages/at_onboarding_flutter/analysis_options.yaml index 538e8c908..cffd3c9ec 100644 --- a/packages/at_onboarding_flutter/analysis_options.yaml +++ b/packages/at_onboarding_flutter/analysis_options.yaml @@ -1,19 +1,20 @@ -include: package:flutter_lints/flutter.yaml +# include: package:flutter_lints/flutter.yaml +include: package:lints/core.yaml -analyzer: - errors: - unused_local_variable: warning - invalid_assignment: warning - missing_return: error - annotate_overrides: error - always_specify_types: warning - dead_code: warning - todo: ignore - exclude: [build/**] +# analyzer: +# errors: +# unused_local_variable: warning +# invalid_assignment: warning +# missing_return: error +# annotate_overrides: error +# always_specify_types: warning +# dead_code: warning +# todo: ignore +# exclude: [build/**] -linter: - rules: - camel_case_types: true - unnecessary_statements: true - library_private_types_in_public_api: false - no_leading_underscores_for_local_identifiers: false \ No newline at end of file +# linter: +# rules: +# camel_case_types: true +# unnecessary_statements: true +# library_private_types_in_public_api: false +# no_leading_underscores_for_local_identifiers: false \ No newline at end of file diff --git a/packages/at_onboarding_flutter/example/android/app/build.gradle b/packages/at_onboarding_flutter/example/android/app/build.gradle index dac28e881..561916cdc 100644 --- a/packages/at_onboarding_flutter/example/android/app/build.gradle +++ b/packages/at_onboarding_flutter/example/android/app/build.gradle @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw new RuntimeException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart index 0805930f9..980a74a93 100644 --- a/packages/at_onboarding_flutter/example/lib/main.dart +++ b/packages/at_onboarding_flutter/example/lib/main.dart @@ -38,7 +38,7 @@ class _MyAppState extends State { AtClientPreference? atClientPreference; bool isChangeLanguage = false; - var _currentLocale = Locale('en', ''); + var _currentLocale = const Locale('en', ''); @override Widget build(BuildContext context) { @@ -169,7 +169,7 @@ class _MyAppState extends State { DropdownButton( onChanged: (value) { setState(() { - print(value); + // print(value); value == 'en' ? _currentLocale = const Locale('en') : _currentLocale = const Locale('fr'); diff --git a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index a7b3d3d2f..1aba5171c 100644 --- a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,9 +7,10 @@ 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 path_provider_foundation import share_plus_macos import shared_preferences_foundation import url_launcher_macos @@ -17,6 +18,7 @@ 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")) diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index afe715138..60c8b9410 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -46,6 +46,7 @@ dependency_overrides: at_onboarding_flutter: path: ../ at_client_mobile: ^3.2.9 + intl: ^0.18.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 diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart index 8535763cd..b0d7e2dcb 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart @@ -87,8 +87,7 @@ class _AtOnboardingAccountsScreenState children: [ Text( widget.message ?? - AtOnboardingLocalizations.current - .title_select_atSign, + AtOnboardingLocalizations.current.title_select_atSign, style: const TextStyle( fontWeight: FontWeight.bold, fontSize: AtOnboardingDimens.fontNormal, @@ -168,18 +167,18 @@ class _AtOnboardingAccountsScreenState child: AlertDialog( content: RichText( text: TextSpan( - style: theme.textTheme.bodyText1, + style: theme.textTheme.bodyLarge, children: [ TextSpan( - text: AtOnboardingLocalizations.current - .title_pair_atSign_prev, + text: + AtOnboardingLocalizations.current.title_pair_atSign_prev, ), TextSpan( text: ' $atsign ', style: const TextStyle(fontWeight: FontWeight.bold)), TextSpan( - text: AtOnboardingLocalizations.current - .title_pair_atSign_next, + text: + AtOnboardingLocalizations.current.title_pair_atSign_next, ) ], ), diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart index 4dfb62b10..356d6227b 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart @@ -70,8 +70,7 @@ class _AtOnboardingActivateScreenState child: Scaffold( appBar: AppBar( title: Text( - AtOnboardingLocalizations.current - .title_setting_up_your_atSign, + AtOnboardingLocalizations.current.title_setting_up_your_atSign, ), actions: [ IconButton( @@ -97,8 +96,7 @@ class _AtOnboardingActivateScreenState ), const SizedBox(height: 10), Text( - AtOnboardingLocalizations.current - .msg_wait_fetching_atSign, + AtOnboardingLocalizations.current.msg_wait_fetching_atSign, ), ], ), diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart index 528ed5518..6aa5a551d 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart @@ -447,8 +447,7 @@ class _AtOnboardingGenerateScreenState message: AtOnboardingLocalizations.current.processing, ); await Future.delayed(const Duration(milliseconds: 400)); - bool isExist = - await _onboardingService.isExistingAtsign(verifiedAtSign); + bool isExist = await _onboardingService.isExistingAtsign(verifiedAtSign); if (isExist) { _inprogressDialog.close(); diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart index 8e74e16d2..5e3580774 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart @@ -197,7 +197,7 @@ class _AtOnboardingOTPScreenState extends State { children: [ TextSpan( text: AtOnboardingLocalizations.current.note, - style: theme.textTheme.bodyText2?.copyWith( + style: theme.textTheme.bodyMedium?.copyWith( fontSize: AtOnboardingDimens.fontSmall, height: 1.5, fontWeight: FontWeight.bold, @@ -206,7 +206,7 @@ class _AtOnboardingOTPScreenState extends State { TextSpan( text: AtOnboardingLocalizations .current.note_otp_content, - style: theme.textTheme.bodyText2?.copyWith( + style: theme.textTheme.bodyMedium?.copyWith( fontSize: AtOnboardingDimens.fontSmall, height: 1.5, ), diff --git a/packages/at_onboarding_flutter/lib/services/at_onboarding_backup_service.dart b/packages/at_onboarding_flutter/lib/services/at_onboarding_backup_service.dart index 90aecf897..0af1c62d8 100644 --- a/packages/at_onboarding_flutter/lib/services/at_onboarding_backup_service.dart +++ b/packages/at_onboarding_flutter/lib/services/at_onboarding_backup_service.dart @@ -7,7 +7,7 @@ class AtOnboardingBackupService { AtOnboardingBackupService._(); static final AtOnboardingBackupService _instance = - AtOnboardingBackupService._(); + AtOnboardingBackupService._(); static AtOnboardingBackupService get instance => _instance; diff --git a/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart b/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart index 7a1f4b19e..a18739ad0 100644 --- a/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart +++ b/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart @@ -4,9 +4,15 @@ import 'package:shared_preferences/shared_preferences.dart'; const int _tutorialVersion = 2; enum AtOnboardingTutorialDisplay { - normal, /// show once - always, /// always show tutorial when opening app - never, /// never show tutorial when opening app + normal, + + /// show once + always, + + /// always show tutorial when opening app + never, + + /// never show tutorial when opening app } class AtTutorialServiceInfo { @@ -29,10 +35,10 @@ class AtTutorialServiceInfo { } Map toJson() => { - "versionInfo": versionInfo, - "hasShowSignInPage": hasShowSignInPage, - "hasShowSignUpPage": hasShowSignUpPage, - }; + "versionInfo": versionInfo, + "hasShowSignInPage": hasShowSignInPage, + "hasShowSignUpPage": hasShowSignUpPage, + }; } class AtOnboardingTutorialService { diff --git a/packages/at_onboarding_flutter/lib/utils/at_onboarding_strings.dart b/packages/at_onboarding_flutter/lib/utils/at_onboarding_strings.dart index 60f374755..179d95ab6 100644 --- a/packages/at_onboarding_flutter/lib/utils/at_onboarding_strings.dart +++ b/packages/at_onboarding_flutter/lib/utils/at_onboarding_strings.dart @@ -3,4 +3,4 @@ class AtOnboardingStrings { static const String atsignHintText = 'alice'; static const String _basepath = 'assets/images'; static const String backupZip = '$_basepath/backup_key.png'; -} \ No newline at end of file +} diff --git a/packages/at_onboarding_flutter/lib/widgets/at_onboarding_dialog.dart b/packages/at_onboarding_flutter/lib/widgets/at_onboarding_dialog.dart index 30ebfb200..a57a981c7 100644 --- a/packages/at_onboarding_flutter/lib/widgets/at_onboarding_dialog.dart +++ b/packages/at_onboarding_flutter/lib/widgets/at_onboarding_dialog.dart @@ -79,4 +79,4 @@ class _AtOnboardingDialogState extends State { actions: widget.actions, ); } -} \ No newline at end of file +} diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 57c7fa180..25a9cea8a 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -45,14 +45,15 @@ dependencies: at_utils: ^3.0.12 at_sync_ui_flutter: ^1.0.1 -dependency_overrides: - package_info_plus: ^3.0.0 +# dependency_overrides: + # package_info_plus: ^3.0.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 mocktail: ^0.3.0 + lints: ^2.0.1 # For information on the generic Dart part of this file, see the diff --git a/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart b/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart index 6ce567427..004040e93 100644 --- a/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart +++ b/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart @@ -1,3 +1,5 @@ +// ignore_for_file: unused_element + import 'package:at_onboarding_flutter/screen/at_onboarding_generate_screen.dart'; import 'package:at_onboarding_flutter/services/free_atsign_service.dart'; import 'package:flutter/material.dart'; diff --git a/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart b/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart index e702c90cd..0c2404990 100644 --- a/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart +++ b/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart @@ -1,3 +1,5 @@ +// ignore_for_file: unused_element + import 'package:at_onboarding_flutter/at_onboarding_flutter.dart'; import 'package:at_onboarding_flutter/screen/at_onboarding_reference_screen.dart'; import 'package:flutter/material.dart'; diff --git a/packages/at_onboarding_flutter/test/services/onboarding_service_test.dart b/packages/at_onboarding_flutter/test/services/onboarding_service_test.dart index 854611394..ff34dd0a8 100644 --- a/packages/at_onboarding_flutter/test/services/onboarding_service_test.dart +++ b/packages/at_onboarding_flutter/test/services/onboarding_service_test.dart @@ -63,7 +63,6 @@ void main() { group("test formatAtSign Func", () { test("formatAtSign don't @", () { - final result = onboardingService.formatAtSign( "@${onboardingDataTest.atSignTest}", ); diff --git a/packages/at_onboarding_flutter/test/services/sdk_service_test.dart b/packages/at_onboarding_flutter/test/services/sdk_service_test.dart index 87e6b89cb..8666ea592 100644 --- a/packages/at_onboarding_flutter/test/services/sdk_service_test.dart +++ b/packages/at_onboarding_flutter/test/services/sdk_service_test.dart @@ -55,6 +55,4 @@ main() { expect(result, "@${onboardingDataTest.atSignTest.toLowerCase()}"); }); }); - - } diff --git a/packages/at_onboarding_flutter/test/widgets/at_onboarding_button_test.dart b/packages/at_onboarding_flutter/test/widgets/at_onboarding_button_test.dart index 678c91b5f..8e5127b31 100644 --- a/packages/at_onboarding_flutter/test/widgets/at_onboarding_button_test.dart +++ b/packages/at_onboarding_flutter/test/widgets/at_onboarding_button_test.dart @@ -70,8 +70,8 @@ void main() { testWidgets('Test case to check primary button loading', (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(button: secondaryButtonLoading)); + await tester.pumpWidget( + _wrapWidgetWithMaterialApp(button: secondaryButtonLoading)); expect(find.byType(AtSyncIndicator), findsOneWidget); }); }); From a066e7ec09133fe9bf898a68eec9948e2684e448 Mon Sep 17 00:00:00 2001 From: HamdaanAliQuatil Date: Wed, 7 Jun 2023 03:46:46 +0530 Subject: [PATCH 002/176] fix: revert to flutter_lint and fix async BuildContext gaps --- .../analysis_options.yaml | 35 ++++---- .../example/android/app/build.gradle | 2 +- .../example/lib/main.dart | 1 - .../lib/at_onboarding.dart | 86 +++++++++++-------- .../lib/screen/at_onboarding_pair_screen.dart | 4 + .../screen/at_onboarding_qrcode_screen.dart | 1 + .../screen/at_onboarding_start_screen.dart | 1 + .../at_onboarding_tutorial_service.dart | 2 + packages/at_onboarding_flutter/pubspec.yaml | 5 +- .../at_onboarding_generate_screen_test.dart | 3 +- .../at_onboarding_reference_screen_test.dart | 3 +- 11 files changed, 78 insertions(+), 65 deletions(-) diff --git a/packages/at_onboarding_flutter/analysis_options.yaml b/packages/at_onboarding_flutter/analysis_options.yaml index cffd3c9ec..538e8c908 100644 --- a/packages/at_onboarding_flutter/analysis_options.yaml +++ b/packages/at_onboarding_flutter/analysis_options.yaml @@ -1,20 +1,19 @@ -# include: package:flutter_lints/flutter.yaml -include: package:lints/core.yaml +include: package:flutter_lints/flutter.yaml -# analyzer: -# errors: -# unused_local_variable: warning -# invalid_assignment: warning -# missing_return: error -# annotate_overrides: error -# always_specify_types: warning -# dead_code: warning -# todo: ignore -# exclude: [build/**] +analyzer: + errors: + unused_local_variable: warning + invalid_assignment: warning + missing_return: error + annotate_overrides: error + always_specify_types: warning + dead_code: warning + todo: ignore + exclude: [build/**] -# linter: -# rules: -# camel_case_types: true -# unnecessary_statements: true -# library_private_types_in_public_api: false -# no_leading_underscores_for_local_identifiers: false \ No newline at end of file +linter: + rules: + camel_case_types: true + unnecessary_statements: true + library_private_types_in_public_api: false + no_leading_underscores_for_local_identifiers: false \ No newline at end of file diff --git a/packages/at_onboarding_flutter/example/android/app/build.gradle b/packages/at_onboarding_flutter/example/android/app/build.gradle index 561916cdc..dac28e881 100644 --- a/packages/at_onboarding_flutter/example/android/app/build.gradle +++ b/packages/at_onboarding_flutter/example/android/app/build.gradle @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new RuntimeException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart index 980a74a93..554445de5 100644 --- a/packages/at_onboarding_flutter/example/lib/main.dart +++ b/packages/at_onboarding_flutter/example/lib/main.dart @@ -169,7 +169,6 @@ class _MyAppState extends State { DropdownButton( onChanged: (value) { setState(() { - // print(value); value == 'en' ? _currentLocale = const Locale('en') : _currentLocale = const Locale('fr'); diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart index 111896b02..4804a48e4 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding.dart @@ -68,49 +68,57 @@ class AtOnboarding { return AtOnboardingResult.cancelled(); } } else { + if (context.mounted) { + final result = await Navigator.push( + context, + MaterialPageRoute( + builder: (BuildContext context) { + return AtOnboardingIntroScreen( + config: config, + ); + }, + ), + ); + + if (result is AtOnboardingResult) { + //Update primary atsign after onboard success + if (result.status == AtOnboardingResultStatus.success && + result.atsign != null) { + await changePrimaryAtsign(atsign: result.atsign!); + } + return result; + } else { + return AtOnboardingResult.cancelled(); + } + } else { + return AtOnboardingResult.cancelled(); + } + } + } + + static Future activateAccount({ + required BuildContext context, + required AtOnboardingConfig config, + }) async { + /// Initial Setup + await _initialSetup(context); + if (context.mounted) { final result = await Navigator.push( context, MaterialPageRoute( builder: (BuildContext context) { - return AtOnboardingIntroScreen( + return AtOnboardingActivateScreen( + hideReferences: false, config: config, ); }, ), ); - if (result is AtOnboardingResult) { - //Update primary atsign after onboard success - if (result.status == AtOnboardingResultStatus.success && - result.atsign != null) { - await changePrimaryAtsign(atsign: result.atsign!); - } return result; } else { return AtOnboardingResult.cancelled(); } - } - } - - static Future activateAccount({ - required BuildContext context, - required AtOnboardingConfig config, - }) async { - /// Initial Setup - await _initialSetup(context); - final result = await Navigator.push( - context, - MaterialPageRoute( - builder: (BuildContext context) { - return AtOnboardingActivateScreen( - hideReferences: false, - config: config, - ); - }, - ), - ); - if (result is AtOnboardingResult) { - return result; } else { return AtOnboardingResult.cancelled(); } @@ -127,16 +135,18 @@ class AtOnboarding { }) async { /// Initial Setup await _initialSetup(context); - - final result = await Navigator.push(context, - MaterialPageRoute(builder: (BuildContext context) { - return AtOnboardingResetScreen(config: config); - })); - if (result is AtOnboardingResetResult) { - return result; - } else { - return AtOnboardingResetResult.cancelled; + if (context.mounted) { + final result = await Navigator.push(context, + MaterialPageRoute(builder: (BuildContext context) { + return AtOnboardingResetScreen(config: config); + })); + if (result is AtOnboardingResetResult) { + return result; + } else { + return AtOnboardingResetResult.cancelled; + } } + return AtOnboardingResetResult.cancelled; } Future enableUsingSharedStorage() async { diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart index e51d53e68..473e332f9 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart @@ -211,6 +211,7 @@ class _AtOnboardingPairScreenState extends State { if (status) { _showOTPScreen(); } else { + if (!mounted) return; AtOnboardingDialog.showError( context: context, message: AtOnboardingLocalizations.current.error_please_enter_email, @@ -249,6 +250,7 @@ class _AtOnboardingPairScreenState extends State { if (errorMessage.contains('maximum number of free atSigns')) { await showlimitDialog(); } else { + if (!mounted) return status; AtOnboardingDialog.showError(context: context, message: errorMessage); } } @@ -346,8 +348,10 @@ class _AtOnboardingPairScreenState extends State { data = response.body; data = jsonDecode(data); String errorMessage = data['message']; + if (!mounted) return; AtOnboardingDialog.showError(context: context, message: errorMessage); } + if (!mounted) return; final result2 = await AtOnboardingOTPScreen.push( context: context, atSign: result.atSign, diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart index 5264aff14..853a630b8 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart @@ -190,6 +190,7 @@ class _AtOnboardingQRCodeScreenState extends State { ); } else { await _controller?.pauseCamera(); + if (!mounted) return; await AtOnboardingDialog.showError( context: context, message: AtOnboardingLocalizations.current.invalid_QR, diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart index 1b97e6cfb..d5522606e 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart @@ -82,6 +82,7 @@ class _AtOnboardingStartScreenState extends State { if (!mounted) return; Navigator.pop(context, result); } else if (e == OnboardingStatus.ACTIVATE) { + if (!mounted) return; final result = await AtOnboarding.activateAccount( context: context, config: widget.config, diff --git a/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart b/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart index a18739ad0..d4ec13170 100644 --- a/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart +++ b/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart @@ -7,9 +7,11 @@ enum AtOnboardingTutorialDisplay { normal, /// show once + always, /// always show tutorial when opening app + never, /// never show tutorial when opening app diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 25a9cea8a..0bc5fb2e4 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -45,15 +45,14 @@ dependencies: at_utils: ^3.0.12 at_sync_ui_flutter: ^1.0.1 -# dependency_overrides: - # package_info_plus: ^3.0.0 + dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 mocktail: ^0.3.0 - lints: ^2.0.1 + # For information on the generic Dart part of this file, see the diff --git a/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart b/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart index 004040e93..2abeec287 100644 --- a/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart +++ b/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart @@ -1,5 +1,3 @@ -// ignore_for_file: unused_element - import 'package:at_onboarding_flutter/screen/at_onboarding_generate_screen.dart'; import 'package:at_onboarding_flutter/services/free_atsign_service.dart'; import 'package:flutter/material.dart'; @@ -27,6 +25,7 @@ void main() { onboardingDataTest = OnboardingDataTest(); }); + // ignore: unused_element Widget _defaultApp({ ThemeData? theme, }) { diff --git a/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart b/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart index 0c2404990..84f37552c 100644 --- a/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart +++ b/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart @@ -1,5 +1,3 @@ -// ignore_for_file: unused_element - import 'package:at_onboarding_flutter/at_onboarding_flutter.dart'; import 'package:at_onboarding_flutter/screen/at_onboarding_reference_screen.dart'; import 'package:flutter/material.dart'; @@ -15,6 +13,7 @@ void main() { onboardingDataTest = OnboardingDataTest(); }); + // ignore: unused_element Widget _defaultApp({ ThemeData? theme, }) { From 33d5de5cdeac5e17467b196e3bb8e4b67ca2f3c6 Mon Sep 17 00:00:00 2001 From: HamdaanAliQuatil Date: Fri, 9 Jun 2023 17:25:36 +0530 Subject: [PATCH 003/176] fix: extract AtOnboardingResetResult enum to at_onboarding_reset_result.dart --- packages/at_onboarding_flutter/lib/at_onboarding.dart | 2 ++ .../lib/screen/at_onboarding_reset_result.dart | 4 ++++ .../lib/screen/at_onboarding_reset_screen.dart | 6 ++---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart index 111896b02..059acdc53 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding.dart @@ -11,6 +11,8 @@ import 'package:at_onboarding_flutter/services/at_onboarding_theme.dart'; import 'package:at_onboarding_flutter/services/onboarding_service.dart'; import 'package:at_onboarding_flutter/utils/at_onboarding_app_constants.dart'; import 'package:flutter/material.dart'; +import 'package:at_onboarding_flutter/screen/at_onboarding_reset_result.dart'; + class AtOnboarding { /// Using this function to get onboard atsing. diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart new file mode 100644 index 000000000..84b5e23e2 --- /dev/null +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart @@ -0,0 +1,4 @@ +enum AtOnboardingResetResult { + cancelled, + success, +} \ No newline at end of file diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart index 834804451..ad14ebdc2 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart @@ -6,11 +6,9 @@ import 'package:at_onboarding_flutter/utils/at_onboarding_error_util.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart'; import 'package:flutter/material.dart'; +import 'at_onboarding_reset_result.dart'; + -enum AtOnboardingResetResult { - cancelled, - success, -} class AtOnboardingResetScreen extends StatefulWidget { final AtOnboardingConfig config; From 731e7345d221432d273fa1f1b9b311774ed0d8fa Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Thu, 15 Jun 2023 15:27:05 +0530 Subject: [PATCH 004/176] build: release changes for at_chat_flutter 3.0.8 --- packages/at_chat_flutter/CHANGELOG.md | 3 +++ packages/at_chat_flutter/README.md | 2 +- packages/at_chat_flutter/example/README.md | 2 +- .../example/android/app/build.gradle | 2 +- .../example/android/build.gradle | 2 +- packages/at_chat_flutter/example/example.md | 2 +- .../at_chat_flutter/example/ios/Podfile.lock | 17 +++++++++-------- .../Flutter/GeneratedPluginRegistrant.swift | 4 ++-- packages/at_chat_flutter/pubspec.yaml | 15 ++++++--------- .../test/unit_test/chat_screen_test.dart | 3 ++- .../example/android/build.gradle | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 4 +++- 12 files changed, 31 insertions(+), 27 deletions(-) diff --git a/packages/at_chat_flutter/CHANGELOG.md b/packages/at_chat_flutter/CHANGELOG.md index 658ace716..eb3fdce43 100644 --- a/packages/at_chat_flutter/CHANGELOG.md +++ b/packages/at_chat_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.8 +- **CHORE**: Updated dependencies. + ## 3.0.7 - **CHORE**: Updated dependencies and android gradle versions - **CHORE**: Package description updated diff --git a/packages/at_chat_flutter/README.md b/packages/at_chat_flutter/README.md index c5ae8c39a..e2af248ba 100644 --- a/packages/at_chat_flutter/README.md +++ b/packages/at_chat_flutter/README.md @@ -21,7 +21,7 @@ We call giving people control of access to their data “flipping the internet There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app -This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_chat_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. +This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_chat_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh $ flutter pub global activate at_app diff --git a/packages/at_chat_flutter/example/README.md b/packages/at_chat_flutter/example/README.md index d9acdda58..1a0e51054 100644 --- a/packages/at_chat_flutter/example/README.md +++ b/packages/at_chat_flutter/example/README.md @@ -5,7 +5,7 @@ The at_chat_flutter package is designed to make it easy to add a chat feature between atSigns to any flutter app built on the atPlatform. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_chat_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_chat_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_chat_flutter/example/android/app/build.gradle b/packages/at_chat_flutter/example/android/app/build.gradle index cf220a004..3b274a912 100644 --- a/packages/at_chat_flutter/example/android/app/build.gradle +++ b/packages/at_chat_flutter/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 32 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/at_chat_flutter/example/android/build.gradle b/packages/at_chat_flutter/example/android/build.gradle index 8dbe1a8b3..d2705ce22 100644 --- a/packages/at_chat_flutter/example/android/build.gradle +++ b/packages/at_chat_flutter/example/android/build.gradle @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/at_chat_flutter/example/example.md b/packages/at_chat_flutter/example/example.md index d9acdda58..1a0e51054 100644 --- a/packages/at_chat_flutter/example/example.md +++ b/packages/at_chat_flutter/example/example.md @@ -5,7 +5,7 @@ The at_chat_flutter package is designed to make it easy to add a chat feature between atSigns to any flutter app built on the atPlatform. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_chat_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_chat_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_chat_flutter/example/ios/Podfile.lock b/packages/at_chat_flutter/example/ios/Podfile.lock index 494af82d9..044417529 100644 --- a/packages/at_chat_flutter/example/ios/Podfile.lock +++ b/packages/at_chat_flutter/example/ios/Podfile.lock @@ -51,9 +51,10 @@ PODS: - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.1.0): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -83,7 +84,7 @@ DEPENDENCIES: - Flutter (from `Flutter`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) @@ -120,8 +121,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_keychain/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: @@ -149,14 +150,14 @@ SPEC CHECKSUMS: flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 diff --git a/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index d0331b4ac..1aba5171c 100644 --- a/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,8 +9,8 @@ import at_file_saver import biometric_storage import device_info_plus import file_selector_macos -import package_info_plus_macos -import path_provider_macos +import package_info_plus +import path_provider_foundation import share_plus_macos import shared_preferences_foundation import url_launcher_macos diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index 88bbc0425..f487ea863 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -1,8 +1,8 @@ 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.7 +version: 3.0.8 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_chat_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_chat_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_chat_flutter @@ -15,15 +15,12 @@ dependencies: sdk: flutter at_contact: ^3.0.7 at_common_flutter: ^2.0.11 - at_commons: ^3.0.46 - at_client_mobile: ^3.2.9 - at_lookup: ^3.0.36 - at_client: ^3.0.59 + 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 -dependency_overrides: - package_info_plus: ^2.0.0 - dev_dependencies: flutter_lints: ^2.0.1 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 acf54e45e..4bde2bf24 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 @@ -14,7 +14,8 @@ class MockAtClient extends Mock implements AtClient { } @override - Future delete(AtKey key, {bool isDedicated = false}) async { + Future delete(AtKey key, + {deleteRequestOptions, bool isDedicated = false}) async { return true; } diff --git a/packages/at_contacts_flutter/example/android/build.gradle b/packages/at_contacts_flutter/example/android/build.gradle index 58a8c74b1..713d7f6e6 100644 --- a/packages/at_contacts_flutter/example/android/build.gradle +++ b/packages/at_contacts_flutter/example/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 925ced397..b8e7d380e 100644 --- a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,9 +8,10 @@ import Foundation import at_file_saver import biometric_storage import file_selector_macos -import package_info_plus_macos +import package_info_plus import path_provider_foundation import share_plus_macos +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { @@ -20,5 +21,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { 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")) } From f3d5c41732f9991bb12e87c1067813d6141bd649 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Thu, 15 Jun 2023 16:30:38 +0530 Subject: [PATCH 005/176] chore: updated changelog file --- packages/at_chat_flutter/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/at_chat_flutter/CHANGELOG.md b/packages/at_chat_flutter/CHANGELOG.md index eb3fdce43..d30f7167f 100644 --- a/packages/at_chat_flutter/CHANGELOG.md +++ b/packages/at_chat_flutter/CHANGELOG.md @@ -1,5 +1,6 @@ ## 3.0.8 -- **CHORE**: Updated dependencies. +- **CHORE**: Updated dependencies +- **CHORE**: Dart 3 compatible ## 3.0.7 - **CHORE**: Updated dependencies and android gradle versions From 1c5435eae4509d9daa50d53ad95eee9fee4917cf Mon Sep 17 00:00:00 2001 From: XLin123 Date: Thu, 15 Jun 2023 10:57:44 -0400 Subject: [PATCH 006/176] chore: pubdev points --- packages/at_chat_flutter/lib/services/chat_service.dart | 1 + packages/at_chat_flutter/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/at_chat_flutter/lib/services/chat_service.dart b/packages/at_chat_flutter/lib/services/chat_service.dart index 11d61ea3f..70f9d2de8 100644 --- a/packages/at_chat_flutter/lib/services/chat_service.dart +++ b/packages/at_chat_flutter/lib/services/chat_service.dart @@ -77,6 +77,7 @@ class ChatService { Future startMonitor() async { if (!monitorStarted) { AtClientManager.getInstance() + .atClient .notificationService .subscribe( regex: atClientManager.atClient.getPreferences()!.namespace ?? '', diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index f487ea863..d8f2d6d57 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -4,7 +4,7 @@ version: 3.0.8 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 -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_chat_flutter +documentation: https://atsign.gitbook.io/docs/~ environment: sdk: ">=2.12.0 <4.0.0" From 3bfe4515f9070cfa9988d05493948b64b1b30cf8 Mon Sep 17 00:00:00 2001 From: XLin123 Date: Thu, 15 Jun 2023 10:58:51 -0400 Subject: [PATCH 007/176] Revert "chore: pubdev points" This reverts commit 1c5435eae4509d9daa50d53ad95eee9fee4917cf. --- packages/at_chat_flutter/lib/services/chat_service.dart | 1 - packages/at_chat_flutter/pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/at_chat_flutter/lib/services/chat_service.dart b/packages/at_chat_flutter/lib/services/chat_service.dart index 70f9d2de8..11d61ea3f 100644 --- a/packages/at_chat_flutter/lib/services/chat_service.dart +++ b/packages/at_chat_flutter/lib/services/chat_service.dart @@ -77,7 +77,6 @@ class ChatService { Future startMonitor() async { if (!monitorStarted) { AtClientManager.getInstance() - .atClient .notificationService .subscribe( regex: atClientManager.atClient.getPreferences()!.namespace ?? '', diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index d8f2d6d57..f487ea863 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -4,7 +4,7 @@ version: 3.0.8 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 -documentation: https://atsign.gitbook.io/docs/~ +documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_chat_flutter environment: sdk: ">=2.12.0 <4.0.0" From 26a345a0f988ca00a87627721069938c7b4ae670 Mon Sep 17 00:00:00 2001 From: XLin123 Date: Thu, 15 Jun 2023 10:59:32 -0400 Subject: [PATCH 008/176] chore(at_chat): pub dev points --- packages/at_chat_flutter/lib/services/chat_service.dart | 1 + packages/at_chat_flutter/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/at_chat_flutter/lib/services/chat_service.dart b/packages/at_chat_flutter/lib/services/chat_service.dart index 11d61ea3f..70f9d2de8 100644 --- a/packages/at_chat_flutter/lib/services/chat_service.dart +++ b/packages/at_chat_flutter/lib/services/chat_service.dart @@ -77,6 +77,7 @@ class ChatService { Future startMonitor() async { if (!monitorStarted) { AtClientManager.getInstance() + .atClient .notificationService .subscribe( regex: atClientManager.atClient.getPreferences()!.namespace ?? '', diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index f487ea863..d8f2d6d57 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -4,7 +4,7 @@ version: 3.0.8 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 -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_chat_flutter +documentation: https://atsign.gitbook.io/docs/~ environment: sdk: ">=2.12.0 <4.0.0" From 8fa74fce9a0b6ef8693b1ba70f611b37066c9d46 Mon Sep 17 00:00:00 2001 From: XLin123 Date: Thu, 15 Jun 2023 11:56:50 -0400 Subject: [PATCH 009/176] fix(at_chat): remove documentation link --- packages/at_chat_flutter/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index d8f2d6d57..f85385793 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -4,7 +4,6 @@ version: 3.0.8 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 -documentation: https://atsign.gitbook.io/docs/~ environment: sdk: ">=2.12.0 <4.0.0" From c0b9142a37ea10cb2e7a246795800328106fd1ce Mon Sep 17 00:00:00 2001 From: HamdaanAliQuatil Date: Thu, 15 Jun 2023 22:09:05 +0530 Subject: [PATCH 010/176] refactor: move AtOnboardingResetResult to at_onboarding_result.dart --- packages/at_onboarding_flutter/lib/at_onboarding.dart | 1 - packages/at_onboarding_flutter/lib/at_onboarding_result.dart | 5 +++++ .../lib/screen/at_onboarding_reset_result.dart | 4 ---- .../lib/screen/at_onboarding_reset_screen.dart | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart index 059acdc53..e786d5a3b 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding.dart @@ -11,7 +11,6 @@ import 'package:at_onboarding_flutter/services/at_onboarding_theme.dart'; import 'package:at_onboarding_flutter/services/onboarding_service.dart'; import 'package:at_onboarding_flutter/utils/at_onboarding_app_constants.dart'; import 'package:flutter/material.dart'; -import 'package:at_onboarding_flutter/screen/at_onboarding_reset_result.dart'; class AtOnboarding { diff --git a/packages/at_onboarding_flutter/lib/at_onboarding_result.dart b/packages/at_onboarding_flutter/lib/at_onboarding_result.dart index 127a9e197..f5f17d2b4 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding_result.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding_result.dart @@ -8,6 +8,11 @@ enum AtOnboardingResultStatus { cancel, //User canceled } +enum AtOnboardingResetResult { + cancelled, + success, +} + /// The result returned after onboard class AtOnboardingResult { /// Status of result diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart deleted file mode 100644 index 84b5e23e2..000000000 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_result.dart +++ /dev/null @@ -1,4 +0,0 @@ -enum AtOnboardingResetResult { - cancelled, - success, -} \ No newline at end of file diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart index ad14ebdc2..95659de90 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart @@ -6,7 +6,7 @@ import 'package:at_onboarding_flutter/utils/at_onboarding_error_util.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart'; import 'package:flutter/material.dart'; -import 'at_onboarding_reset_result.dart'; +import 'package:at_onboarding_flutter/at_onboarding_result.dart'; From 6e28c262931ea322e61252dd73aaaef5c4336f9e Mon Sep 17 00:00:00 2001 From: XLin123 Date: Thu, 15 Jun 2023 13:24:16 -0400 Subject: [PATCH 011/176] chore(at_chat): prepublish changes --- packages/at_chat_flutter/CHANGELOG.md | 23 +++++++++++++++++++++++ packages/at_chat_flutter/pubspec.yaml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/at_chat_flutter/CHANGELOG.md b/packages/at_chat_flutter/CHANGELOG.md index d30f7167f..a70df6e4e 100644 --- a/packages/at_chat_flutter/CHANGELOG.md +++ b/packages/at_chat_flutter/CHANGELOG.md @@ -1,64 +1,87 @@ +## 3.0.9 + +- **CHORE**: Updated documentation link and addressed pub analyze issues + ## 3.0.8 + - **CHORE**: Updated dependencies - **CHORE**: Dart 3 compatible ## 3.0.7 + - **CHORE**: Updated dependencies and android gradle versions - **CHORE**: Package description updated ## 3.0.6 + - **FIX**: Lint Fixes according to flutter 3.0 ## 3.0.5 + - **DOCS**: Updated documentation ## 3.0.4 + - **DOCS**: Updated documentation ## 3.0.3 + - **CHORE**: Updated dependencies ## 3.0.2 + - **CHORE**: Updated dependencies - **FIX**: Fix for cached messages ## 3.0.1 + - **DOCS**: Updated documentation - **FIX**: Fix for outgoing message not displayed immediately ## 3.0.0 + - **FEAT**: Added ability to handle images - **FEAT**: Added ability to delete messages - **CHORE**: Updated packages to rSDK ## 2.0.2 + - **CHORE**: Updated repository link, description and packages ## 2.0.1 + - **CHORE**: Updated packages ## 2.0.0 + - **CHORE**: Upgraded to Null safe version ## 1.0.2 + - **FIX**: Fix for key saving failure ## 1.0.1 + - **CHORE**: Updated dependent packages - **FIX**: Improved avatar placeholder ## 1.0.0 + - **CHORE**: Updated example app ## 0.0.4 + - **CHORE**: Updated dependent packages ## 0.0.3 + - **FIX**: Fix for messages from different atsigns getting mixed on posting message ## 0.0.2 + - **FIX**: Fix for messages from different atsigns getting mixed - **CHORE**: Updated dependency packages for adding monitoring refresh from sdk ## 0.0.1 + - The initial release provides a widget screen for one on one chat. diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index f85385793..df9cc0a26 100644 --- a/packages/at_chat_flutter/pubspec.yaml +++ b/packages/at_chat_flutter/pubspec.yaml @@ -1,6 +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. -version: 3.0.8 +version: 3.0.9 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 From 207f0e5355f87984ce0604d2cdaf2532916aeea9 Mon Sep 17 00:00:00 2001 From: sonle Date: Tue, 20 Jun 2023 16:18:09 +0700 Subject: [PATCH 012/176] feat: add optional params --- .../at_backupkey_flutter/lib/utils/size_config.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/at_backupkey_flutter/lib/utils/size_config.dart b/packages/at_backupkey_flutter/lib/utils/size_config.dart index 39704853b..84628d5a4 100644 --- a/packages/at_backupkey_flutter/lib/utils/size_config.dart +++ b/packages/at_backupkey_flutter/lib/utils/size_config.dart @@ -22,12 +22,16 @@ class SizeConfig { late double refHeight; late double refWidth; - void init(BuildContext context) { + void init( + BuildContext context, { + double? height, + double? width, + }) { _mediaQueryData = MediaQuery.of(context); screenWidth = _mediaQueryData.size.width; screenHeight = _mediaQueryData.size.height; - refHeight = 812; - refWidth = 375; + refHeight = height ?? 812; + refWidth = width ?? 375; deviceTextFactor = _mediaQueryData.textScaleFactor; From d745a368fd26e21dd3f57d1bd965d84ac85a2ad3 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 26 Jun 2023 10:32:06 +0530 Subject: [PATCH 013/176] feat: updated dependencies and yaml --- .../at_contacts_flutter/example/pubspec.yaml | 3 +++ .../lib/screens/contacts_screen.dart | 24 +++++++++---------- packages/at_contacts_flutter/pubspec.yaml | 20 +++++++++------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/packages/at_contacts_flutter/example/pubspec.yaml b/packages/at_contacts_flutter/example/pubspec.yaml index 6c23d45a9..d35b197bd 100644 --- a/packages/at_contacts_flutter/example/pubspec.yaml +++ b/packages/at_contacts_flutter/example/pubspec.yaml @@ -39,6 +39,9 @@ dependencies: at_contacts_flutter: path: ../ +dependency_overrides: + ffi: ^2.0.1 + dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/at_contacts_flutter/lib/screens/contacts_screen.dart b/packages/at_contacts_flutter/lib/screens/contacts_screen.dart index bc7aef9da..776017ace 100644 --- a/packages/at_contacts_flutter/lib/screens/contacts_screen.dart +++ b/packages/at_contacts_flutter/lib/screens/contacts_screen.dart @@ -282,26 +282,26 @@ class _ContactsScreenState extends State { return Padding( padding: const EdgeInsets.all(8.0), child: Slidable( - actionPane: const SlidableDrawerActionPane(), - actionExtentRatio: 0.25, - secondaryActions: [ - IconSlideAction( - caption: TextStrings().block, - color: ColorConstants.inputFieldColor, + endActionPane: ActionPane(motion: const ScrollMotion(), children: + [ + SlidableAction( + label: TextStrings().block, + backgroundColor: ColorConstants.inputFieldColor, icon: Icons.block, - onTap: () async { + onPressed: (context) async { blockUnblockContact(contactsForAlphabet[index]!); }, ), - IconSlideAction( - caption: TextStrings().delete, - color: Colors.red, + SlidableAction( + label: TextStrings().delete, + backgroundColor: Colors.red, icon: Icons.delete, - onTap: () async { + onPressed: (context) async { deleteContact(contactsForAlphabet[index]!); }, ), - ], + ]), + // actionExtentRatio: 0.25, child: CustomListTile( key: UniqueKey(), contactService: _contactService, diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index a55af58ab..79220600a 100644 --- a/packages/at_contacts_flutter/pubspec.yaml +++ b/packages/at_contacts_flutter/pubspec.yaml @@ -2,9 +2,9 @@ name: at_contacts_flutter description: A Flutter plugin project to provide ease of managing contacts for an atSign using atPlatform. version: 4.0.10 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_contacts_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_contacts_flutter +documentation: https://docs.atsign.com/ environment: sdk: '>=2.12.0 <4.0.0' @@ -14,15 +14,15 @@ dependencies: flutter: sdk: flutter - flutter_slidable: ^0.6.0 + flutter_slidable: ^3.0.0 - at_client_mobile: ^3.2.9 - at_commons: ^3.0.45 - at_lookup: ^3.0.36 + at_client_mobile: ^3.2.10 + 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.59 - at_utils: ^3.0.12 + at_client: ^3.0.61 + at_utils: ^3.0.13 dev_dependencies: flutter_lints: ^2.0.1 @@ -31,6 +31,10 @@ dev_dependencies: sdk: flutter +dependency_overrides: + ffi: ^2.0.1 + + # 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. From e1fc29a9fedc9e22f6ea562e11fd38483eae5e71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 10:58:58 +0000 Subject: [PATCH 014/176] build(deps): bump ossf/scorecard-action from 2.1.3 to 2.2.0 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.1.3 to 2.2.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/80e868c13c90f172d68d1f4501dee99e2479f7af...08b4669551908b1024bb425080c797723083c031) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index aec62499a..9c82bf87c 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -37,7 +37,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3 + uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0 with: results_file: results.sarif results_format: sarif From e653832d534a016473465e44a9256d286eb16f22 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 26 Jun 2023 19:41:08 +0530 Subject: [PATCH 015/176] chore: removed unwanted dependency --- packages/at_contacts_flutter/example/pubspec.yaml | 7 ++----- packages/at_contacts_flutter/pubspec.yaml | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/at_contacts_flutter/example/pubspec.yaml b/packages/at_contacts_flutter/example/pubspec.yaml index d35b197bd..8aadeebe5 100644 --- a/packages/at_contacts_flutter/example/pubspec.yaml +++ b/packages/at_contacts_flutter/example/pubspec.yaml @@ -33,15 +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.2 - at_app_flutter: 5.0.1 - at_onboarding_flutter: ^5.0.3 + at_app_flutter: 5.2.0 + at_onboarding_flutter: ^6.0.0 at_backupkey_flutter: ^4.0.6 at_contacts_flutter: path: ../ -dependency_overrides: - ffi: ^2.0.1 - dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index 79220600a..a13d5c21e 100644 --- a/packages/at_contacts_flutter/pubspec.yaml +++ b/packages/at_contacts_flutter/pubspec.yaml @@ -31,10 +31,6 @@ dev_dependencies: sdk: flutter -dependency_overrides: - ffi: ^2.0.1 - - # 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. From 18b78cf4c0c255774b718fc1b0881112347035fd Mon Sep 17 00:00:00 2001 From: HamdaanAliQuatil Date: Tue, 27 Jun 2023 03:40:32 +0530 Subject: [PATCH 016/176] refactor: use guard clause pattern to improve readability and reduce nesting --- .../example/lib/switch_atsign.dart | 4 +- .../lib/at_onboarding.dart | 71 +++++++++---------- .../lib/screen/at_onboarding_otp_screen.dart | 38 +++++----- 3 files changed, 56 insertions(+), 57 deletions(-) diff --git a/packages/at_onboarding_flutter/example/lib/switch_atsign.dart b/packages/at_onboarding_flutter/example/lib/switch_atsign.dart index 32e31b547..fd101026c 100644 --- a/packages/at_onboarding_flutter/example/lib/switch_atsign.dart +++ b/packages/at_onboarding_flutter/example/lib/switch_atsign.dart @@ -164,9 +164,9 @@ class _AtSignBottomSheetState extends State { ), ), isLoading - ? Center( + ? const Center( child: Column( - children: const [ + children: [ Text( 'Switching atsign...', style: TextStyle( diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart index 658a67f73..e115b050a 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding.dart @@ -65,36 +65,34 @@ class AtOnboarding { if (result is AtOnboardingResult) { return result; - } else { - return AtOnboardingResult.cancelled(); - } - } else { - if (context.mounted) { - final result = await Navigator.push( - context, - MaterialPageRoute( - builder: (BuildContext context) { - return AtOnboardingIntroScreen( - config: config, - ); - }, - ), - ); - - if (result is AtOnboardingResult) { - //Update primary atsign after onboard success - if (result.status == AtOnboardingResultStatus.success && - result.atsign != null) { - await changePrimaryAtsign(atsign: result.atsign!); - } - return result; - } else { - return AtOnboardingResult.cancelled(); + } + + return AtOnboardingResult.cancelled(); + } + + if (context.mounted){ + final result = await Navigator.push( + context, + MaterialPageRoute( + builder: (BuildContext context) { + return AtOnboardingIntroScreen( + config: config, + ); + }, + ), + ); + + if (result is AtOnboardingResult) { + //Update primary atsign after onboard success + if (result.status == AtOnboardingResultStatus.success && + result.atsign != null) { + await changePrimaryAtsign(atsign: result.atsign!); } - } else { - return AtOnboardingResult.cancelled(); - } + return result; + } } + + return AtOnboardingResult.cancelled(); } static Future activateAccount({ @@ -103,7 +101,8 @@ class AtOnboarding { }) async { /// Initial Setup await _initialSetup(context); - if (context.mounted) { + + if(context.mounted){ final result = await Navigator.push( context, MaterialPageRoute( @@ -115,14 +114,13 @@ class AtOnboarding { }, ), ); + if (result is AtOnboardingResult) { return result; - } else { - return AtOnboardingResult.cancelled(); } - } else { - return AtOnboardingResult.cancelled(); } + + return AtOnboardingResult.cancelled(); } static Future changePrimaryAtsign({required String atsign}) async { @@ -136,17 +134,18 @@ class AtOnboarding { }) async { /// Initial Setup await _initialSetup(context); - if (context.mounted) { + + if(context.mounted){ final result = await Navigator.push(context, MaterialPageRoute(builder: (BuildContext context) { return AtOnboardingResetScreen(config: config); })); + if (result is AtOnboardingResetResult) { return result; - } else { - return AtOnboardingResetResult.cancelled; } } + return AtOnboardingResetResult.cancelled; } diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart index 28675fe5c..fdce0bac0 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart @@ -192,25 +192,25 @@ class _AtOnboardingOTPScreenState extends State { AtOnboardingLocalizations.current.resend_code, ), ), - ), - const SizedBox(height: 20), - RichText( - text: TextSpan( - children: [ - TextSpan( - text: AtOnboardingLocalizations.current.note, - style: theme.textTheme.bodyMedium?.copyWith( - fontSize: AtOnboardingDimens.fontSmall, - height: 1.5, - fontWeight: FontWeight.bold, + const SizedBox(height: 20), + RichText( + text: TextSpan( + children: [ + TextSpan( + text: AtOnboardingLocalizations.current.note, + style: theme.textTheme.bodyMedium?.copyWith( + fontSize: AtOnboardingDimens.fontSmall, + height: 1.5, + fontWeight: FontWeight.bold, + ), ), - ), - TextSpan( - text: AtOnboardingLocalizations - .current.note_otp_content, - style: theme.textTheme.bodyMedium?.copyWith( - fontSize: AtOnboardingDimens.fontSmall, - height: 1.5, + TextSpan( + text: AtOnboardingLocalizations + .current.note_otp_content, + style: theme.textTheme.bodyMedium?.copyWith( + fontSize: AtOnboardingDimens.fontSmall, + height: 1.5, + ), ), ], ), @@ -620,4 +620,4 @@ class _AtOnboardingOTPScreenState extends State { }, ); } -} +} \ No newline at end of file From 7d346cd26fe470e88536529d6d09abd88b3f82cf Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 4 Jul 2023 10:52:44 +0530 Subject: [PATCH 017/176] feat: updated dependencies and yaml --- .../at_backupkey_flutter/example/pubspec.yaml | 9 ++++++-- .../lib/widgets/backup_key_widget.dart | 11 ++++----- packages/at_backupkey_flutter/pubspec.yaml | 23 +++++++++++-------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/packages/at_backupkey_flutter/example/pubspec.yaml b/packages/at_backupkey_flutter/example/pubspec.yaml index 6fbb69bb2..7f1b6a4eb 100644 --- a/packages/at_backupkey_flutter/example/pubspec.yaml +++ b/packages/at_backupkey_flutter/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: at_backupkey_flutter: path: ../ - at_onboarding_flutter: ^5.0.3 + at_onboarding_flutter: ^6.1.0 # When depending on this package from a real application you should use: # at_backupkey_flutter: ^x.y.z @@ -29,7 +29,12 @@ dev_dependencies: flutter_lints: ^2.0.1 dependency_overrides: - file_selector_macos: ^0.8.2 + 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: ../ 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 f53867e77..405c594de 100644 --- a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart +++ b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart @@ -159,12 +159,12 @@ class BackupKeyWidget extends StatelessWidget { '''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.''', - shapeBorder: const CircleBorder(), - disableAnimation: true, - radius: + targetShapeBorder: const CircleBorder(), + disableMovingAnimation: true, + targetBorderRadius: const BorderRadius.all(Radius.circular(40)), showArrow: false, - overlayPadding: const EdgeInsets.all(5), + targetPadding: const EdgeInsets.all(5), blurValue: 2, child: Text( Strings.backUpKeysTitle, @@ -338,8 +338,7 @@ PLEASE SECURELY SAVE YOUR KEYS. WE DO NOT HAVE ACCESS TO THEM AND CANNOT CREATE var size = MediaQuery.of(context).size; await Share.shareXFiles( [XFile(tempFilePath)], - sharePositionOrigin: - Rect.fromLTWH(0, 0, size.width, size.height / 2), + sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2), ).then((ShareResult shareResult) { if (shareResult.status == ShareResultStatus.success) { ScaffoldMessenger.of(context).showSnackBar( diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index 7a9e398e4..7ff11df4f 100644 --- a/packages/at_backupkey_flutter/pubspec.yaml +++ b/packages/at_backupkey_flutter/pubspec.yaml @@ -2,9 +2,9 @@ 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.9 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_backupkey_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_backupkey_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_backupkey_flutter +documentation: https://docs.atsign.com/ environment: sdk: ">=2.12.0 <4.0.0" @@ -13,25 +13,28 @@ environment: dependencies: flutter: sdk: flutter - share_plus: ^4.0.3 - permission_handler: ^9.2.0 + share_plus: ^7.0.2 + permission_handler: ^10.4.1 path_provider: ^2.0.9 at_file_saver: ^0.1.2 at_utils: ^3.0.12 at_client_mobile: ^3.2.9 - showcaseview: ^1.1.5 - device_info_plus: ^8.0.0 + showcaseview: ^2.0.3 + device_info_plus: ^9.0.2 # desktop - dependencies - file_selector: ^0.8.4+1 - file_selector_macos: ^0.8.2 - file_selector_windows: ^0.8.2 - file_selector_linux: ^0.0.2+1 + file_selector: ^0.9.5 + file_selector_macos: ^0.9.3 + file_selector_windows: ^0.9.3 + file_selector_linux: ^0.9.2 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 +dependency_overrides: + win32: ^5.0.5 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 4d96a7a305683ab6d108fa4f8c9e6315cf7a4cc7 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Tue, 4 Jul 2023 15:09:14 +0530 Subject: [PATCH 018/176] chore: updated groups pakage to improve pub score --- .../Flutter/GeneratedPluginRegistrant.swift | 4 +- packages/at_contacts_group_flutter/README.md | 2 +- .../example/README.md | 2 +- .../example/example.md | 2 +- .../example/ios/Podfile.lock | 52 +++++++++--------- .../Flutter/GeneratedPluginRegistrant.swift | 6 +-- .../example/macos/Podfile.lock | 38 +++++++------ .../example/pubspec.yaml | 16 +++++- .../lib/at_contacts_group_flutter.dart | 14 ----- .../lib/models/group_contacts_model.dart | 3 +- .../lib/screens/edit/group_edit.dart | 1 - .../lib/screens/empty_group/empty_group.dart | 3 +- .../group_contact_view.dart | 53 ++++++++++--------- .../lib/screens/list/group_list.dart | 6 ++- .../lib/screens/new_group/new_group.dart | 1 - .../lib/services/group_service.dart | 17 ++++-- .../lib/utils/init_group_service.dart | 1 + .../at_contacts_group_flutter/pubspec.yaml | 23 +++++--- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- 19 files changed, 135 insertions(+), 111 deletions(-) diff --git a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index b8e7d380e..925ced397 100644 --- a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,10 +8,9 @@ import Foundation import at_file_saver import biometric_storage import file_selector_macos -import package_info_plus +import package_info_plus_macos import path_provider_foundation import share_plus_macos -import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { @@ -21,6 +20,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { 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_group_flutter/README.md b/packages/at_contacts_group_flutter/README.md index da4ea370d..fe71c4cc8 100644 --- a/packages/at_contacts_group_flutter/README.md +++ b/packages/at_contacts_group_flutter/README.md @@ -19,7 +19,7 @@ We call giving people control of access to their data “flipping the internet There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app -This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_contacts_group_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. +This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh $ flutter pub global activate at_app diff --git a/packages/at_contacts_group_flutter/example/README.md b/packages/at_contacts_group_flutter/example/README.md index e924c2286..eb7a5b9a9 100644 --- a/packages/at_contacts_group_flutter/example/README.md +++ b/packages/at_contacts_group_flutter/example/README.md @@ -9,7 +9,7 @@ The at_contacts_group_flutter is designed to make it easy to add groups to a flu ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_contacts_group_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_contacts_group_flutter/example/example.md b/packages/at_contacts_group_flutter/example/example.md index e924c2286..eb7a5b9a9 100644 --- a/packages/at_contacts_group_flutter/example/example.md +++ b/packages/at_contacts_group_flutter/example/example.md @@ -9,7 +9,7 @@ The at_contacts_group_flutter is designed to make it easy to add groups to a flu ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_contacts_group_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_contacts_group_flutter/example/ios/Podfile.lock b/packages/at_contacts_group_flutter/example/ios/Podfile.lock index 54cbd9985..03b87576e 100644 --- a/packages/at_contacts_group_flutter/example/ios/Podfile.lock +++ b/packages/at_contacts_group_flutter/example/ios/Podfile.lock @@ -49,8 +49,10 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - file_selector_ios (0.0.1): + - Flutter - Flutter (1.0.0) - - flutter_image_compress (1.0.0): + - flutter_image_compress_common (1.0.0): - Flutter - Mantle - SDWebImage @@ -75,25 +77,23 @@ PODS: - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_foundation (0.0.1): + - path_provider_ios (0.0.1): - Flutter - - FlutterMacOS - permission_handler_apple (9.0.4): - Flutter - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner - - SDWebImage (5.15.8): - - SDWebImage/Core (= 5.15.8) - - SDWebImage/Core (5.15.8) + - SDWebImage (5.15.5): + - SDWebImage/Core (= 5.15.5) + - SDWebImage/Core (5.15.5) - SDWebImageWebPCoder (0.11.0): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.15) - share_plus (0.0.1): - Flutter - - shared_preferences_foundation (0.0.1): + - shared_preferences_ios (0.0.1): - Flutter - - FlutterMacOS - SwiftyGif (5.4.4) - Toast (4.0.0) - url_launcher_ios (0.0.1): @@ -111,16 +111,17 @@ DEPENDENCIES: - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) - Flutter (from `Flutter`) - - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`) + - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -155,26 +156,28 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/emoji_picker_flutter/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" Flutter: :path: Flutter - flutter_image_compress: - :path: ".symlinks/plugins/flutter_image_compress/ios" + flutter_image_compress_common: + :path: ".symlinks/plugins/flutter_image_compress_common/ios" flutter_keychain: :path: ".symlinks/plugins/flutter_keychain/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/darwin" + path_provider_ios: + :path: ".symlinks/plugins/path_provider_ios/ios" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + shared_preferences_ios: + :path: ".symlinks/plugins/shared_preferences_ios/ios" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -192,26 +195,27 @@ SPEC CHECKSUMS: DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347 file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433 + flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 - fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 + fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798 + SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: 00aeb49562056f541ea701239573568e7adc5deb -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 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 6ff6e2989..a7fdc907d 100644 --- a/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,10 +10,10 @@ import biometric_storage import device_info_plus import emoji_picker_flutter import file_selector_macos -import package_info_plus_macos -import path_provider_foundation +import package_info_plus +import path_provider_macos import share_plus_macos -import shared_preferences_foundation +import shared_preferences_macos import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { diff --git a/packages/at_contacts_group_flutter/example/macos/Podfile.lock b/packages/at_contacts_group_flutter/example/macos/Podfile.lock index f427f46b2..5d9a884ed 100644 --- a/packages/at_contacts_group_flutter/example/macos/Podfile.lock +++ b/packages/at_contacts_group_flutter/example/macos/Podfile.lock @@ -10,15 +10,13 @@ PODS: - file_selector_macos (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - - package_info_plus_macos (0.0.1): + - package_info_plus (0.0.1): - FlutterMacOS - - path_provider_foundation (0.0.1): - - Flutter + - path_provider_macos (0.0.1): - FlutterMacOS - share_plus_macos (0.0.1): - FlutterMacOS - - shared_preferences_foundation (0.0.1): - - Flutter + - shared_preferences_macos (0.0.1): - FlutterMacOS - url_launcher_macos (0.0.1): - FlutterMacOS @@ -30,10 +28,10 @@ DEPENDENCIES: - emoji_picker_flutter (from `Flutter/ephemeral/.symlinks/plugins/emoji_picker_flutter/macos`) - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) - - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) + - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`) - - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) + - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) EXTERNAL SOURCES: @@ -49,14 +47,14 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos FlutterMacOS: :path: Flutter/ephemeral - package_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos - path_provider_foundation: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos + path_provider_macos: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos share_plus_macos: :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos - shared_preferences_foundation: - :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin + shared_preferences_macos: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos @@ -65,14 +63,14 @@ SPEC CHECKSUMS: biometric_storage: 43caa6e7ef00e8e19c074216e7e1786dacda9e76 device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f emoji_picker_flutter: 533634326b1c5de9a181ba14b9758e6dfe967a20 - file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6 + file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce + path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c - url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 + shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 + url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 diff --git a/packages/at_contacts_group_flutter/example/pubspec.yaml b/packages/at_contacts_group_flutter/example/pubspec.yaml index f33943b3f..46909ad9d 100644 --- a/packages/at_contacts_group_flutter/example/pubspec.yaml +++ b/packages/at_contacts_group_flutter/example/pubspec.yaml @@ -44,7 +44,21 @@ dependencies: # at_contacts_flutter: ^4.0.0 at_app_flutter: ^5.1.1 at_onboarding_flutter: ^6.0.2 - at_backupkey_flutter: ^4.0.7 + 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: + git: + url: https://github.com/atsign-foundation/at_widgets.git + path: packages/at_contacts_flutter + ref: trunk + + dev_dependencies: flutter_test: diff --git a/packages/at_contacts_group_flutter/lib/at_contacts_group_flutter.dart b/packages/at_contacts_group_flutter/lib/at_contacts_group_flutter.dart index 9a770d6ab..5bb198b67 100644 --- a/packages/at_contacts_group_flutter/lib/at_contacts_group_flutter.dart +++ b/packages/at_contacts_group_flutter/lib/at_contacts_group_flutter.dart @@ -1,17 +1,3 @@ -// import 'dart:async'; - -// import 'package:flutter/services.dart'; - -// class AtContactsGroupFlutter { -// static const MethodChannel _channel = -// const MethodChannel('at_contacts_group_flutter'); - -// static Future get platformVersion async { -// final String version = await _channel.invokeMethod('getPlatformVersion'); -// return version; -// } -// } - library at_contacts_group_flutter; export './screens/list/group_list.dart'; diff --git a/packages/at_contacts_group_flutter/lib/models/group_contacts_model.dart b/packages/at_contacts_group_flutter/lib/models/group_contacts_model.dart index 00399e441..8a53563f6 100644 --- a/packages/at_contacts_group_flutter/lib/models/group_contacts_model.dart +++ b/packages/at_contacts_group_flutter/lib/models/group_contacts_model.dart @@ -3,7 +3,7 @@ import 'dart:convert'; // ignore: import_of_legacy_library_into_null_safe import 'package:at_contact/at_contact.dart'; -/// Model to contain group details with associated contact +/// [GroupContactsModel] contains groups and contacts in a single model class GroupContactsModel { final AtContact? contact; final AtGroup? group; @@ -76,5 +76,6 @@ class GroupPreference { /// Enum for contact types // ignore: constant_identifier_names enum ContactsType { CONTACT, GROUP } + // ignore: constant_identifier_names enum ContactTabs { RECENT, FAVS, ALL } diff --git a/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart b/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart index 48fb3eb2f..82f6926c0 100644 --- a/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart +++ b/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart @@ -300,7 +300,6 @@ class _GroupEditState extends State { indicatorColor: Colors.blue, iconColor: Colors.grey, iconColorSelected: Colors.blue, - showRecentsTab: true, recentsLimit: 28, noRecents: Text( "No Recents", diff --git a/packages/at_contacts_group_flutter/lib/screens/empty_group/empty_group.dart b/packages/at_contacts_group_flutter/lib/screens/empty_group/empty_group.dart index e5d4f262b..8c5fd1abd 100644 --- a/packages/at_contacts_group_flutter/lib/screens/empty_group/empty_group.dart +++ b/packages/at_contacts_group_flutter/lib/screens/empty_group/empty_group.dart @@ -10,7 +10,8 @@ import 'package:flutter/material.dart'; // ignore: import_of_legacy_library_into_null_safe import 'package:at_common_flutter/at_common_flutter.dart'; -/// This widget gives option to create group when there is no group +/// [EmptyGroup] is displayed when no group is created. +/// It also provides option to create a new group. class EmptyGroup extends StatefulWidget { const EmptyGroup({Key? key}) : super(key: key); @override diff --git a/packages/at_contacts_group_flutter/lib/screens/group_contact_view/group_contact_view.dart b/packages/at_contacts_group_flutter/lib/screens/group_contact_view/group_contact_view.dart index bfe78ba65..5cc24cadf 100644 --- a/packages/at_contacts_group_flutter/lib/screens/group_contact_view/group_contact_view.dart +++ b/packages/at_contacts_group_flutter/lib/screens/group_contact_view/group_contact_view.dart @@ -380,28 +380,29 @@ class _GroupContactViewState extends State { child: Container( child: (contactsForAlphabet[index]!.contact != null) ? Slidable( - actionPane: const SlidableDrawerActionPane(), - actionExtentRatio: 0.25, - secondaryActions: [ - IconSlideAction( - caption: TextStrings().block, - color: ColorConstants.inputFieldColor, - icon: Icons.block, - onTap: () async { - blockUnblockContact( - contactsForAlphabet[index]!.contact!); - }, - ), - IconSlideAction( - caption: TextStrings().delete, - color: Colors.red, - icon: Icons.delete, - onTap: () async { - deleteAtSign( - contactsForAlphabet[index]!.contact!); - }, - ), - ], + endActionPane: ActionPane( + motion: const ScrollMotion(), + children: [ + SlidableAction( + label: TextStrings().block, + backgroundColor: ColorConstants.inputFieldColor, + icon: Icons.block, + onPressed: (_context) async { + blockUnblockContact( + contactsForAlphabet[index]!.contact!); + }, + ), + SlidableAction( + label: TextStrings().delete, + backgroundColor: Colors.red, + icon: Icons.delete, + onPressed: (_context) async { + deleteAtSign( + contactsForAlphabet[index]!.contact!); + }, + ) + ], + ), child: CustomListTile( key: UniqueKey(), onTap: () {}, @@ -555,10 +556,10 @@ class _GroupContactViewState extends State { }); if (_res && closeBottomSheet) { - if(mounted){ + if (mounted) { /// to close bottomsheet Navigator.pop(context); - } + } } } @@ -590,10 +591,10 @@ class _GroupContactViewState extends State { }); if (_res && closeBottomSheet) { - if(mounted){ + if (mounted) { /// to close bottomsheet Navigator.pop(context); - } + } } } diff --git a/packages/at_contacts_group_flutter/lib/screens/list/group_list.dart b/packages/at_contacts_group_flutter/lib/screens/list/group_list.dart index 617a1a246..83e05c99b 100644 --- a/packages/at_contacts_group_flutter/lib/screens/list/group_list.dart +++ b/packages/at_contacts_group_flutter/lib/screens/list/group_list.dart @@ -22,7 +22,11 @@ import 'package:at_contacts_group_flutter/widgets/confirmation_dialog.dart'; import 'package:at_utils/at_logger.dart'; import 'package:flutter/material.dart'; -/// This widget gives a screen to display list of groups +/// [GroupList] shows all the created groups. +/// +/// If no group is present, an empty screen is shows. +/// +/// [GroupList] also provides an option to create a new group. class GroupList extends StatefulWidget { const GroupList({Key? key}) : super(key: key); @override diff --git a/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart b/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart index 7c288915b..39cca8f24 100644 --- a/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart +++ b/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart @@ -302,7 +302,6 @@ class _NewGroupState extends State { indicatorColor: Colors.blue, iconColor: Colors.grey, iconColorSelected: Colors.blue, - showRecentsTab: true, recentsLimit: 28, noRecents: Text( "No Recents", diff --git a/packages/at_contacts_group_flutter/lib/services/group_service.dart b/packages/at_contacts_group_flutter/lib/services/group_service.dart index d7ac0946a..fcd815fe7 100644 --- a/packages/at_contacts_group_flutter/lib/services/group_service.dart +++ b/packages/at_contacts_group_flutter/lib/services/group_service.dart @@ -329,10 +329,21 @@ class GroupService { try { /// contacts list is already present, we do not fetch it again. if (allContacts.isNotEmpty) { - WidgetsBinding.instance.addPostFrameCallback((timeStamp) { - _allContactsStreamController.add(allContacts); + listContact.sort((a, b) { + int? index = a.atSign + .toString() + .substring(1) + .compareTo((b.atSign).toString().substring(1)); + return index; }); - return; + + /// If both contacts list are same, no chanbges have been made by the user. + if (listContact == ContactService().contactList) { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + _allContactsStreamController.add(allContacts); + }); + return; + } } allContacts = []; listContact = []; diff --git a/packages/at_contacts_group_flutter/lib/utils/init_group_service.dart b/packages/at_contacts_group_flutter/lib/utils/init_group_service.dart index 6ff7cf471..8cb2944e7 100644 --- a/packages/at_contacts_group_flutter/lib/utils/init_group_service.dart +++ b/packages/at_contacts_group_flutter/lib/utils/init_group_service.dart @@ -1,5 +1,6 @@ import 'package:at_contacts_group_flutter/services/group_service.dart'; +/// [initializeGroupService] has to be called before using groups package void initializeGroupService({rootDomain = 'root.atsign.wtf', rootPort = 64}) { GroupService().resetData(); GroupService().init(rootDomain, rootPort); diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index 2c19b9cf7..242dd1547 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -2,9 +2,9 @@ name: at_contacts_group_flutter description: A Flutter plugin project to provide group functionality with contacts using atPlatform. version: 4.0.12 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_contacts_group_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_contacts_group_flutter +documentation: https://docs.atsign.com/ environment: sdk: '>=2.12.0 <4.0.0' @@ -16,9 +16,9 @@ dependencies: fluttertoast: ^8.0.9 file_picker: ^5.2.4 - emoji_picker_flutter: ^1.2.1 - flutter_slidable: ^0.6.0 - flutter_image_compress: ^1.1.0 + emoji_picker_flutter: ^1.6.1 + flutter_slidable: ^3.0.0 + flutter_image_compress: ^2.0.3 image_compression: ^1.0.3 pedantic: ^1.11.0 flutter_toastr: ^1.0.3 @@ -26,8 +26,8 @@ dependencies: mocktail: ^0.3.0 # desktop - dependencies - file_selector: ^0.8.4+1 - file_selector_macos: ^0.8.2 + file_selector: ^0.9.5 + file_selector_macos: ^0.9.3 at_client_mobile: ^3.2.9 at_commons: ^3.0.45 @@ -35,7 +35,14 @@ dependencies: at_contacts_flutter: ^4.0.10 at_contact: ^3.0.7 at_utils: ^3.0.12 - + +dependency_overrides: + at_contacts_flutter: + git: + url: https://github.com/atsign-foundation/at_widgets.git + path: packages/at_contacts_flutter + ref: trunk + dev_dependencies: flutter_lints: ^2.0.1 flutter_test: diff --git a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index d6ee1de02..868dcbd32 100644 --- a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,7 +10,7 @@ import biometric_storage import file_selector_macos import geolocator_apple import package_info_plus_macos -import path_provider_foundation +import path_provider_macos import share_plus_macos import sqflite import url_launcher_macos From 5b21008e93dd87542854fd74a9a66074cabf41a1 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Wed, 5 Jul 2023 14:43:31 +0530 Subject: [PATCH 019/176] chore: updated repo url --- packages/at_common_flutter/CHANGELOG.md | 3 +++ packages/at_common_flutter/example/README.md | 2 +- packages/at_common_flutter/example/example.md | 2 +- packages/at_common_flutter/pubspec.yaml | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/at_common_flutter/CHANGELOG.md b/packages/at_common_flutter/CHANGELOG.md index 5b306c6b1..315a0f10a 100644 --- a/packages/at_common_flutter/CHANGELOG.md +++ b/packages/at_common_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.12 +- **CHORE**: Updated repository URL + ## 2.0.11 - **CHORE**: Updated dependencies and android gradle versions diff --git a/packages/at_common_flutter/example/README.md b/packages/at_common_flutter/example/README.md index b1d5fc596..9122785d6 100644 --- a/packages/at_common_flutter/example/README.md +++ b/packages/at_common_flutter/example/README.md @@ -5,7 +5,7 @@ In this example app we demo at_common_flutter - A Flutter package to provide common widgets used by other atPlatform Flutter packages. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_common_flutter/example/example.md b/packages/at_common_flutter/example/example.md index b1d5fc596..9122785d6 100644 --- a/packages/at_common_flutter/example/example.md +++ b/packages/at_common_flutter/example/example.md @@ -5,7 +5,7 @@ In this example app we demo at_common_flutter - A Flutter package to provide common widgets used by other atPlatform Flutter packages. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_common_flutter/pubspec.yaml b/packages/at_common_flutter/pubspec.yaml index c48dba26b..199990b9f 100644 --- a/packages/at_common_flutter/pubspec.yaml +++ b/packages/at_common_flutter/pubspec.yaml @@ -1,8 +1,8 @@ name: at_common_flutter description: A Flutter package to provide common widgets used by other atPlatform Flutter packages. -version: 2.0.11 +version: 2.0.12 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_common_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_common_flutter From bd6190134cc456415d1b91e0d5458d11a12d0d9f Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Wed, 5 Jul 2023 14:59:18 +0530 Subject: [PATCH 020/176] chore: improved oub scor efor at_sync_ui --- packages/at_sync_ui_flutter/CHANGELOG.md | 3 +++ packages/at_sync_ui_flutter/README.md | 2 +- packages/at_sync_ui_flutter/example/EXAMPLE.md | 2 +- packages/at_sync_ui_flutter/example/README.md | 2 +- packages/at_sync_ui_flutter/pubspec.yaml | 6 +++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/at_sync_ui_flutter/CHANGELOG.md b/packages/at_sync_ui_flutter/CHANGELOG.md index f930a6830..a90d09f35 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**: Improved pub score + ## 1.0.9 - **REFACTOR**: Deprecated `sync()` method and moved it's implementation to init. diff --git a/packages/at_sync_ui_flutter/README.md b/packages/at_sync_ui_flutter/README.md index b8658e257..96babb2e5 100644 --- a/packages/at_sync_ui_flutter/README.md +++ b/packages/at_sync_ui_flutter/README.md @@ -21,7 +21,7 @@ There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app This package includes a working sample application in the -[Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter/example) directory that you can use to create a personalized +[Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh diff --git a/packages/at_sync_ui_flutter/example/EXAMPLE.md b/packages/at_sync_ui_flutter/example/EXAMPLE.md index 42ed75bfb..531380c43 100644 --- a/packages/at_sync_ui_flutter/example/EXAMPLE.md +++ b/packages/at_sync_ui_flutter/example/EXAMPLE.md @@ -4,7 +4,7 @@ The [at_sync_ui_flutter] package is designed to make it easy for displaying status of sync process in atProtocol apps. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_sync_ui_flutter/example/README.md b/packages/at_sync_ui_flutter/example/README.md index 42ed75bfb..531380c43 100644 --- a/packages/at_sync_ui_flutter/example/README.md +++ b/packages/at_sync_ui_flutter/example/README.md @@ -4,7 +4,7 @@ The [at_sync_ui_flutter] package is designed to make it easy for displaying status of sync process in atProtocol apps. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index dad17e5bd..4330b1cfc 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -1,10 +1,10 @@ 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/at_sync_ui_flutter +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 -documentation: https://atsign.dev/docs/functional_architecture/libraries/ +documentation: https://docs.atsign.com/ environment: sdk: ">=2.12.0 <4.0.0" From 3456ffcd5969a8f8782b83509dbd54fab14980ca Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Wed, 5 Jul 2023 15:02:43 +0530 Subject: [PATCH 021/176] chore: updated documentation url --- packages/at_common_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_common_flutter/pubspec.yaml b/packages/at_common_flutter/pubspec.yaml index 199990b9f..49d8ff40e 100644 --- a/packages/at_common_flutter/pubspec.yaml +++ b/packages/at_common_flutter/pubspec.yaml @@ -4,7 +4,7 @@ version: 2.0.12 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_common_flutter +documentation: https://docs.atsign.com/ environment: sdk: '>=2.12.0 <4.0.0' From 6d19e32eb1dc0fd7975db53459659a9efaf93d79 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Wed, 5 Jul 2023 15:08:00 +0530 Subject: [PATCH 022/176] chore: updated sync package 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 a90d09f35..d67693a25 100644 --- a/packages/at_sync_ui_flutter/CHANGELOG.md +++ b/packages/at_sync_ui_flutter/CHANGELOG.md @@ -1,8 +1,6 @@ -## 1.0.10 -- **CHORE**: Improved pub score - ## 1.0.9 - **REFACTOR**: Deprecated `sync()` method and moved it's implementation to init. +- **CHORE**: Improved pub score ## 1.0.8 - **FEAT**: Provides exit option when sync takes longer diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index 4330b1cfc..9ad0b7c9a 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -1,6 +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. -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 ca7e1c2872e1e442b04b96debf11ae0efa6d6fd6 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Thu, 6 Jul 2023 00:32:02 +0530 Subject: [PATCH 023/176] chore: updated pub score --- packages/at_theme_flutter/CHANGELOG.md | 3 +++ packages/at_theme_flutter/README.md | 2 +- packages/at_theme_flutter/example/README.md | 4 ++-- packages/at_theme_flutter/example/example.md | 4 ++-- packages/at_theme_flutter/pubspec.yaml | 6 +++--- packages/at_theme_flutter/test/at_theme_flutter_test.dart | 5 ++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/at_theme_flutter/CHANGELOG.md b/packages/at_theme_flutter/CHANGELOG.md index 31deaacf2..848c24e45 100644 --- a/packages/at_theme_flutter/CHANGELOG.md +++ b/packages/at_theme_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.5 +- **CHORE**: Improved pub score + ## 1.0.4 - **CHORE**: Updated dependencies and android gradle versions diff --git a/packages/at_theme_flutter/README.md b/packages/at_theme_flutter/README.md index 4eec44c3d..c984dfb8a 100644 --- a/packages/at_theme_flutter/README.md +++ b/packages/at_theme_flutter/README.md @@ -22,7 +22,7 @@ We call giving people control of access to their data “flipping the internet There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app -This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_theme_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. +This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh $ flutter pub global activate at_app diff --git a/packages/at_theme_flutter/example/README.md b/packages/at_theme_flutter/example/README.md index 377e28380..841ab9768 100644 --- a/packages/at_theme_flutter/example/README.md +++ b/packages/at_theme_flutter/example/README.md @@ -5,7 +5,7 @@ The at_theme_flutter package is designed to make it easy to add theme selection in Flutter apps on atPlatform. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_theme_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app @@ -29,7 +29,7 @@ The package also manages all the data it needs for you. ## Sample Usage -You can utilise a streamController and StreamBuilder to switch to the selected theme. The usage can be found in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_theme_flutter/example) app. +You can utilise a streamController and StreamBuilder to switch to the selected theme. The usage can be found in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter/example) app. To get saved theme ```dart diff --git a/packages/at_theme_flutter/example/example.md b/packages/at_theme_flutter/example/example.md index 377e28380..841ab9768 100644 --- a/packages/at_theme_flutter/example/example.md +++ b/packages/at_theme_flutter/example/example.md @@ -5,7 +5,7 @@ The at_theme_flutter package is designed to make it easy to add theme selection in Flutter apps on atPlatform. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_theme_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app @@ -29,7 +29,7 @@ The package also manages all the data it needs for you. ## Sample Usage -You can utilise a streamController and StreamBuilder to switch to the selected theme. The usage can be found in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_theme_flutter/example) app. +You can utilise a streamController and StreamBuilder to switch to the selected theme. The usage can be found in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter/example) app. To get saved theme ```dart diff --git a/packages/at_theme_flutter/pubspec.yaml b/packages/at_theme_flutter/pubspec.yaml index 15e97900e..0b5d80e8e 100644 --- a/packages/at_theme_flutter/pubspec.yaml +++ b/packages/at_theme_flutter/pubspec.yaml @@ -1,11 +1,11 @@ name: at_theme_flutter description: A Flutter plugin project to provide theme selection in atPlatform apps with ease. -version: 1.0.4 +version: 1.0.5 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_theme_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_theme_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_theme_flutter +documentation: https://docs.atsign.com/ environment: sdk: ">=2.12.0 <4.0.0" diff --git a/packages/at_theme_flutter/test/at_theme_flutter_test.dart b/packages/at_theme_flutter/test/at_theme_flutter_test.dart index 2ec2e092e..62146aaed 100644 --- a/packages/at_theme_flutter/test/at_theme_flutter_test.dart +++ b/packages/at_theme_flutter/test/at_theme_flutter_test.dart @@ -4,14 +4,13 @@ import 'package:at_theme_flutter/services/theme_service.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; -// ignore: depend_on_referenced_packages -import 'package:at_client/src/client/request_options.dart'; class MockAtClientManager extends Mock implements AtClientManager {} class MockAtClient extends Mock implements AtClient { @override - Future put(AtKey key, dynamic value, {bool isDedicated = false}) async { + Future put(AtKey key, dynamic value, + {bool isDedicated = false, PutRequestOptions? putRequestOptions}) async { return true; } From 9c4e0380276c730147cf1685a56abc60fad8806b Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 6 Jul 2023 11:14:42 -0400 Subject: [PATCH 024/176] chore: repository and documentation url updated to a valid url --- packages/at_contacts_group_flutter/pubspec.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index 2c19b9cf7..8ccde4290 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -2,9 +2,10 @@ name: at_contacts_group_flutter description: A Flutter plugin project to provide group functionality with contacts using atPlatform. version: 4.0.12 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_contacts_group_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter + issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_contacts_group_flutter +documentation: https://atsign.dev environment: sdk: '>=2.12.0 <4.0.0' From dc747057b7bae1748549c7d1158eebb05e19876b Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 6 Jul 2023 11:44:43 -0400 Subject: [PATCH 025/176] fix: resolve breaking change in emoji_picker_flutter package by replacing the showRecentTab property of Config class with the recentTabBahavior property --- .../lib/screens/edit/group_edit.dart | 57 +++++++------------ .../lib/screens/new_group/new_group.dart | 48 ++++++---------- 2 files changed, 37 insertions(+), 68 deletions(-) diff --git a/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart b/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart index 48fb3eb2f..8de2a11b9 100644 --- a/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart +++ b/packages/at_contacts_group_flutter/lib/screens/edit/group_edit.dart @@ -1,7 +1,11 @@ // ignore_for_file: use_build_context_synchronously +import 'dart:typed_data'; + +import 'package:at_common_flutter/at_common_flutter.dart'; import 'package:at_contact/at_contact.dart'; import 'package:at_contacts_flutter/screens/contacts_screen.dart'; +import 'package:at_contacts_group_flutter/screens/edit/person_horizontal.dart'; import 'package:at_contacts_group_flutter/services/group_service.dart'; import 'package:at_contacts_group_flutter/services/image_picker.dart'; import 'package:at_contacts_group_flutter/utils/colors.dart'; @@ -9,12 +13,9 @@ import 'package:at_contacts_group_flutter/utils/text_constants.dart'; import 'package:at_contacts_group_flutter/utils/text_styles.dart'; import 'package:at_contacts_group_flutter/widgets/confirmation_dialog.dart'; import 'package:at_contacts_group_flutter/widgets/custom_toast.dart'; -import 'package:at_contacts_group_flutter/screens/edit/person_horizontal.dart'; import 'package:at_contacts_group_flutter/widgets/yes_no_dialog.dart'; -import 'package:flutter/material.dart'; -import 'package:at_common_flutter/at_common_flutter.dart'; -import 'dart:typed_data'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; +import 'package:flutter/material.dart'; import '../../widgets/error_screen.dart'; import '../list/group_list.dart'; @@ -118,9 +119,7 @@ class _GroupEditState extends State { child: Text( 'Cancel', style: TextStyle( - color: Theme.of(context).brightness == Brightness.light - ? AllColors().Black - : AllColors().Black, + color: Theme.of(context).brightness == Brightness.light ? AllColors().Black : AllColors().Black, fontSize: 14.toFont, fontWeight: FontWeight.normal, ), @@ -202,8 +201,7 @@ class _GroupEditState extends State { ), ), Padding( - padding: EdgeInsets.symmetric( - horizontal: 27.toWidth, vertical: 2.toHeight), + padding: EdgeInsets.symmetric(horizontal: 27.toWidth, vertical: 2.toHeight), child: Row( children: [ Expanded( @@ -217,8 +215,7 @@ class _GroupEditState extends State { ), ), Padding( - padding: EdgeInsets.symmetric( - horizontal: 27.toWidth, vertical: 2.toHeight), + padding: EdgeInsets.symmetric(horizontal: 27.toWidth, vertical: 2.toHeight), child: Container( width: double.infinity, decoration: BoxDecoration( @@ -300,7 +297,7 @@ class _GroupEditState extends State { indicatorColor: Colors.blue, iconColor: Colors.grey, iconColorSelected: Colors.blue, - showRecentsTab: true, + recentTabBehavior: RecentTabBehavior.RECENT, recentsLimit: 28, noRecents: Text( "No Recents", @@ -354,20 +351,17 @@ class _GroupEditState extends State { if (GroupService().selecteContactList.isNotEmpty) { GroupService().showLoaderSink.add(true); - var result = await GroupService().addGroupMembers( - [...GroupService().selecteContactList], - widget.group); + var result = + await GroupService().addGroupMembers([...GroupService().selecteContactList], widget.group); GroupService().showLoaderSink.add(false); if (!mounted) return; if (result is bool && result) { return; } else if (result == null) { - CustomToast() - .show(TextConstants().SERVICE_ERROR, context); + CustomToast().show(TextConstants().SERVICE_ERROR, context); } else { - CustomToast() - .show(TextConstants().SERVICE_ERROR, context); + CustomToast().show(TextConstants().SERVICE_ERROR, context); } } }, @@ -407,15 +401,12 @@ class _GroupEditState extends State { context, 'Are you sure you want to remove all members from the group?', () async { - var result = await GroupService() - .deletGroupMembers(contacts, widget.group); + var result = await GroupService().deletGroupMembers(contacts, widget.group); if (result == null) { - CustomToast() - .show(TextConstants().SERVICE_ERROR, context); + CustomToast().show(TextConstants().SERVICE_ERROR, context); } else { - CustomToast().show( - "Deleted all members successfully!", context); + CustomToast().show("Deleted all members successfully!", context); showDeleteGroupDialog( context, @@ -492,8 +483,7 @@ class _GroupEditState extends State { : null, subTitle: groupData.members!.elementAt(index).atSign, onDelete: () async { - await showMyDialog(context, - groupData.members!.elementAt(index), widget.group); + await showMyDialog(context, groupData.members!.elementAt(index), widget.group); }, ); }, @@ -524,9 +514,7 @@ class _GroupEditState extends State { return Container( height: 119.toHeight, decoration: BoxDecoration( - color: Theme.of(context).brightness == Brightness.light - ? AllColors().WHITE - : AllColors().Black, + color: Theme.of(context).brightness == Brightness.light ? AllColors().WHITE : AllColors().Black, borderRadius: const BorderRadius.only( topLeft: Radius.circular(12.0), topRight: Radius.circular(12.0), @@ -575,8 +563,7 @@ class _GroupEditState extends State { ); } - Future showMyDialog( - BuildContext context, AtContact contact, AtGroup group) async { + Future showMyDialog(BuildContext context, AtContact contact, AtGroup group) async { return showDialog( context: context, barrierDismissible: true, @@ -585,13 +572,11 @@ class _GroupEditState extends State { title: contact.atSign!, heading: 'Are you sure you want to remove from the group?', onYesPressed: () async { - var result = - await GroupService().deletGroupMembers([contact], widget.group); + var result = await GroupService().deletGroupMembers([contact], widget.group); if (result is bool && result) { Navigator.of(context).pop(); - CustomToast().show( - "${contact.atSign ?? ''} deleted successfully!", context); + CustomToast().show("${contact.atSign ?? ''} deleted successfully!", context); if (contacts.isEmpty) { showDeleteGroupDialog( context, diff --git a/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart b/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart index 7c288915b..53761ea58 100644 --- a/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart +++ b/packages/at_contacts_group_flutter/lib/screens/new_group/new_group.dart @@ -2,6 +2,8 @@ import 'dart:typed_data'; +import 'package:at_common_flutter/at_common_flutter.dart'; +import 'package:at_commons/at_commons.dart'; // ignore: import_of_legacy_library_into_null_safe import 'package:at_contact/at_contact.dart'; import 'package:at_contacts_group_flutter/services/group_service.dart'; @@ -11,10 +13,8 @@ import 'package:at_contacts_group_flutter/utils/text_constants.dart'; import 'package:at_contacts_group_flutter/widgets/bottom_sheet.dart'; import 'package:at_contacts_group_flutter/widgets/custom_toast.dart'; import 'package:at_contacts_group_flutter/widgets/person_vertical_tile.dart'; -import 'package:flutter/material.dart'; -import 'package:at_common_flutter/at_common_flutter.dart'; -import 'package:at_commons/at_commons.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; +import 'package:flutter/material.dart'; /// This widget provides screen to create a new group class NewGroup extends StatefulWidget { @@ -63,8 +63,7 @@ class _NewGroupState extends State { // ignore: always_declare_return_types createGroup() async { - var isKeyboardOpen = - MediaQuery.of(context).viewInsets.bottom != 0 ? true : false; + var isKeyboardOpen = MediaQuery.of(context).viewInsets.bottom != 0 ? true : false; groupName = textController.text; // ignore: unnecessary_null_comparison if (groupName != null) { @@ -89,42 +88,33 @@ class _NewGroupState extends State { var result = await GroupService().createGroup(group); - isKeyboardOpen = - MediaQuery.of(context).viewInsets.bottom != 0 ? true : false; + isKeyboardOpen = MediaQuery.of(context).viewInsets.bottom != 0 ? true : false; if (result is AtGroup) { Navigator.of(context).pop(); } else if (result != null) { if (result.runtimeType == AlreadyExistsException) { - CustomToast().show(TextConstants().GROUP_ALREADY_EXISTS, context, - gravity: isKeyboardOpen ? 2 : 0); + CustomToast().show(TextConstants().GROUP_ALREADY_EXISTS, context, gravity: isKeyboardOpen ? 2 : 0); } else if (result.runtimeType == InvalidAtSignException) { - CustomToast() - .show(result.message, context, gravity: isKeyboardOpen ? 2 : 0); + CustomToast().show(result.message, context, gravity: isKeyboardOpen ? 2 : 0); } else { - CustomToast().show(TextConstants().SERVICE_ERROR, context, - gravity: isKeyboardOpen ? 2 : 0); + CustomToast().show(TextConstants().SERVICE_ERROR, context, gravity: isKeyboardOpen ? 2 : 0); } } else { - CustomToast().show(TextConstants().SERVICE_ERROR, context, - gravity: isKeyboardOpen ? 2 : 0); + CustomToast().show(TextConstants().SERVICE_ERROR, context, gravity: isKeyboardOpen ? 2 : 0); } } else { - CustomToast().show(TextConstants().EMPTY_NAME, context, - gravity: isKeyboardOpen ? 2 : 0); + CustomToast().show(TextConstants().EMPTY_NAME, context, gravity: isKeyboardOpen ? 2 : 0); } } else { - CustomToast().show(TextConstants().EMPTY_NAME, context, - gravity: isKeyboardOpen ? 2 : 0); + CustomToast().show(TextConstants().EMPTY_NAME, context, gravity: isKeyboardOpen ? 2 : 0); } } @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Theme.of(context).brightness == Brightness.light - ? AllColors().WHITE - : AllColors().Black, + backgroundColor: Theme.of(context).brightness == Brightness.light ? AllColors().WHITE : AllColors().Black, bottomSheet: GroupBottomSheet( onPressed: createGroup, message: selectedContacts!.length == 1 @@ -132,11 +122,7 @@ class _NewGroupState extends State { : '${selectedContacts!.length} Contacts Selected', buttontext: 'Done', ), - appBar: const CustomAppBar( - titleText: 'New Group', - showTitle: true, - showBackButton: true, - showLeadingIcon: true), + appBar: const CustomAppBar(titleText: 'New Group', showTitle: true, showBackButton: true, showLeadingIcon: true), body: SafeArea( child: Column( children: [ @@ -167,8 +153,7 @@ class _NewGroupState extends State { width: 68.toWidth, height: 68.toWidth, child: CircleAvatar( - backgroundImage: - Image.memory(selectedImageByteData!).image, + backgroundImage: Image.memory(selectedImageByteData!).image, ), ) : Icon(Icons.add, color: AllColors().ORANGE), @@ -264,8 +249,7 @@ class _NewGroupState extends State { physics: const ScrollPhysics(), shrinkWrap: true, crossAxisCount: 4, - childAspectRatio: ((SizeConfig().screenWidth * 0.25) / - (SizeConfig().screenHeight * 0.2)), + childAspectRatio: ((SizeConfig().screenWidth * 0.25) / (SizeConfig().screenHeight * 0.2)), children: List.generate(selectedContacts!.length, (index) { return CustomPersonVerticalTile( key: UniqueKey(), @@ -302,7 +286,7 @@ class _NewGroupState extends State { indicatorColor: Colors.blue, iconColor: Colors.grey, iconColorSelected: Colors.blue, - showRecentsTab: true, + recentTabBehavior: RecentTabBehavior.RECENT, recentsLimit: 28, noRecents: Text( "No Recents", From 04d49deab7131fd2b41ec2d1cd1bcce8dc02f849 Mon Sep 17 00:00:00 2001 From: "DESKTOP-246FAJ4\\Admin" Date: Fri, 7 Jul 2023 14:28:15 +0700 Subject: [PATCH 026/176] feat: improve pub score --- packages/at_common_flutter/CHANGELOG.md | 3 +++ packages/at_common_flutter/example/README.md | 2 +- packages/at_common_flutter/example/example.md | 2 +- packages/at_common_flutter/pubspec.yaml | 6 ++--- .../example/ios/Podfile.lock | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 ++ .../at_events_flutter/example/pubspec.yaml | 2 +- .../at_event_notification_listener.dart | 2 ++ .../services/event_key_stream_service.dart | 3 +++ .../lib/services/event_services.dart | 19 ++++++++++++++-- .../lib/services/home_event_service.dart | 5 +++++ .../lib/services/venues_services.dart | 16 ++++++++++---- packages/at_events_flutter/pubspec.yaml | 22 +++++++++---------- .../test/at_events_flutter_test.dart | 3 ++- packages/at_sync_ui_flutter/CHANGELOG.md | 1 + packages/at_sync_ui_flutter/README.md | 2 +- .../at_sync_ui_flutter/example/EXAMPLE.md | 2 +- packages/at_sync_ui_flutter/example/README.md | 2 +- packages/at_sync_ui_flutter/pubspec.yaml | 4 ++-- 19 files changed, 70 insertions(+), 30 deletions(-) diff --git a/packages/at_common_flutter/CHANGELOG.md b/packages/at_common_flutter/CHANGELOG.md index 5b306c6b1..315a0f10a 100644 --- a/packages/at_common_flutter/CHANGELOG.md +++ b/packages/at_common_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.12 +- **CHORE**: Updated repository URL + ## 2.0.11 - **CHORE**: Updated dependencies and android gradle versions diff --git a/packages/at_common_flutter/example/README.md b/packages/at_common_flutter/example/README.md index b1d5fc596..9122785d6 100644 --- a/packages/at_common_flutter/example/README.md +++ b/packages/at_common_flutter/example/README.md @@ -5,7 +5,7 @@ In this example app we demo at_common_flutter - A Flutter package to provide common widgets used by other atPlatform Flutter packages. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_common_flutter/example/example.md b/packages/at_common_flutter/example/example.md index b1d5fc596..9122785d6 100644 --- a/packages/at_common_flutter/example/example.md +++ b/packages/at_common_flutter/example/example.md @@ -5,7 +5,7 @@ In this example app we demo at_common_flutter - A Flutter package to provide common widgets used by other atPlatform Flutter packages. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_common_flutter/pubspec.yaml b/packages/at_common_flutter/pubspec.yaml index c48dba26b..49d8ff40e 100644 --- a/packages/at_common_flutter/pubspec.yaml +++ b/packages/at_common_flutter/pubspec.yaml @@ -1,10 +1,10 @@ name: at_common_flutter description: A Flutter package to provide common widgets used by other atPlatform Flutter packages. -version: 2.0.11 +version: 2.0.12 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_common_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_common_flutter +documentation: https://docs.atsign.com/ environment: sdk: '>=2.12.0 <4.0.0' diff --git a/packages/at_events_flutter/example/ios/Podfile.lock b/packages/at_events_flutter/example/ios/Podfile.lock index ab3c8ace7..5b531b5c5 100644 --- a/packages/at_events_flutter/example/ios/Podfile.lock +++ b/packages/at_events_flutter/example/ios/Podfile.lock @@ -238,4 +238,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8408228ce..92cfc365e 100644 --- a/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,6 +7,7 @@ import Foundation import at_file_saver import biometric_storage +import device_info_plus import emoji_picker_flutter import file_selector_macos import geolocator_apple @@ -20,6 +21,7 @@ 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")) EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) diff --git a/packages/at_events_flutter/example/pubspec.yaml b/packages/at_events_flutter/example/pubspec.yaml index 6643457f8..2c95b4e76 100644 --- a/packages/at_events_flutter/example/pubspec.yaml +++ b/packages/at_events_flutter/example/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/packages/at_events_flutter/lib/services/at_event_notification_listener.dart b/packages/at_events_flutter/lib/services/at_event_notification_listener.dart index e60b1dc87..4fba68d10 100644 --- a/packages/at_events_flutter/lib/services/at_event_notification_listener.dart +++ b/packages/at_events_flutter/lib/services/at_event_notification_listener.dart @@ -34,6 +34,7 @@ class AtEventNotificationListener { monitorStarted = false; } + /// initializes initial values and configurations for the package void init(GlobalKey navKeyFromMainApp, String rootDomain, {Function? newGetAtValueFromMainApp}) { atClientManager = AtClientManager.getInstance(); @@ -138,6 +139,7 @@ class AtEventNotificationListener { } } + /// shows a dialog with event notification details Future showMyDialog( {EventNotificationModel? eventNotificationModel}) async { return showDialog( 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 662b6fe1a..fa2472ac8 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 @@ -43,6 +43,7 @@ class EventKeyStreamService { Function(List)? streamAlternative; + /// initializes with necessary values and configurations void init({Function(List)? streamAlternative}) async { loggedInUserDetails = null; atClientManager = AtClientManager.getInstance(); @@ -61,6 +62,7 @@ class EventKeyStreamService { getAllContactDetails(currentAtSign!); } + /// retrieves all contact details for the given [currentAtSign] void getAllContactDetails(String currentAtSign) async { atContactImpl = await AtContactsImpl.getInstance(currentAtSign); contactList = await atContactImpl!.listContacts(); @@ -538,6 +540,7 @@ class EventKeyStreamService { } // ignore: missing_return + /// forms and returns an [AtKey] object based on the given [keyType], [atkeyMicrosecondId], [sharedWith], [sharedBy], and [eventData] AtKey? formAtKey(ATKEY_TYPE_ENUM keyType, String atkeyMicrosecondId, String? sharedWith, String sharedBy, EventNotificationModel eventData) { switch (keyType) { diff --git a/packages/at_events_flutter/lib/services/event_services.dart b/packages/at_events_flutter/lib/services/event_services.dart index ec9bde4a5..6c94498ad 100644 --- a/packages/at_events_flutter/lib/services/event_services.dart +++ b/packages/at_events_flutter/lib/services/event_services.dart @@ -17,8 +17,10 @@ import 'package:at_utils/at_logger.dart'; class EventService { EventService._(); + // ignore: prefer_final_fields static EventService _instance = EventService._(); + factory EventService() => _instance; final _logger = AtSignLogger('EventService'); @@ -34,8 +36,10 @@ class EventService { // ignore: close_sinks final _atEventNotificationController = StreamController.broadcast(); + Stream get eventStream => _atEventNotificationController.stream; + StreamSink get eventSink => _atEventNotificationController.sink; @@ -210,6 +214,7 @@ class EventService { } // ignore: always_declare_return_types + /// adds new contacts and group members to the event notification model addNewContactAndGroupMembers(List selectedList) { if (EventService().eventNotificationModel!.group!.members == null) { EventService().eventNotificationModel!.group!.members = {}; @@ -231,6 +236,7 @@ class EventService { }); } + /// adds a contact to the contact list void addContactToList(AtContact _selectedContact) { var _containsContact = false; @@ -254,6 +260,7 @@ class EventService { } // ignore: always_declare_return_types + /// creates a contact list from the group members createContactListFromGroupMembers() { selectedContacts = []; selectedContactsAtSigns = []; @@ -264,6 +271,7 @@ class EventService { } } + /// creates a new [AtContact] object for a group member based on the provided [atcontact] AtContact getGroupMemberContact(AtContact atcontact) { var newContact = AtContact(atSign: atcontact.atSign); newContact.tags = {}; @@ -278,6 +286,7 @@ class EventService { } // ignore: always_declare_return_types + /// removes the selected contact at the given [index] from the event notification model removeSelectedContact(int index) { if (eventNotificationModel!.group!.members!.length > index && selectedContacts!.length > index) { @@ -318,6 +327,7 @@ class EventService { } } + /// checks if there is any overlap in time slots between the provided [hybridEvents] and [newEvent] dynamic isEventTimeSlotOverlap(List hybridEvents, EventNotificationModel? newEvent) { var isOverlap = false; @@ -380,6 +390,7 @@ class EventService { } } + /// checks for one-day event form validation based on the provided [eventData] dynamic checForOneDayEventFormValidation(EventNotificationModel eventData) { if (eventData.event!.date == null) { return 'add event date'; @@ -417,6 +428,7 @@ class EventService { return true; } + /// checks for recurring event form validation based on the provided [eventData] dynamic checForRecurringeDayEventFormValidation( EventNotificationModel eventData) { if (eventData.event!.repeatDuration == null) { @@ -463,10 +475,13 @@ class EventService { } else if (!receiver.contains('@')) { receiver = '@$receiver'; } - var checkPresence = await AtLookupImpl.findSecondary(receiver, root, 64); - return checkPresence != null; + var checkPresence = (await CacheableSecondaryAddressFinder(root, 64) + .findSecondary(receiver)) + .toString(); + return checkPresence.isNotEmpty; } + /// notifies all the specified Atsigns about an update using the provided [atkey], [value], and [atsigns] Future notifyAll( AtKey atkey, String value, List atsigns) async { for (var element in atsigns) { diff --git a/packages/at_events_flutter/lib/services/home_event_service.dart b/packages/at_events_flutter/lib/services/home_event_service.dart index 5919fc09d..58778f888 100644 --- a/packages/at_events_flutter/lib/services/home_event_service.dart +++ b/packages/at_events_flutter/lib/services/home_event_service.dart @@ -15,6 +15,7 @@ class HomeEventService { static final HomeEventService _instance = HomeEventService._(); factory HomeEventService() => _instance; + /// checks if any action is required for the given [event] bool isActionRequired(EventNotificationModel event) { if (isEventCancelled(event)) return true; @@ -77,12 +78,14 @@ class HomeEventService { : ''; } + /// returns a semi-title for the event based on the provided [EventNotificationModel] and whether the user has responded or not String? getSemiTitle(EventNotificationModel _event, bool _haveResponded) { return (isActionRequired(_event)) ? getActionString(_event, _haveResponded) : null; } + /// calculates whether to show the retry option for the given [EventKeyLocationModel] bool calculateShowRetry(EventKeyLocationModel _eventKeyModel) { if ((_eventKeyModel.eventNotificationModel!.group != null) && (isActionRequired(_eventKeyModel.eventNotificationModel!)) && @@ -98,6 +101,7 @@ class HomeEventService { } // ignore: always_declare_return_types + /// handles the tap on an event model. onEventModelTap( EventNotificationModel eventNotificationModel, bool haveResponded) { if (isActionRequired(eventNotificationModel) && @@ -208,6 +212,7 @@ class HomeEventService { // } } + /// checks if an event is cancelled bool isEventCancelled(EventNotificationModel _event) { EventInfo? _creatorInfo; if (compareAtSign(_event.atsignCreator!, diff --git a/packages/at_events_flutter/lib/services/venues_services.dart b/packages/at_events_flutter/lib/services/venues_services.dart index 955b85159..94b6b8d7f 100644 --- a/packages/at_events_flutter/lib/services/venues_services.dart +++ b/packages/at_events_flutter/lib/services/venues_services.dart @@ -8,7 +8,9 @@ import 'dart:collection'; class VenuesServices { VenuesServices._(); + static final _instance = VenuesServices._(); + factory VenuesServices() => _instance; final _logger = AtSignLogger('VenuesServices'); @@ -17,6 +19,7 @@ class VenuesServices { int maxLengthOfVenues = 10; var venueLatLngKey = 'reusablevenues'; + /// retrieves the list of venues from the storage location specified by [venueLatLngKey] getVenues() async { venues = Queue(); // reset @@ -26,11 +29,12 @@ class VenuesServices { ..metadata!.ttr = -1 ..metadata!.ccd = true ..key = venueLatLngKey; - var value = - await AtClientManager.getInstance().atClient.get(atKey).catchError( - // ignore: invalid_return_type_for_catch_error, body_might_complete_normally_catch_error - (e) async { + var value = await AtClientManager.getInstance() + .atClient + .get(atKey) + .catchError((e) async { await _storeVenue(Queue()); + return AtValue(); }); // ignore: unnecessary_null_comparison @@ -47,6 +51,7 @@ class VenuesServices { } } + /// stores a new venue in the local storage storeNewVenue(LatLng _latLng, String _venue, {String? displayName}) async { if (alreadyExists(VenueLatLng( _venue, @@ -70,6 +75,7 @@ class VenuesServices { await _storeVenue(_tempVenues); } + /// persists the updated [venues] queue to the storage Future _storeVenue(Queue _tempVenues) async { try { var atKey = AtKey() @@ -102,6 +108,7 @@ class VenuesServices { } } + /// checks if a given [_newVenue] already exists in the [venues] queue bool alreadyExists(VenueLatLng _newVenue) { for (var _venue in venues) { if (_venue.compare(_newVenue)) { @@ -112,6 +119,7 @@ class VenuesServices { return false; } + /// clears the [venues] queue clear() { venues = Queue(); } diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 49f1eeca0..80a007e21 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -2,32 +2,32 @@ name: at_events_flutter description: A Flutter plugin project to manage events (time, place and attendees) using the atPlatform. version: 3.1.9 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_events_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_events_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_events_flutter +documentation: https://docs.atsign.com/ environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' flutter: ">=1.20.0" dependencies: flutter: sdk: flutter - latlong2: ^0.8.1 - fluttertoast: ^8.0.9 + latlong2: ^0.8.2 + fluttertoast: ^8.2.2 sliding_up_panel: ^2.0.0+1 geolocator: ^8.2.1 - at_commons: ^3.0.26 - at_client_mobile: ^3.2.7 + at_commons: ^3.0.48 + at_client_mobile: ^3.2.10 at_contact: ^3.0.7 at_lookup: ^3.0.32 - at_utils: ^3.0.11 - at_client: ^3.0.40 + at_utils: ^3.0.13 + at_client: ^3.0.61 - at_contacts_group_flutter: ^4.0.10 + at_contacts_group_flutter: ^4.0.12 # at_chat_flutter: ^2.0.2 - at_contacts_flutter: ^4.0.8 + at_contacts_flutter: ^4.0.10 at_location_flutter: ^3.1.8 at_common_flutter: ^2.0.11 diff --git a/packages/at_events_flutter/test/at_events_flutter_test.dart b/packages/at_events_flutter/test/at_events_flutter_test.dart index 1f27b1135..c899aeb59 100644 --- a/packages/at_events_flutter/test/at_events_flutter_test.dart +++ b/packages/at_events_flutter/test/at_events_flutter_test.dart @@ -15,7 +15,8 @@ class MockAtClient extends Mock implements AtClient { } @override - Future delete(AtKey key, {bool isDedicated = false}) async { + Future delete(AtKey key, + {bool isDedicated = false, DeleteRequestOptions? deleteRequestOptions}) async { return true; } diff --git a/packages/at_sync_ui_flutter/CHANGELOG.md b/packages/at_sync_ui_flutter/CHANGELOG.md index f930a6830..d67693a25 100644 --- a/packages/at_sync_ui_flutter/CHANGELOG.md +++ b/packages/at_sync_ui_flutter/CHANGELOG.md @@ -1,5 +1,6 @@ ## 1.0.9 - **REFACTOR**: Deprecated `sync()` method and moved it's implementation to init. +- **CHORE**: Improved pub score ## 1.0.8 - **FEAT**: Provides exit option when sync takes longer diff --git a/packages/at_sync_ui_flutter/README.md b/packages/at_sync_ui_flutter/README.md index b8658e257..96babb2e5 100644 --- a/packages/at_sync_ui_flutter/README.md +++ b/packages/at_sync_ui_flutter/README.md @@ -21,7 +21,7 @@ There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app This package includes a working sample application in the -[Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter/example) directory that you can use to create a personalized +[Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh diff --git a/packages/at_sync_ui_flutter/example/EXAMPLE.md b/packages/at_sync_ui_flutter/example/EXAMPLE.md index 42ed75bfb..531380c43 100644 --- a/packages/at_sync_ui_flutter/example/EXAMPLE.md +++ b/packages/at_sync_ui_flutter/example/EXAMPLE.md @@ -4,7 +4,7 @@ The [at_sync_ui_flutter] package is designed to make it easy for displaying status of sync process in atProtocol apps. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_sync_ui_flutter/example/README.md b/packages/at_sync_ui_flutter/example/README.md index 42ed75bfb..531380c43 100644 --- a/packages/at_sync_ui_flutter/example/README.md +++ b/packages/at_sync_ui_flutter/example/README.md @@ -4,7 +4,7 @@ The [at_sync_ui_flutter] package is designed to make it easy for displaying status of sync process in atProtocol apps. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_sync_ui_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index dad17e5bd..9ad0b7c9a 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -2,9 +2,9 @@ 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 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_sync_ui_flutter +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 -documentation: https://atsign.dev/docs/functional_architecture/libraries/ +documentation: https://docs.atsign.com/ environment: sdk: ">=2.12.0 <4.0.0" From 6e36cbeb0394cbd94a0f0d1165d42ad10aa914ff Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Fri, 7 Jul 2023 13:00:59 +0530 Subject: [PATCH 027/176] chore : update repo urls in backupkey --- packages/at_backupkey_flutter/CHANGELOG.md | 3 +++ packages/at_backupkey_flutter/example/README.md | 2 +- packages/at_backupkey_flutter/example/example.md | 2 +- packages/at_backupkey_flutter/pubspec.yaml | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/at_backupkey_flutter/CHANGELOG.md b/packages/at_backupkey_flutter/CHANGELOG.md index 39df36b4d..7e8cfdadf 100644 --- a/packages/at_backupkey_flutter/CHANGELOG.md +++ b/packages/at_backupkey_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.0.10: +- **CHORE**: Improved pub score + ## 4.0.9: - **FEAT**: Added option to download atKey in android. diff --git a/packages/at_backupkey_flutter/example/README.md b/packages/at_backupkey_flutter/example/README.md index bbbb73951..60423c279 100644 --- a/packages/at_backupkey_flutter/example/README.md +++ b/packages/at_backupkey_flutter/example/README.md @@ -4,7 +4,7 @@ The at_backupkey_flutter package is designed to make it easy to take backup of secret keys in any Flutter app on the atPlatform. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_backupkey_flutter/example) directory that demonstrates the key feature of this package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_backupkey_flutter/example) directory that demonstrates the key feature of this package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_backupkey_flutter/example/example.md b/packages/at_backupkey_flutter/example/example.md index bbbb73951..60423c279 100644 --- a/packages/at_backupkey_flutter/example/example.md +++ b/packages/at_backupkey_flutter/example/example.md @@ -4,7 +4,7 @@ The at_backupkey_flutter package is designed to make it easy to take backup of secret keys in any Flutter app on the atPlatform. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_backupkey_flutter/example) directory that demonstrates the key feature of this package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_backupkey_flutter/example) directory that demonstrates the key feature of this package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index 7a9e398e4..bc3ee97aa 100644 --- a/packages/at_backupkey_flutter/pubspec.yaml +++ b/packages/at_backupkey_flutter/pubspec.yaml @@ -1,10 +1,10 @@ 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.9 +version: 4.0.10 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_backupkey_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_backupkey_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_backupkey_flutter +documentation: https://docs.atsign.com/ environment: sdk: ">=2.12.0 <4.0.0" @@ -18,7 +18,7 @@ dependencies: path_provider: ^2.0.9 at_file_saver: ^0.1.2 at_utils: ^3.0.12 - at_client_mobile: ^3.2.9 + at_client_mobile: ^3.2.10 showcaseview: ^1.1.5 device_info_plus: ^8.0.0 # desktop - dependencies From 26720db477d0b827e7af6d74b88aa44e670c31f9 Mon Sep 17 00:00:00 2001 From: sonle Date: Fri, 7 Jul 2023 16:27:38 +0700 Subject: [PATCH 028/176] feat: improve pub score --- packages/at_notify_flutter/CHANGELOG.md | 3 +++ packages/at_notify_flutter/README.md | 2 +- packages/at_notify_flutter/example/EXAMPLE.md | 2 +- packages/at_notify_flutter/example/README.md | 2 +- .../example/ios/Podfile.lock | 26 ++++++++++++------- .../Flutter/GeneratedPluginRegistrant.swift | 8 ++++-- .../at_notify_flutter/example/pubspec.yaml | 4 +-- .../lib/services/notify_service.dart | 5 ++-- packages/at_notify_flutter/pubspec.yaml | 17 +++++------- 9 files changed, 39 insertions(+), 30 deletions(-) diff --git a/packages/at_notify_flutter/CHANGELOG.md b/packages/at_notify_flutter/CHANGELOG.md index 566d61345..f280bcdc8 100644 --- a/packages/at_notify_flutter/CHANGELOG.md +++ b/packages/at_notify_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.7 +- **CHORE**: Improved pub score + ## 1.0.6 - **CHORE**: Updated dependency diff --git a/packages/at_notify_flutter/README.md b/packages/at_notify_flutter/README.md index a1b234b2c..d3d896d5b 100644 --- a/packages/at_notify_flutter/README.md +++ b/packages/at_notify_flutter/README.md @@ -21,7 +21,7 @@ We call giving people control of access to their data “flipping the internet There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app -This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_notify_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. +This package includes a working sample application in the [Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_notify_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh $ flutter pub global activate at_app diff --git a/packages/at_notify_flutter/example/EXAMPLE.md b/packages/at_notify_flutter/example/EXAMPLE.md index dd39d7a4e..1be301d84 100644 --- a/packages/at_notify_flutter/example/EXAMPLE.md +++ b/packages/at_notify_flutter/example/EXAMPLE.md @@ -4,7 +4,7 @@ The at_notify_flutter package is designed to make it easy to add notifications in atProtocol apps. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_notify_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_notify_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_notify_flutter/example/README.md b/packages/at_notify_flutter/example/README.md index dd39d7a4e..1be301d84 100644 --- a/packages/at_notify_flutter/example/README.md +++ b/packages/at_notify_flutter/example/README.md @@ -4,7 +4,7 @@ The at_notify_flutter package is designed to make it easy to add notifications in atProtocol apps. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_notify_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_notify_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_notify_flutter/example/ios/Podfile.lock b/packages/at_notify_flutter/example/ios/Podfile.lock index 3c163230c..2dccda3f4 100644 --- a/packages/at_notify_flutter/example/ios/Podfile.lock +++ b/packages/at_notify_flutter/example/ios/Podfile.lock @@ -51,8 +51,9 @@ PODS: - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter + - FlutterMacOS - permission_handler_apple (9.0.4): - Flutter - qr_code_scanner (0.2.0): @@ -63,6 +64,9 @@ PODS: - SDWebImage/Core (5.15.5) - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - SwiftyGif (5.4.4) - url_launcher_ios (0.0.1): - Flutter @@ -80,10 +84,11 @@ DEPENDENCIES: - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -116,14 +121,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_local_notifications/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -137,21 +144,22 @@ SPEC CHECKSUMS: biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + file_picker: ce3938a0df3cc1ef404671531facef740d03f920 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 + path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de - webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f + url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 40b313c7e..43169ff72 100644 --- a/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_notify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,20 +7,24 @@ import Foundation import at_file_saver import biometric_storage +import device_info_plus import file_selector_macos import flutter_local_notifications -import package_info_plus_macos -import path_provider_macos +import package_info_plus +import path_provider_foundation import share_plus_macos +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")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) 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_notify_flutter/example/pubspec.yaml b/packages/at_notify_flutter/example/pubspec.yaml index 58ef22151..d4767caf0 100644 --- a/packages/at_notify_flutter/example/pubspec.yaml +++ b/packages/at_notify_flutter/example/pubspec.yaml @@ -37,11 +37,9 @@ dependencies: at_app_flutter: ^5.0.0+1 at_notify_flutter: path: ../ - at_onboarding_flutter: ^4.0.3 + at_onboarding_flutter: ^6.0.0 -dependency_overrides: - at_onboarding_flutter: ^5.0.0 dev_dependencies: flutter_test: diff --git a/packages/at_notify_flutter/lib/services/notify_service.dart b/packages/at_notify_flutter/lib/services/notify_service.dart index d3f337138..dac8bde71 100644 --- a/packages/at_notify_flutter/lib/services/notify_service.dart +++ b/packages/at_notify_flutter/lib/services/notify_service.dart @@ -76,7 +76,7 @@ class NotifyService { initializePlatformSpecifics() async { var initializationSettingsAndroid = const AndroidInitializationSettings('ic_launcher'); - var initializationSettingsIOS = IOSInitializationSettings( + var initializationSettingsIOS = DarwinInitializationSettings( requestAlertPermission: true, requestBadgePermission: true, requestSoundPermission: false, @@ -96,7 +96,6 @@ class NotifyService { await _notificationsPlugin.initialize( initializationSettings, - onSelectNotification: (payload) async {}, ); } @@ -226,7 +225,7 @@ class NotifyService { timeoutAfter: 50000, styleInformation: DefaultStyleInformation(true, true), ); - var iosChannelSpecifics = const IOSNotificationDetails(); + var iosChannelSpecifics = const DarwinNotificationDetails(); var platformChannelSpecifics = NotificationDetails( android: androidChannelSpecifics, iOS: iosChannelSpecifics); diff --git a/packages/at_notify_flutter/pubspec.yaml b/packages/at_notify_flutter/pubspec.yaml index 8280dc69c..894f80571 100644 --- a/packages/at_notify_flutter/pubspec.yaml +++ b/packages/at_notify_flutter/pubspec.yaml @@ -1,11 +1,11 @@ name: at_notify_flutter description: A Flutter plugin project to send notification to any atSign in atPlatform apps with ease. -version: 1.0.6 +version: 1.0.7 homepage: https://atsign.dev -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_notify_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_notify_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/ +documentation: https://docs.atsign.com/ environment: sdk: '>=2.12.0 <4.0.0' @@ -15,14 +15,11 @@ dependencies: flutter: sdk: flutter - at_client_mobile: ^3.2.9 - at_client: ^3.0.59 - at_commons: ^3.0.46 + 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: ^9.4.0 - -dependency_overrides: - package_info_plus: ^2.0.0 + flutter_local_notifications: ^14.1.1 dev_dependencies: flutter_lints: ^2.0.1 From 311a59686f65132ddae4de4694563dc11c76204f Mon Sep 17 00:00:00 2001 From: sonle Date: Fri, 7 Jul 2023 16:20:38 +0700 Subject: [PATCH 029/176] feat: improve pub score --- packages/at_events_flutter/CHANGELOG.md | 3 +++ packages/at_events_flutter/README.md | 2 +- packages/at_events_flutter/example/EXAMPLE.md | 2 +- packages/at_events_flutter/pubspec.yaml | 2 +- packages/at_events_flutter/test/at_events_flutter_test.dart | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/at_events_flutter/CHANGELOG.md b/packages/at_events_flutter/CHANGELOG.md index 5beb18c90..a0fd9d494 100644 --- a/packages/at_events_flutter/CHANGELOG.md +++ b/packages/at_events_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.1.10 +- **CHORE**: Improved pub score + ## 3.1.9 - **CHORE**: Updated dependencies and android gradle versions - **CHORE**: Package description updated diff --git a/packages/at_events_flutter/README.md b/packages/at_events_flutter/README.md index 762d3ef8a..a06745d3b 100644 --- a/packages/at_events_flutter/README.md +++ b/packages/at_events_flutter/README.md @@ -20,7 +20,7 @@ There are three options to get started using this package. ### 1. Quick start - generate a skeleton app with at_app This package includes a working sample application in the -[Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_events_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. +[Example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_events_flutter/example) directory that you can use to create a personalized copy using ```at_app create``` in four commands. ```sh $ flutter pub global activate at_app diff --git a/packages/at_events_flutter/example/EXAMPLE.md b/packages/at_events_flutter/example/EXAMPLE.md index 2c2bd90c5..fe187ba36 100644 --- a/packages/at_events_flutter/example/EXAMPLE.md +++ b/packages/at_events_flutter/example/EXAMPLE.md @@ -4,7 +4,7 @@ The [at_events_flutter] package is designed to make it easy to manage events between atsigns. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_events_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_events_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 80a007e21..de4aa37ae 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_events_flutter description: A Flutter plugin project to manage events (time, place and attendees) using the atPlatform. -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_events_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues diff --git a/packages/at_events_flutter/test/at_events_flutter_test.dart b/packages/at_events_flutter/test/at_events_flutter_test.dart index c899aeb59..42a867ad0 100644 --- a/packages/at_events_flutter/test/at_events_flutter_test.dart +++ b/packages/at_events_flutter/test/at_events_flutter_test.dart @@ -16,7 +16,8 @@ class MockAtClient extends Mock implements AtClient { @override Future delete(AtKey key, - {bool isDedicated = false, DeleteRequestOptions? deleteRequestOptions}) async { + {bool isDedicated = false, + DeleteRequestOptions? deleteRequestOptions}) async { return true; } From d1d53a14d9fde27c2b334c54225e456d562dd258 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Fri, 7 Jul 2023 11:16:05 -0400 Subject: [PATCH 030/176] chore: fixed support up-to-date dependencies --- packages/at_contacts_group_flutter/pubspec.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index 8ccde4290..6a576b3f6 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -18,8 +18,8 @@ dependencies: fluttertoast: ^8.0.9 file_picker: ^5.2.4 emoji_picker_flutter: ^1.2.1 - flutter_slidable: ^0.6.0 - flutter_image_compress: ^1.1.0 + flutter_slidable: '>=0.6.0 <4.0.0' + flutter_image_compress: ^2.0.3 image_compression: ^1.0.3 pedantic: ^1.11.0 flutter_toastr: ^1.0.3 @@ -27,8 +27,8 @@ dependencies: mocktail: ^0.3.0 # desktop - dependencies - file_selector: ^0.8.4+1 - file_selector_macos: ^0.8.2 + 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 From efdf4227167bd7d43c9a0b81eff83fdf8aefe43e Mon Sep 17 00:00:00 2001 From: SonLe Date: Mon, 10 Jul 2023 10:26:34 +0700 Subject: [PATCH 031/176] feat: add more comments --- .../lib/common_components/bottom_sheet.dart | 1 + .../lib/common_components/display_tile.dart | 1 + .../lib/common_components/invite_card.dart | 3 ++ .../lib/common_components/loading_widget.dart | 2 ++ .../common_components/triple_dot_loading.dart | 5 +++ .../lib/models/enums_model.dart | 3 ++ .../lib/models/event_member_location.dart | 2 ++ .../lib/models/event_notification.dart | 10 ++++++ .../lib/screens/create_event.dart | 1 + .../map_screen/events_collapsed_content.dart | 2 ++ .../screens/map_screen/events_map_screen.dart | 10 ++++++ .../lib/screens/map_screen/participants.dart | 1 + .../event_notification_dialog.dart | 4 +++ .../lib/screens/select_location.dart | 2 ++ .../services/event_key_stream_service.dart | 1 + .../lib/services/event_services.dart | 1 + .../lib/services/venues_services.dart | 1 + .../at_events_flutter/lib/utils/colors.dart | 1 + .../lib/utils/constants.dart | 6 ++++ .../lib/utils/init_events_service.dart | 34 +++++++++++++++++++ packages/at_events_flutter/pubspec.yaml | 13 +++---- 21 files changed, 98 insertions(+), 6 deletions(-) diff --git a/packages/at_events_flutter/lib/common_components/bottom_sheet.dart b/packages/at_events_flutter/lib/common_components/bottom_sheet.dart index 06916461b..5b8ab3600 100644 --- a/packages/at_events_flutter/lib/common_components/bottom_sheet.dart +++ b/packages/at_events_flutter/lib/common_components/bottom_sheet.dart @@ -1,6 +1,7 @@ import 'package:at_events_flutter/utils/colors.dart'; import 'package:flutter/material.dart'; +/// displays a bottom sheet with the provided widget 'T' and 'height' in the given 'context', and calls 'onSheetClosed' function when the sheet is closed void bottomSheet(BuildContext context, T, double height, {Function? onSheetCLosed}) { var future = showModalBottomSheet( diff --git a/packages/at_events_flutter/lib/common_components/display_tile.dart b/packages/at_events_flutter/lib/common_components/display_tile.dart index 274ea0be2..7cde8f08f 100644 --- a/packages/at_events_flutter/lib/common_components/display_tile.dart +++ b/packages/at_events_flutter/lib/common_components/display_tile.dart @@ -43,6 +43,7 @@ class _DisplayTileState extends State { getEventCreator(); } + /// retrieves the contact details of the event creator, including their image and name if available // ignore: always_declare_return_types getEventCreator() async { var contact = await getAtSignDetails(widget.atsignCreator!); diff --git a/packages/at_events_flutter/lib/common_components/invite_card.dart b/packages/at_events_flutter/lib/common_components/invite_card.dart index f7de75799..9fe71742d 100644 --- a/packages/at_events_flutter/lib/common_components/invite_card.dart +++ b/packages/at_events_flutter/lib/common_components/invite_card.dart @@ -14,6 +14,7 @@ import 'package:at_common_flutter/services/size_config.dart'; class InviteCard extends StatefulWidget { final String? event, invitedPeopleCount, timeAndDate, atSign, memberCount; final bool isStartTime; + const InviteCard( {Key? key, this.event, @@ -30,12 +31,14 @@ class InviteCard extends StatefulWidget { class _InviteCardState extends State { Uint8List? memoryImage; + @override void initState() { super.initState(); if (widget.atSign != null) getAtsignDetails(); } + /// retrieves the contact details of the provided atsign, specifically the image if available, and updates the state with the image data // ignore: always_declare_return_types getAtsignDetails() async { var contact = await getAtSignDetails(widget.atSign!); diff --git a/packages/at_events_flutter/lib/common_components/loading_widget.dart b/packages/at_events_flutter/lib/common_components/loading_widget.dart index 88fad2dfa..a20879485 100644 --- a/packages/at_events_flutter/lib/common_components/loading_widget.dart +++ b/packages/at_events_flutter/lib/common_components/loading_widget.dart @@ -14,6 +14,7 @@ class LoadingDialog { factory LoadingDialog() => _instance; bool _showing = false; + /// display a custom popup with an optional text parameter void show({String? text}) { if (!_showing) { _showing = true; @@ -53,6 +54,7 @@ class LoadingDialog { } } + /// hide the currently displayed popup void hide() { if (_showing) { AtEventNotificationListener().navKey!.currentState!.pop(); diff --git a/packages/at_events_flutter/lib/common_components/triple_dot_loading.dart b/packages/at_events_flutter/lib/common_components/triple_dot_loading.dart index 1854d073a..0a88d1ba0 100644 --- a/packages/at_events_flutter/lib/common_components/triple_dot_loading.dart +++ b/packages/at_events_flutter/lib/common_components/triple_dot_loading.dart @@ -86,6 +86,7 @@ class _TypingIndicatorState extends State super.dispose(); } + /// shows an indicator by animating its appearance and starting a repeating animation void _showIndicator() { _appearanceController! ..duration = const Duration(milliseconds: 750) @@ -93,6 +94,7 @@ class _TypingIndicatorState extends State _repeatingController.repeat(); } + /// hides the indicator by animating its disappearance and stopping the repeating animation void _hideIndicator() { _appearanceController! ..duration = const Duration(milliseconds: 150) @@ -119,6 +121,7 @@ class _TypingIndicatorState extends State ); } + /// builds an animated bubble widget with scaling animation based on the provided animation, position, and bubble content Widget _buildAnimatedBubble({ required Animation animation, required double left, @@ -138,6 +141,7 @@ class _TypingIndicatorState extends State ); } + /// builds a status bubble widget containing three flashing circles arranged horizontally Widget _buildStatusBubble() { return Container( width: 40, @@ -154,6 +158,7 @@ class _TypingIndicatorState extends State ); } + /// builds a flashing circle widget based on the provided index Widget _buildFlashingCircle(int index) { return AnimatedBuilder( animation: _repeatingController, diff --git a/packages/at_events_flutter/lib/models/enums_model.dart b/packages/at_events_flutter/lib/models/enums_model.dart index 9252514b2..b46928573 100644 --- a/packages/at_events_flutter/lib/models/enums_model.dart +++ b/packages/at_events_flutter/lib/models/enums_model.dart @@ -6,6 +6,7 @@ enum LOC_START_TIME_ENUM { TWO_HOURS, SIXTY_MIN, THIRTY_MIN } // ignore: camel_case_types enum LOC_END_TIME_ENUM { TEN_MIN, AFTER_EVERY_ONE_REACHED, AT_EOD } +/// converts a startTimeEnum value and startTime to a DateTime object representing the adjusted time of day, returning the adjusted DateTime value or null DateTime? startTimeEnumToTimeOfDay(String startTimeEnum, DateTime? startTime) { // ignore: unnecessary_null_comparison if (startTimeEnum == null || @@ -26,6 +27,8 @@ DateTime? startTimeEnumToTimeOfDay(String startTimeEnum, DateTime? startTime) { return null; } +/// converts an endTimeEnum value and endTime to a DateTime object representing the adjusted time of day +/// returns the adjusted DateTime value, or null if the conversion is not possible DateTime? endTimeEnumToTimeOfDay(String endTimeEnum, DateTime? endTime) { // ignore: unnecessary_null_comparison if (endTimeEnum == null || diff --git a/packages/at_events_flutter/lib/models/event_member_location.dart b/packages/at_events_flutter/lib/models/event_member_location.dart index c357dee5b..62ced6db5 100644 --- a/packages/at_events_flutter/lib/models/event_member_location.dart +++ b/packages/at_events_flutter/lib/models/event_member_location.dart @@ -1,4 +1,5 @@ import 'dart:convert'; + // ignore: import_of_legacy_library_into_null_safe import 'package:latlong2/latlong.dart'; @@ -35,6 +36,7 @@ class EventMemberLocation { : null, key = json['key'] ?? ''; + /// converts an EventMemberLocation object to a JSON string representation static String convertLocationNotificationToJson( EventMemberLocation eventMemberLocation) { var notification = json.encode({ diff --git a/packages/at_events_flutter/lib/models/event_notification.dart b/packages/at_events_flutter/lib/models/event_notification.dart index f18c5f07b..4fe18171b 100644 --- a/packages/at_events_flutter/lib/models/event_notification.dart +++ b/packages/at_events_flutter/lib/models/event_notification.dart @@ -73,6 +73,7 @@ class EventNotificationModel { } } + /// converts an EventNotificationModel object to a JSON string representation static String convertEventNotificationToJson( EventNotificationModel eventNotification) { var notification = json.encode({ @@ -219,6 +220,8 @@ enum Week { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY } enum EndsOn { NEVER, ON, AFTER } + +/// converts a weekday string to a Week enum value // ignore: missing_return Week getWeekEnum(String? weekday) { switch (weekday) { @@ -241,6 +244,7 @@ Week getWeekEnum(String? weekday) { } } +/// converts a Week enum value to a weekday string // ignore: missing_return String getWeekString(Week? weekday) { switch (weekday) { @@ -263,6 +267,7 @@ String getWeekString(Week? weekday) { } } +/// converts a DateTime object to a formatted time string String timeOfDayToString(DateTime time) { var minute = time.minute; if (minute < 10) return '${time.hour}: 0${time.minute}'; @@ -270,13 +275,17 @@ String timeOfDayToString(DateTime time) { return '${time.hour}: ${time.minute}'; } +/// converts a DateTime object to a formatted date string String dateToString(DateTime date) { var dateString = '${date.month}/${date.day}/${date.year}'; return dateString; } +/// list of repeat occurrence options List get repeatOccuranceOptions => ['Week', 'Month']; + +/// list of options for the day of the week List get occursOnWeekOptions => [ 'Monday', 'Tuesday', @@ -290,6 +299,7 @@ List get occursOnWeekOptions => [ // ignore: camel_case_types enum ATKEY_TYPE_ENUM { CREATEEVENT, ACKNOWLEDGEEVENT } +/// mapping of months with their respective properties Map get monthsList => { '1': {'month': 'jan', 'days': 31, 'count': 1}, '2': {'month': 'feb', 'days': 28, 'count': 2}, diff --git a/packages/at_events_flutter/lib/screens/create_event.dart b/packages/at_events_flutter/lib/screens/create_event.dart index faaa10169..5ae5b8956 100644 --- a/packages/at_events_flutter/lib/screens/create_event.dart +++ b/packages/at_events_flutter/lib/screens/create_event.dart @@ -409,6 +409,7 @@ class _CreateEventState extends State { ); } + /// handles the event creation process // ignore: always_declare_return_types onCreateEvent() async { setState(() { diff --git a/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart b/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart index 02755f30c..a3f1fe1a3 100644 --- a/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart +++ b/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart @@ -312,6 +312,7 @@ class _EventsCollapsedContentState extends State { ); } + /// cancels an event _cancelEvent() async { LoadingDialog().show(text: AllText().CANCELLING); try { @@ -340,6 +341,7 @@ class _EventsCollapsedContentState extends State { } } + /// exits an event _exitEvent() async { //if member has not exited then only following code will run. LoadingDialog().show(text: AllText().EXITING); diff --git a/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart b/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart index 4e06d1f49..2a4abebcc 100644 --- a/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart +++ b/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart @@ -25,6 +25,7 @@ class EventsMapScreenData { late List exitedAtSigns; int count = 0; + /// moves to the event screen with the given EventNotificationModel void moveToEventScreen(EventNotificationModel _eventNotificationModel) async { // markers = []; exitedAtSigns = []; @@ -51,6 +52,8 @@ class EventsMapScreenData { eventNotifier!.notifyListeners(); } + + /// calculates the AtSigns of members who have exited the event in the given EventNotificationModel void _calculateExitedAtsigns(EventNotificationModel _event) { _event.group!.members!.forEach((element) { if ((element.tags!['isExited']) && (!element.tags!['isAccepted'])) { @@ -59,6 +62,7 @@ class EventsMapScreenData { }); } + /// updates event data from a list of EventKeyLocationModel objects // ignore: prefer_final_fields List> _listOfLists = []; bool _updating = false; @@ -69,6 +73,7 @@ class EventsMapScreenData { } } + /// starts the updating process for event data void _startUpdating() async { _updating = true; for (var i = 0; i < _listOfLists.length; i++) { @@ -78,6 +83,7 @@ class EventsMapScreenData { _updating = false; } + /// updates event data from a list of EventKeyLocationModel objects Future _updateEventdataFromList( List _list) async { count++; @@ -108,6 +114,7 @@ class EventsMapScreenData { } } + /// adds a venue marker to the event HybridModel addVenueMarker(EventNotificationModel _event) { var _eventHybridModel = HybridModel( displayName: _event.venue!.label, @@ -118,15 +125,18 @@ class EventsMapScreenData { return _eventHybridModel; } + /// initializes the chat for the event // ignore: always_declare_return_types _initChat(EventNotificationModel _event) async { await _getAtSignAndInitializeChat(); _setAtsignToChatWith(_event); } + /// retrieves the current AtSign and initializes the chat // ignore: always_declare_return_types _getAtSignAndInitializeChat() async {} + /// sets the AtSign to chat with for the event // ignore: always_declare_return_types _setAtsignToChatWith(EventNotificationModel _event) { var groupMembers = []; diff --git a/packages/at_events_flutter/lib/screens/map_screen/participants.dart b/packages/at_events_flutter/lib/screens/map_screen/participants.dart index bd36a321e..80dbfaecf 100644 --- a/packages/at_events_flutter/lib/screens/map_screen/participants.dart +++ b/packages/at_events_flutter/lib/screens/map_screen/participants.dart @@ -52,6 +52,7 @@ class _ParticipantsState extends State { ); } + /// builds a container widget that displays a list of participants Widget builder() { return Container( height: 422.toHeight, diff --git a/packages/at_events_flutter/lib/screens/notification_dialog/event_notification_dialog.dart b/packages/at_events_flutter/lib/screens/notification_dialog/event_notification_dialog.dart index b8408ff6f..f07b2c4c1 100644 --- a/packages/at_events_flutter/lib/screens/notification_dialog/event_notification_dialog.dart +++ b/packages/at_events_flutter/lib/screens/notification_dialog/event_notification_dialog.dart @@ -63,6 +63,7 @@ class _EventNotificationDialogState extends State { } } + /// retrieves the event creator's details // ignore: always_declare_return_types getEventCreator() async { var contact = await getAtSignDetails(widget.eventData != null @@ -79,6 +80,7 @@ class _EventNotificationDialogState extends State { } } + /// checks for event overlap with other events void checkForEventOverlap() { var allEventsExcludingCurrentEvent = []; var allSavedEvents = EventKeyStreamService().allEventNotifications; @@ -372,6 +374,7 @@ class _EventNotificationDialogState extends State { ); } + /// starts the loading state void startLoading() { if (mounted) { setState(() { @@ -380,6 +383,7 @@ class _EventNotificationDialogState extends State { } } + /// stops the loading state void stopLoading() { if (mounted) { setState(() { diff --git a/packages/at_events_flutter/lib/screens/select_location.dart b/packages/at_events_flutter/lib/screens/select_location.dart index 561ddc3f7..a4812475f 100644 --- a/packages/at_events_flutter/lib/screens/select_location.dart +++ b/packages/at_events_flutter/lib/screens/select_location.dart @@ -285,6 +285,7 @@ class _SelectLocationState extends State { ); } + /// renders the past venues dropdown Widget renderPastVenues() { return VenuesServices().venues.isNotEmpty ? Container( @@ -335,6 +336,7 @@ class _SelectLocationState extends State { } } +/// handles the selection of a location void onLocationSelect(BuildContext context, LatLng point, {String? displayName, String? label}) { Navigator.push( 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 fa2472ac8..e46fb0ecb 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 @@ -33,6 +33,7 @@ class EventKeyStreamService { String? currentAtSign; List contactList = []; + /// streamController for AT notifications // ignore: close_sinks StreamController atNotificationsController = StreamController>.broadcast(); diff --git a/packages/at_events_flutter/lib/services/event_services.dart b/packages/at_events_flutter/lib/services/event_services.dart index 6c94498ad..4deb573b4 100644 --- a/packages/at_events_flutter/lib/services/event_services.dart +++ b/packages/at_events_flutter/lib/services/event_services.dart @@ -33,6 +33,7 @@ class EventService { List createdEvents = []; Function? onEventSaved; + /// streamController for AT event notifications // ignore: close_sinks final _atEventNotificationController = StreamController.broadcast(); diff --git a/packages/at_events_flutter/lib/services/venues_services.dart b/packages/at_events_flutter/lib/services/venues_services.dart index 94b6b8d7f..5c31a3d3f 100644 --- a/packages/at_events_flutter/lib/services/venues_services.dart +++ b/packages/at_events_flutter/lib/services/venues_services.dart @@ -157,6 +157,7 @@ class VenueLatLng { return data; } + /// compares two VenueLatLng objects for equality bool compare(VenueLatLng _venueLatLng) { if ((latitude == _venueLatLng.latitude) && (longitude == _venueLatLng.longitude) && diff --git a/packages/at_events_flutter/lib/utils/colors.dart b/packages/at_events_flutter/lib/utils/colors.dart index a949dd81b..043a183c9 100644 --- a/packages/at_events_flutter/lib/utils/colors.dart +++ b/packages/at_events_flutter/lib/utils/colors.dart @@ -46,6 +46,7 @@ class AllColors { } class ContactInitialsColors { + /// returns a color based on the given atsign static Color getColor(String atsign) { if (atsign.length == 1) { atsign = '$atsign '; diff --git a/packages/at_events_flutter/lib/utils/constants.dart b/packages/at_events_flutter/lib/utils/constants.dart index c9ee9da37..8c1b3aa85 100644 --- a/packages/at_events_flutter/lib/utils/constants.dart +++ b/packages/at_events_flutter/lib/utils/constants.dart @@ -18,10 +18,16 @@ class MixedConstants { ]; static String? _map_key; + + /// sets the map key used for map services static String setMapKey(String _key) => _map_key = _key; + static String? get MAP_KEY => _map_key; static String? _api_key; + + /// sets the API key used for API services static String setApiKey(String _key) => _api_key = _key; + static String? get API_KEY => _api_key; } 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 bacacf577..0f3c5a40d 100644 --- a/packages/at_events_flutter/lib/utils/init_events_service.dart +++ b/packages/at_events_flutter/lib/utils/init_events_service.dart @@ -58,6 +58,9 @@ Future initialiseEventService(GlobalKey navKeyFromMainApp, EventKeyStreamService().init(streamAlternative: streamAlternative); } +/// This method creates an event by storing event data in a remote database +/// It checks for the validity of the input data and throws exceptions if it's invalid +/// If the event creation is successful, it returns true; otherwise, it returns false Future createEvent(EventNotificationModel eventData) async { // ignore: unnecessary_null_comparison if (eventData == null) { @@ -92,6 +95,11 @@ Future createEvent(EventNotificationModel eventData) async { } } + +/// This method deletes an event from the remote database using the provided event key +/// It retrieves the event data associated with the key and checks if the current user is the creator of the event +/// If the current user is not the creator, it throws an exception +/// The method returns true if the event deletion is successful; otherwise, it returns false Future deleteEvent(String key) async { String? regexKey, currentAtsign; EventNotificationModel? eventData; @@ -118,6 +126,11 @@ Future deleteEvent(String key) async { } } +/// This method retrieves the details of an event from the remote database using the provided event key +/// It first obtains the regex key associated with the event key +/// If the regex key is not found, it throws an exception +/// The method then fetches the event data from the remote database and converts it into an EventNotificationModel object +/// If the retrieval is successful, it returns the event data; otherwise, it returns null Future getEventDetails(String key) async { EventNotificationModel eventData; String? regexKey; @@ -143,6 +156,13 @@ Future getEventDetails(String key) async { } } +/// This method retrieves a list of events from the remote database +/// It retrieves all keys that match the regex pattern 'createevent-' +/// If no matching keys are found, it returns an empty list +/// The method then fetches the event data associated with each key and converts it into an EventNotificationModel object +/// The event objects are added to the 'allEvents' list +/// Finally, the method returns the 'allEvents' list containing the retrieved events +/// If any error occurs during the process, it returns null Future?> getEvents() async { var allEvents = []; var regexList = await EventService().atClientManager.atClient.getKeys( @@ -171,6 +191,10 @@ Future?> getEvents() async { } } +/// This method retrieves a list of regex keys from the remote database +/// It retrieves all keys that match the regex pattern 'createevent-' +/// The method returns the list of regex keys +/// If no matching keys are found, an empty list is returned Future> getRegexKeys() async { var regexList = await EventService().atClientManager.atClient.getKeys( regex: 'createevent-', @@ -179,6 +203,11 @@ Future> getRegexKeys() async { return regexList; } + +/// This method retrieves the value associated with the given key from the remote database +/// It fetches the value using the provided key and converts it into an EventNotificationModel object +/// If the value is found and successfully converted, the method returns the event data +/// If any error occurs during the process, it returns null Future getValue(String key) async { try { EventNotificationModel? event; @@ -195,6 +224,11 @@ Future getValue(String key) async { } } +/// This method retrieves the regex key associated with the given key from the remote database +/// It first retrieves all regex keys using the 'getRegexKeys' method +/// It searches for an index where the regex key contains the given key +/// If an index is found, it assigns the corresponding regex key to 'regexKey' and returns it +/// If no index is found, it returns null Future getRegexKeyFromKey(String key) async { String regexKey; var allRegex = await getRegexKeys(); diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index de4aa37ae..6b10d8604 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -13,17 +13,17 @@ environment: dependencies: flutter: sdk: flutter - latlong2: ^0.8.2 + latlong2: ^0.8.1 fluttertoast: ^8.2.2 sliding_up_panel: ^2.0.0+1 geolocator: ^8.2.1 - at_commons: ^3.0.48 + at_commons: ^3.0.51 at_client_mobile: ^3.2.10 at_contact: ^3.0.7 - at_lookup: ^3.0.32 - at_utils: ^3.0.13 - at_client: ^3.0.61 + 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 @@ -32,7 +32,8 @@ dependencies: at_common_flutter: ^2.0.11 dependency_overrides: - package_info_plus: ^3.0.0 + geolocator: ^9.0.2 + latlong2: ^0.9.0 dev_dependencies: flutter_lints: ^2.0.1 From e9d4a05499be85c70942119e5a576eb8df504379 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Mon, 10 Jul 2023 10:58:13 -0400 Subject: [PATCH 032/176] fix: unclosed sink warning for _showLoaderStreamController --- .../lib/services/group_service.dart | 74 ++++++++----------- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/packages/at_contacts_group_flutter/lib/services/group_service.dart b/packages/at_contacts_group_flutter/lib/services/group_service.dart index d7ac0946a..fdb78bc81 100644 --- a/packages/at_contacts_group_flutter/lib/services/group_service.dart +++ b/packages/at_contacts_group_flutter/lib/services/group_service.dart @@ -1,18 +1,19 @@ +import 'dart:async'; + +// ignore: import_of_legacy_library_into_null_safe +import 'package:at_client_mobile/at_client_mobile.dart'; // ignore: import_of_legacy_library_into_null_safe // ignore_for_file: use_build_context_synchronously import 'package:at_contact/at_contact.dart'; import 'package:at_contacts_flutter/services/contact_service.dart'; +import 'package:at_contacts_flutter/utils/exposed_service.dart'; import 'package:at_contacts_group_flutter/models/group_contacts_model.dart'; import 'package:at_contacts_group_flutter/utils/text_constants.dart'; -import 'dart:async'; -import 'package:at_contacts_flutter/utils/exposed_service.dart'; import 'package:at_contacts_group_flutter/widgets/custom_toast.dart'; import 'package:at_contacts_group_flutter/widgets/yes_no_dialog.dart'; import 'package:at_utils/at_logger.dart'; import 'package:flutter/material.dart'; -// ignore: import_of_legacy_library_into_null_safe -import 'package:at_client_mobile/at_client_mobile.dart'; /// Service to handle CRUD operations on groups class GroupService { @@ -71,29 +72,23 @@ class GroupService { StreamSink get groupViewSink => _groupViewStreamController.sink; /// Controller for all contacts stream - final StreamController> - _allContactsStreamController = + final StreamController> _allContactsStreamController = StreamController>.broadcast(); /// all contacts stream - Stream> get allContactsStream => - _allContactsStreamController.stream; + Stream> get allContactsStream => _allContactsStreamController.stream; /// Sink for all contacts stream - StreamSink> get allContactsSink => - _allContactsStreamController.sink; + StreamSink> get allContactsSink => _allContactsStreamController.sink; /// Controller for selected group contact stream - final _selectedContactsStreamController = - StreamController>.broadcast(); + final _selectedContactsStreamController = StreamController>.broadcast(); /// Selected group contact stream - Stream> get selectedContactsStream => - _selectedContactsStreamController.stream; + Stream> get selectedContactsStream => _selectedContactsStreamController.stream; /// Sink for selected group contact stream - StreamSink> get selectedContactsSink => - _selectedContactsStreamController.sink; + StreamSink> get selectedContactsSink => _selectedContactsStreamController.sink; /// get list contact List listContact = []; @@ -132,11 +127,9 @@ class GroupService { } /// Will show a dialog box, if yes is pressed, will clear the selectedGroupContacts - void clearSelectedGroupContacts( - {required BuildContext context, Function? onYesTap}) { + void clearSelectedGroupContacts({required BuildContext context, Function? onYesTap}) { if (selectedGroupContacts.isNotEmpty) { - shownConfirmationDialog( - context, 'Selected contacts will not be added , confirm?', () { + shownConfirmationDialog(context, 'Selected contacts will not be added , confirm?', () { selectedGroupContacts = []; selectedContactsSink.add(selectedGroupContacts); // to update the UI @@ -183,12 +176,11 @@ class GroupService { } for (AtGroup group in groupList) { - var index = allContacts.indexWhere((element) => - element!.group != null && element.group!.groupId == group.groupId); + var index = + allContacts.indexWhere((element) => element!.group != null && element.group!.groupId == group.groupId); if (index == -1) { - allContacts.add(GroupContactsModel( - group: group, contactType: ContactsType.GROUP)); + allContacts.add(GroupContactsModel(group: group, contactType: ContactsType.GROUP)); } } @@ -196,8 +188,7 @@ class GroupService { this.expandIndex = expandIndex; } else { if (expandGroup != null) { - this.expandIndex = groupList - .indexWhere((element) => element.groupId == expandGroup.groupId); + this.expandIndex = groupList.indexWhere((element) => element.groupId == expandGroup.groupId); } else { this.expandIndex = 0; } @@ -233,8 +224,7 @@ class GroupService { } /// Function to delete members of a group - Future deletGroupMembers( - List contacts, AtGroup group) async { + Future deletGroupMembers(List contacts, AtGroup group) async { try { var result = await atContactImpl.deleteMembers(Set.from(contacts), group); await updateGroupStreams(group, expandGroup: true); @@ -246,8 +236,7 @@ class GroupService { } /// Function to add members to a group - Future addGroupMembers( - List contacts, AtGroup group) async { + Future addGroupMembers(List contacts, AtGroup group) async { for (var i = 0; i < contacts.length; i++) { if (contacts[i]!.tags != null && contacts[i]!.tags!['image'] != null) { contacts[i]!.tags!['image'] = null; @@ -282,12 +271,10 @@ class GroupService { } // ignore: always_declare_return_types - updateGroupStreams(AtGroup group, - {int? expandIndex, bool expandGroup = false}) async { + updateGroupStreams(AtGroup group, {int? expandIndex, bool expandGroup = false}) async { var groupDetail = await (getGroupDetail(group.groupId!)); if (groupDetail is AtGroup) groupViewSink.add(groupDetail); - await getAllGroupsDetails( - expandIndex: expandIndex, expandGroup: expandGroup ? group : null); + await getAllGroupsDetails(expandIndex: expandIndex, expandGroup: expandGroup ? group : null); } /// Function to delete a group @@ -341,15 +328,13 @@ class GroupService { for (AtContact? contact in contactList) { var index = -1; if (contact != null) { - index = allContacts.indexWhere((element) => - element!.contact != null && - element.contact!.atSign == contact.atSign); + index = allContacts + .indexWhere((element) => element!.contact != null && element.contact!.atSign == contact.atSign); } if (index == -1) { listContact.add(contact!); - allContacts.add(GroupContactsModel( - contact: contact, contactType: ContactsType.CONTACT)); + allContacts.add(GroupContactsModel(contact: contact, contactType: ContactsType.CONTACT)); } } await getAllGroupsDetails(addToGroupSink: !isDesktop); @@ -368,13 +353,12 @@ class GroupService { }); if (_indexOfContact != -1) { - var _indexOfContactInGroup = allContacts.indexWhere((element) => - element!.contact != null && element.contact!.atSign == atSign); + var _indexOfContactInGroup = + allContacts.indexWhere((element) => element!.contact != null && element.contact!.atSign == atSign); if (_indexOfContactInGroup == -1) { allContacts.add(GroupContactsModel( - contact: ContactService().contactList[_indexOfContact], - contactType: ContactsType.CONTACT)); + contact: ContactService().contactList[_indexOfContact], contactType: ContactsType.CONTACT)); } } _allContactsStreamController.add(allContacts); @@ -485,8 +469,7 @@ class GroupService { AtGroup removeImageFromAtGroupMembers(AtGroup atGroup) { for (var i = 0; i < atGroup.members!.length; i++) { - if (atGroup.members!.elementAt(i).tags != null && - atGroup.members!.elementAt(i).tags!['image'] != null) { + if (atGroup.members!.elementAt(i).tags != null && atGroup.members!.elementAt(i).tags!['image'] != null) { atGroup.members!.elementAt(i).tags!['image'] = null; } } @@ -510,5 +493,6 @@ class GroupService { _groupViewStreamController.close(); _allContactsStreamController.close(); _selectedContactsStreamController.close(); + _showLoaderStreamController.close(); } } From 80cfeb654da15a9719a9e323541c183240f7f002 Mon Sep 17 00:00:00 2001 From: sonle Date: Thu, 13 Jul 2023 14:05:18 +0700 Subject: [PATCH 033/176] feat: improve pub score --- packages/at_location_flutter/CHANGELOG.md | 3 ++ .../at_location_flutter/example/EXAMPLE.md | 2 +- .../at_location_flutter/example/lib/main.dart | 8 +-- .../example/lib/second_screen.dart | 4 +- .../Flutter/GeneratedPluginRegistrant.swift | 6 ++- .../at_location_flutter/example/pubspec.yaml | 5 +- .../lib/at_location_flutter_plugin.dart | 6 ++- .../lib/common_components/bottom_sheet.dart | 1 + .../lib/common_components/build_marker.dart | 1 + .../common_components/collapsed_content.dart | 7 +++ .../confirmation_dialog.dart | 1 + .../lib/common_components/display_tile.dart | 3 ++ .../lib/common_components/loading_widget.dart | 2 + .../location_prompt_dialog.dart | 3 ++ .../lib/common_components/marker_cluster.dart | 1 + .../lib/common_components/pointed_bottom.dart | 1 + .../lib/common_components/popup.dart | 1 + .../map_content/flutter_map/flutter_map.dart | 2 +- .../flutter_map/src/geo/latlng_bounds.dart | 19 +++++-- .../flutter_map/src/layer/tile_layer.dart | 5 +- .../request_location_sheet.dart | 10 ++-- .../share_location/share_location_sheet.dart | 10 ++-- .../lib/service/api_service.dart | 5 ++ .../at_location_notification_listener.dart | 5 +- .../lib/service/contact_service.dart | 3 ++ .../lib/service/home_screen_service.dart | 11 +++++ .../lib/service/key_stream_service.dart | 10 +++- .../lib/service/location_service.dart | 8 +++ .../lib/service/master_location_service.dart | 11 +++++ .../lib/service/notify_and_put.dart | 33 +++++++------ .../lib/service/search_location_service.dart | 2 +- .../service/send_location_notification.dart | 7 +++ .../lib/service/sharing_location_service.dart | 3 ++ .../lib/show_location.dart | 4 +- packages/at_location_flutter/pubspec.yaml | 49 +++++++++---------- .../test/at_location_flutter_test.dart | 5 -- 36 files changed, 183 insertions(+), 74 deletions(-) diff --git a/packages/at_location_flutter/CHANGELOG.md b/packages/at_location_flutter/CHANGELOG.md index 940c10f4c..7ff1d0857 100644 --- a/packages/at_location_flutter/CHANGELOG.md +++ b/packages/at_location_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +# 3.1.9 +- **CHORE**: Improved pub score of package + ## 3.1.8 - **CHORE**: Updated dependencies and android gradle versions - **CHORE**: Package description updated diff --git a/packages/at_location_flutter/example/EXAMPLE.md b/packages/at_location_flutter/example/EXAMPLE.md index 30e597a93..2ab2c1236 100644 --- a/packages/at_location_flutter/example/EXAMPLE.md +++ b/packages/at_location_flutter/example/EXAMPLE.md @@ -4,7 +4,7 @@ The [at_location_flutter] package is designed to make it easy to share/receive locations between two atsigns and also see it on a map. ### Give it a try -This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/at_location_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. +This package includes a working sample application in the [example](https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_location_flutter/example) directory that demonstrates the key features of the package. To create a personalized copy, use ```at_app create``` as shown below or check it out on GitHub. ```sh $ flutter pub global activate at_app diff --git a/packages/at_location_flutter/example/lib/main.dart b/packages/at_location_flutter/example/lib/main.dart index becfc1cf5..dd0597877 100644 --- a/packages/at_location_flutter/example/lib/main.dart +++ b/packages/at_location_flutter/example/lib/main.dart @@ -2,7 +2,7 @@ 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' - show AtOnboarding, AtOnboardingConfig, AtOnboardingResultStatus, Onboarding; + show AtOnboarding, AtOnboardingConfig, AtOnboardingResultStatus; import 'package:path_provider/path_provider.dart' show getApplicationSupportDirectory; import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv; @@ -25,6 +25,7 @@ Future loadAtClientPreference() async { // TODO set the rest of your AtClientPreference here ; } + final StreamController updateThemeMode = StreamController.broadcast(); @@ -40,7 +41,6 @@ class _MyAppState extends State { Future futurePreference = loadAtClientPreference(); AtClientPreference? atClientPreference; - @override Widget build(BuildContext context) { return StreamBuilder( @@ -57,7 +57,7 @@ class _MyAppState extends State { colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), ), - backgroundColor: Colors.white, + bottomAppBarTheme: const BottomAppBarTheme(color: Colors.white), scaffoldBackgroundColor: Colors.white, ), darkTheme: ThemeData().copyWith( @@ -66,7 +66,7 @@ class _MyAppState extends State { colorScheme: ThemeData.dark().colorScheme.copyWith( primary: Colors.blue, ), - backgroundColor: Colors.grey[850], + bottomAppBarTheme: BottomAppBarTheme(color: Colors.grey[850]), scaffoldBackgroundColor: Colors.grey[850], ), themeMode: themeMode, diff --git a/packages/at_location_flutter/example/lib/second_screen.dart b/packages/at_location_flutter/example/lib/second_screen.dart index 53211c425..367eac5db 100644 --- a/packages/at_location_flutter/example/lib/second_screen.dart +++ b/packages/at_location_flutter/example/lib/second_screen.dart @@ -147,8 +147,8 @@ class _SecondScreenState extends State { await Navigator.of(context).push(MaterialPageRoute( builder: (BuildContext context) => showLocation(UniqueKey(), mapController, locationList: [ - LatLng(30, 45), - LatLng(40, 45), + const LatLng(30, 45), + const LatLng(40, 45), ]), )); }, diff --git a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index d6ee1de02..ee6d777d7 100644 --- a/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_location_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,22 +7,26 @@ import Foundation import at_file_saver import biometric_storage +import device_info_plus import file_selector_macos import geolocator_apple -import package_info_plus_macos +import package_info_plus import path_provider_foundation import share_plus_macos +import shared_preferences_foundation import sqflite 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")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) 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")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/at_location_flutter/example/pubspec.yaml b/packages/at_location_flutter/example/pubspec.yaml index 3b4f63d1a..7085931cb 100644 --- a/packages/at_location_flutter/example/pubspec.yaml +++ b/packages/at_location_flutter/example/pubspec.yaml @@ -41,9 +41,8 @@ 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.8.0 - at_onboarding_flutter: ^5.0.4 - + latlong2: ^0.9.0 + at_onboarding_flutter: ^6.1.0 dev_dependencies: flutter_test: diff --git a/packages/at_location_flutter/lib/at_location_flutter_plugin.dart b/packages/at_location_flutter/lib/at_location_flutter_plugin.dart index b28338bab..c593d6883 100644 --- a/packages/at_location_flutter/lib/at_location_flutter_plugin.dart +++ b/packages/at_location_flutter/lib/at_location_flutter_plugin.dart @@ -59,6 +59,7 @@ class AtLocationFlutterPlugin extends StatefulWidget { this.notificationID, this.refreshAt, }) : super(key: key); + @override _AtLocationFlutterPluginState createState() => _AtLocationFlutterPluginState(); @@ -116,6 +117,7 @@ class _AtLocationFlutterPluginState extends State { super.dispose(); } + /// Calculates the list of currently sharing @signs based on the provided user data calculateAtsignsCurrentlySharing(List users) { List _newAtsignsSharing = [], _atsignsStoppedSharing = []; for (var _user in users) { @@ -239,7 +241,7 @@ class _AtLocationFlutterPluginState extends State { // ignore: unnecessary_null_comparison center: ((users != null) && (users.isNotEmpty)) ? users[0]!.latLng - : LatLng(45, 45), + : const LatLng(45, 45), zoom: markers.isNotEmpty ? 8 : 2, plugins: [MarkerClusterPlugin(UniqueKey())], onTap: (_) => _popupController @@ -302,6 +304,7 @@ class _AtLocationFlutterPluginState extends State { )); } + /// Zooms out the map and hides the popup void zoomOutFn() { _popupController.hidePopup(); if (LocationService().hybridUsersList.isNotEmpty) { @@ -309,6 +312,7 @@ class _AtLocationFlutterPluginState extends State { } } + /// Converts a list of strings to a single string String? _listToString(List _strings) { String? _res; if (_strings.isNotEmpty) { diff --git a/packages/at_location_flutter/lib/common_components/bottom_sheet.dart b/packages/at_location_flutter/lib/common_components/bottom_sheet.dart index da2f4d2ce..7af9e816d 100644 --- a/packages/at_location_flutter/lib/common_components/bottom_sheet.dart +++ b/packages/at_location_flutter/lib/common_components/bottom_sheet.dart @@ -1,6 +1,7 @@ import 'package:at_location_flutter/utils/constants/colors.dart'; import 'package:flutter/material.dart'; +/// Display a customizable bottom sheet on the screen void bottomSheet(BuildContext context, T, double height, {Function? onSheetCLosed}) { var future = showModalBottomSheet( diff --git a/packages/at_location_flutter/lib/common_components/build_marker.dart b/packages/at_location_flutter/lib/common_components/build_marker.dart index 6a5f169c8..192abc557 100644 --- a/packages/at_location_flutter/lib/common_components/build_marker.dart +++ b/packages/at_location_flutter/lib/common_components/build_marker.dart @@ -8,6 +8,7 @@ import 'contacts_initial.dart'; import 'custom_circle_avatar.dart'; import 'marker_custom_painter.dart'; +/// Builds a marker for the given [user] Marker buildMarker(HybridModel user, {bool singleMarker = false, Widget? marker}) { return Marker( diff --git a/packages/at_location_flutter/lib/common_components/collapsed_content.dart b/packages/at_location_flutter/lib/common_components/collapsed_content.dart index 64da200f2..5c232d842 100644 --- a/packages/at_location_flutter/lib/common_components/collapsed_content.dart +++ b/packages/at_location_flutter/lib/common_components/collapsed_content.dart @@ -26,9 +26,11 @@ class CollapsedContent extends StatefulWidget { LocationNotificationModel? userListenerKeyword; AtClient? atClientInstance; String? currentAtSign; + CollapsedContent(this.expanded, this.atClientInstance, {Key? key, this.userListenerKeyword, required this.currentAtSign}) : super(key: key); + @override _CollapsedContentState createState() => _CollapsedContentState(); } @@ -38,11 +40,13 @@ class _CollapsedContentState extends State { late bool isSharing; bool locationAvailable = false; + @override void initState() { super.initState(); isSharing = widget.userListenerKeyword!.isSharing; + /// Listens to the stream of hybrid user locations provided by the `LocationService` LocationService().atHybridUsersStream.listen((e) { setState(() { locationAvailable = false; @@ -314,6 +318,7 @@ class _CollapsedContentState extends State { ])); } + /// Removes a person from the system // ignore: always_declare_return_types removePerson() async { await confirmationDialog( @@ -321,6 +326,7 @@ class _CollapsedContentState extends State { onYesPressed: _onRemovePersonYesPressed); } + /// Callback function called when the user selects "Yes" in the remove person confirmation dialog _onRemovePersonYesPressed() async { LoadingDialog().show(); try { @@ -353,6 +359,7 @@ class _CollapsedContentState extends State { } } + /// Returns a widget that displays participants Widget participants(Function() onTap) { return Padding( padding: const EdgeInsets.only(left: 56), diff --git a/packages/at_location_flutter/lib/common_components/confirmation_dialog.dart b/packages/at_location_flutter/lib/common_components/confirmation_dialog.dart index bc8d13d6e..344d1ba5e 100644 --- a/packages/at_location_flutter/lib/common_components/confirmation_dialog.dart +++ b/packages/at_location_flutter/lib/common_components/confirmation_dialog.dart @@ -5,6 +5,7 @@ import 'package:at_location_flutter/utils/constants/text_strings.dart'; import 'package:at_location_flutter/utils/constants/text_styles.dart'; import 'package:flutter/material.dart'; +/// Displays a confirmation dialog with the given [title] Future confirmationDialog(String title, {required Function() onYesPressed, Function()? onNoPressed}) async { return showDialog( diff --git a/packages/at_location_flutter/lib/common_components/display_tile.dart b/packages/at_location_flutter/lib/common_components/display_tile.dart index 81b560e2a..5a5d02074 100644 --- a/packages/at_location_flutter/lib/common_components/display_tile.dart +++ b/packages/at_location_flutter/lib/common_components/display_tile.dart @@ -14,6 +14,7 @@ class DisplayTile extends StatefulWidget { final Widget? action; final bool showName, showRetry; final Function? onRetryTapped; + const DisplayTile( {Key? key, required this.title, @@ -37,12 +38,14 @@ class _DisplayTileState extends State { AtContact? contact; AtContactsImpl? atContact; String? name; + @override void initState() { super.initState(); getEventCreator(); } + /// Retrieves the details of the event creator // ignore: always_declare_return_types getEventCreator() async { var contact = await getAtSignDetails(widget.atsignCreator); diff --git a/packages/at_location_flutter/lib/common_components/loading_widget.dart b/packages/at_location_flutter/lib/common_components/loading_widget.dart index 6c14448bf..18fcd35d7 100644 --- a/packages/at_location_flutter/lib/common_components/loading_widget.dart +++ b/packages/at_location_flutter/lib/common_components/loading_widget.dart @@ -11,6 +11,7 @@ class LoadingDialog { factory LoadingDialog() => _instance; bool _showing = false; + /// Shows a custom popup with a CircularProgressIndicator void show() { if (!_showing) { _showing = true; @@ -28,6 +29,7 @@ class LoadingDialog { } } + /// Hides the custom popup void hide() { if (_showing) { AtLocationNotificationListener().navKey.currentState!.pop(); diff --git a/packages/at_location_flutter/lib/common_components/location_prompt_dialog.dart b/packages/at_location_flutter/lib/common_components/location_prompt_dialog.dart index 195712d41..b21edb2a5 100644 --- a/packages/at_location_flutter/lib/common_components/location_prompt_dialog.dart +++ b/packages/at_location_flutter/lib/common_components/location_prompt_dialog.dart @@ -9,6 +9,7 @@ import 'package:flutter/material.dart'; import 'custom_toast.dart'; +/// Displays a location prompt dialog Future locationPromptDialog( {String? text, String? yesText, @@ -155,6 +156,7 @@ class _LocationPromptState extends State { ); } + /// Updates the sharing location status and sends an acknowledgement Future updateShareLocation() async { var update = await SharingLocationService() .updateWithShareLocationAcknowledge(widget.locationNotificationModel!, @@ -174,6 +176,7 @@ class _LocationPromptState extends State { } } + /// Updates the request location status and sends an acknowledgement Future updateRequestLocation() async { var update = await RequestLocationService() .updateWithRequestLocationAcknowledge(widget.locationNotificationModel!, diff --git a/packages/at_location_flutter/lib/common_components/marker_cluster.dart b/packages/at_location_flutter/lib/common_components/marker_cluster.dart index 4fbb2b478..a210f2cba 100644 --- a/packages/at_location_flutter/lib/common_components/marker_cluster.dart +++ b/packages/at_location_flutter/lib/common_components/marker_cluster.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'circle_marker_painter.dart'; +/// Builds a marker cluster widget Widget buildMarkerCluster(List markers, {HybridModel? eventData}) { return Stack( alignment: Alignment.center, diff --git a/packages/at_location_flutter/lib/common_components/pointed_bottom.dart b/packages/at_location_flutter/lib/common_components/pointed_bottom.dart index e0d1da481..6bfe60b68 100644 --- a/packages/at_location_flutter/lib/common_components/pointed_bottom.dart +++ b/packages/at_location_flutter/lib/common_components/pointed_bottom.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; +/// Builds a pointed bottom widget Widget pointedBottom({Color? color}) { return ClipPath( clipper: const ShapeBorderClipper( diff --git a/packages/at_location_flutter/lib/common_components/popup.dart b/packages/at_location_flutter/lib/common_components/popup.dart index a31cbd45b..f897cfeac 100644 --- a/packages/at_location_flutter/lib/common_components/popup.dart +++ b/packages/at_location_flutter/lib/common_components/popup.dart @@ -8,6 +8,7 @@ import 'package:latlong2/latlong.dart'; import 'contacts_initial.dart'; import 'custom_circle_avatar.dart'; +/// Builds a popup widget for a user Widget buildPopup(HybridModel user, {LatLng? center}) { var showEtaSection = true; if (LocationService().etaFrom != null) { diff --git a/packages/at_location_flutter/lib/map_content/flutter_map/flutter_map.dart b/packages/at_location_flutter/lib/map_content/flutter_map/flutter_map.dart index 43bbea38d..e3884e629 100644 --- a/packages/at_location_flutter/lib/map_content/flutter_map/flutter_map.dart +++ b/packages/at_location_flutter/lib/map_content/flutter_map/flutter_map.dart @@ -176,7 +176,7 @@ class MapOptions { this.swPanBoundary, this.nePanBoundary, }) { - center ??= LatLng(50.5, 30.51); + center ??= const LatLng(50.5, 30.51); _safeAreaZoom = zoom; assert(slideOnBoundaries || !isOutOfBounds(center)); //You cannot start outside pan boundary diff --git a/packages/at_location_flutter/lib/map_content/flutter_map/src/geo/latlng_bounds.dart b/packages/at_location_flutter/lib/map_content/flutter_map/src/geo/latlng_bounds.dart index 107d95717..a30f42913 100644 --- a/packages/at_location_flutter/lib/map_content/flutter_map/src/geo/latlng_bounds.dart +++ b/packages/at_location_flutter/lib/map_content/flutter_map/src/geo/latlng_bounds.dart @@ -1,4 +1,5 @@ import 'dart:math' as math; + // ignore: import_of_legacy_library_into_null_safe import 'package:latlong2/latlong.dart'; @@ -60,21 +61,31 @@ class LatLngBounds { _sw = LatLng(sw2!.latitude, sw2.longitude); _ne = LatLng(ne2!.latitude, ne2.longitude); } else { - _sw!.latitude = math.min(sw2!.latitude, _sw!.latitude); - _sw!.longitude = math.min(sw2.longitude, _sw!.longitude); - _ne!.latitude = math.max(ne2!.latitude, _ne!.latitude); - _ne!.longitude = math.max(ne2.longitude, _ne!.longitude); + _sw = LatLng( + math.min(sw2!.latitude, _sw!.latitude), + math.min(sw2.longitude, _sw!.longitude), + ); + _ne = LatLng( + math.max(ne2!.latitude, _ne!.latitude), + math.max(ne2.longitude, _ne!.longitude), + ); } } double get west => southWest!.longitude; + double get south => southWest!.latitude; + double get east => northEast!.longitude; + double get north => northEast!.latitude; LatLng? get southWest => _sw; + LatLng? get northEast => _ne; + LatLng get northWest => LatLng(north, west); + LatLng get southEast => LatLng(south, east); bool get isValid { diff --git a/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart b/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart index 030a0301f..db34bfcdd 100644 --- a/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart +++ b/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart @@ -12,6 +12,7 @@ import 'package:at_location_flutter/map_content/flutter_map/src/core/util.dart' import 'package:at_location_flutter/map_content/flutter_map/src/geo/crs/crs.dart'; import 'package:at_location_flutter/map_content/flutter_map/src/layer/tile_provider/tile_provider.dart'; import 'package:at_location_flutter/map_content/flutter_map/src/map/map.dart'; + // ignore: import_of_legacy_library_into_null_safe import 'package:latlong2/latlong.dart'; import 'package:tuple/tuple.dart'; @@ -392,6 +393,7 @@ class _TileLayerState extends State with TickerProviderStateMixin { Tuple2? _wrapX; Tuple2? _wrapY; double? _tileZoom; + //ignore: unused_field Level? _level; StreamSubscription? _moveSub; @@ -1084,6 +1086,7 @@ class Tile implements Comparable { DateTime? loaded; AnimationController? animationController; + double get opacity => animationController == null ? (active ? 1.0 : 0.0) : animationController!.value; @@ -1284,5 +1287,5 @@ class Coords extends CustomPoint { } @override - int get hashCode => hashValues(x.hashCode, y.hashCode, z.hashCode); + int get hashCode => Object.hash(x.hashCode, y.hashCode, z.hashCode); } diff --git a/packages/at_location_flutter/lib/screens/request_location/request_location_sheet.dart b/packages/at_location_flutter/lib/screens/request_location/request_location_sheet.dart index f7c1dd172..3f97e1365 100644 --- a/packages/at_location_flutter/lib/screens/request_location/request_location_sheet.dart +++ b/packages/at_location_flutter/lib/screens/request_location/request_location_sheet.dart @@ -12,7 +12,9 @@ import 'package:flutter/material.dart'; class RequestLocationSheet extends StatefulWidget { final Function? onTap; + const RequestLocationSheet({Key? key, this.onTap}) : super(key: key); + @override _RequestLocationSheetState createState() => _RequestLocationSheetState(); } @@ -128,8 +130,10 @@ class _RequestLocationSheetState extends State { } else if (!atSign.contains('@')) { atSign = '@$atSign'; } - var checkPresence = await AtLookupImpl.findSecondary( - atSign, AtLocationNotificationListener().ROOT_DOMAIN, 64); - return checkPresence != null; + var checkPresence = (await CacheableSecondaryAddressFinder( + AtLocationNotificationListener().ROOT_DOMAIN ?? '', 64) + .findSecondary(atSign)) + .toString(); + return checkPresence.isNotEmpty; } } diff --git a/packages/at_location_flutter/lib/screens/share_location/share_location_sheet.dart b/packages/at_location_flutter/lib/screens/share_location/share_location_sheet.dart index 83c37fdb2..987e96dd9 100644 --- a/packages/at_location_flutter/lib/screens/share_location/share_location_sheet.dart +++ b/packages/at_location_flutter/lib/screens/share_location/share_location_sheet.dart @@ -12,7 +12,9 @@ import 'package:flutter/material.dart'; class ShareLocationSheet extends StatefulWidget { final Function? onTap; + const ShareLocationSheet({Key? key, this.onTap}) : super(key: key); + @override _ShareLocationSheetState createState() => _ShareLocationSheetState(); } @@ -175,8 +177,10 @@ class _ShareLocationSheetState extends State { } else if (!atSign.contains('@')) { atSign = '@$atSign'; } - var checkPresence = await AtLookupImpl.findSecondary( - atSign, AtLocationNotificationListener().ROOT_DOMAIN, 64); - return checkPresence != null; + var checkPresence = (await CacheableSecondaryAddressFinder( + AtLocationNotificationListener().ROOT_DOMAIN ?? '', 64) + .findSecondary(atSign)) + .toString(); + return checkPresence.isNotEmpty; } } diff --git a/packages/at_location_flutter/lib/service/api_service.dart b/packages/at_location_flutter/lib/service/api_service.dart index fdb7584c9..ae96d072b 100644 --- a/packages/at_location_flutter/lib/service/api_service.dart +++ b/packages/at_location_flutter/lib/service/api_service.dart @@ -4,6 +4,7 @@ import 'dart:io'; import 'package:http/http.dart' as http; class ApiService { + /// Sends a GET request to the specified URL and returns the response Future getRequest(String url, [Map? header]) async { var val = await ConnectivityService().checkConnectivity(); if (val) { @@ -41,6 +42,7 @@ class ApiService { } } + /// Sends a POST request to the specified URL and returns the response Future postRequest(String url, {Map? headers, body, encoding}) async { var val = await ConnectivityService().checkConnectivity(); @@ -91,9 +93,12 @@ class ApiService { class ConnectivityService { ConnectivityService._(); + static final ConnectivityService _instance = ConnectivityService._(); + factory ConnectivityService() => _instance; + /// Checks the internet connectivity by attempting to establish a connection to a specified host Future checkConnectivity() async { Socket? socket; bool connectivity; diff --git a/packages/at_location_flutter/lib/service/at_location_notification_listener.dart b/packages/at_location_flutter/lib/service/at_location_notification_listener.dart index 0283d54d4..2678b32a1 100644 --- a/packages/at_location_flutter/lib/service/at_location_notification_listener.dart +++ b/packages/at_location_flutter/lib/service/at_location_notification_listener.dart @@ -60,6 +60,7 @@ class AtLocationNotificationListener { Future startMonitor() async { if (!monitorStarted) { AtClientManager.getInstance() + .atClient .notificationService .subscribe(shouldDecrypt: true) .listen((monitorNotification) { @@ -135,7 +136,6 @@ class AtLocationNotificationListener { } var decryptedMessage = value; - if (decryptedMessage == null || decryptedMessage == '') { return; @@ -227,6 +227,7 @@ class AtLocationNotificationListener { } } + /// Shows a custom notification dialog Future showMyDialog( String? fromAtSign, LocationNotificationModel locationData) async { if (showDialogBox) { @@ -244,6 +245,7 @@ class AtLocationNotificationListener { } } + /// Shows a toast message showToast(String msg, BuildContext _context, {bool isError = false, bool isSuccess = true}) { try { @@ -258,6 +260,7 @@ class AtLocationNotificationListener { } } + /// Returns the key type based on a given key regex String getKeyType(String keyRegex) { if (keyRegex.contains(MixedConstants.SHARE_LOCATION)) { return 'Share location'; diff --git a/packages/at_location_flutter/lib/service/contact_service.dart b/packages/at_location_flutter/lib/service/contact_service.dart index 73019f755..19e6bcf1a 100644 --- a/packages/at_location_flutter/lib/service/contact_service.dart +++ b/packages/at_location_flutter/lib/service/contact_service.dart @@ -5,6 +5,7 @@ import 'package:at_contact/at_contact.dart'; import 'key_stream_service.dart'; +/// Retrieves the details of an @sign Future getAtSignDetails(String? atSign) async { var atContact = getCachedContactDetail(atSign); if (atContact == null) { @@ -17,6 +18,7 @@ Future getAtSignDetails(String? atSign) async { return atContact; } +/// Retrieves the cached contact details for an @sign AtContact? getCachedContactDetail(String? atsign) { if (atsign == KeyStreamService().atContactImpl?.atClient?.getCurrentAtSign()) { @@ -31,6 +33,7 @@ AtContact? getCachedContactDetail(String? atsign) { return null; } +/// Retrieves the contact details for an @sign Future> getContactDetails(atSign) async { var contactDetails = {}; diff --git a/packages/at_location_flutter/lib/service/home_screen_service.dart b/packages/at_location_flutter/lib/service/home_screen_service.dart index 4a80ea22d..e144cc3a1 100644 --- a/packages/at_location_flutter/lib/service/home_screen_service.dart +++ b/packages/at_location_flutter/lib/service/home_screen_service.dart @@ -12,9 +12,12 @@ import 'master_location_service.dart'; class HomeScreenService { HomeScreenService._(); + static final HomeScreenService _instance = HomeScreenService._(); + factory HomeScreenService() => _instance; + /// Handles the tap event on a location notification model void onLocationModelTap( LocationNotificationModel locationNotificationModel, bool haveResponded) { var currentAtsign = AtLocationNotificationListener().currentAtSign; @@ -63,6 +66,7 @@ class HomeScreenService { } } + /// Navigates to the MapScreen with the provided location notification model and current @sign void navigatorPushToMap(LocationNotificationModel locationNotificationModel) { Navigator.push( AtLocationNotificationListener().navKey.currentContext!, @@ -75,6 +79,7 @@ class HomeScreenService { } } +/// Returns the subtitle for a location notification model String getSubTitle(LocationNotificationModel locationNotificationModel) { DateTime? to; String time; @@ -129,6 +134,7 @@ String getSubTitle(LocationNotificationModel locationNotificationModel) { } } +/// Returns the semi-title for a location notification model String? getSemiTitle( LocationNotificationModel locationNotificationModel, bool haveResponded) { if (locationNotificationModel.key!.contains(MixedConstants.SHARE_LOCATION)) { @@ -167,6 +173,7 @@ String? getSemiTitle( } } +/// Returns the creator details for a location notification model LocationInfo? getCreatorDetails( LocationNotificationModel locationNotificationModel) { if (!compareAtSign(locationNotificationModel.atsignCreator!, @@ -178,6 +185,7 @@ LocationInfo? getCreatorDetails( return getMyLocationInfo(locationNotificationModel); } +/// Returns the location sharing information for the creator of a location notification model LocationSharingFor? getLocationSharingForCreator( LocationNotificationModel locationNotificationModel) { var _atsignCreator = locationNotificationModel.atsignCreator!; @@ -215,6 +223,7 @@ LocationSharingFor? getLocationSharingForCreator( return null; } +/// Returns the title for a location notification model String? getTitle(LocationNotificationModel locationNotificationModel) { if (locationNotificationModel.key!.contains(MixedConstants.SHARE_LOCATION)) { return locationNotificationModel.atsignCreator == @@ -229,6 +238,7 @@ String? getTitle(LocationNotificationModel locationNotificationModel) { } } +/// Determines whether to show the retry option for a location notification bool calculateShowRetry(KeyLocationModel keyLocationModel) { if (keyLocationModel.locationNotificationModel!.key! .contains('sharelocation')) { @@ -250,6 +260,7 @@ bool calculateShowRetry(KeyLocationModel keyLocationModel) { } } +/// Converts a [TimeOfDay] object to a formatted string representation String timeOfDayToString(TimeOfDay time) { var minute = time.minute; if (minute < 10) return '${time.hour}: 0${time.minute}'; diff --git a/packages/at_location_flutter/lib/service/key_stream_service.dart b/packages/at_location_flutter/lib/service/key_stream_service.dart index 888dd2e1d..2128113d3 100644 --- a/packages/at_location_flutter/lib/service/key_stream_service.dart +++ b/packages/at_location_flutter/lib/service/key_stream_service.dart @@ -15,7 +15,9 @@ import 'package:at_utils/at_logger.dart'; class KeyStreamService { KeyStreamService._(); + static final KeyStreamService _instance = KeyStreamService._(); + factory KeyStreamService() => _instance; final _logger = AtSignLogger('KeyStreamService'); @@ -30,8 +32,10 @@ class KeyStreamService { // ignore: close_sinks StreamController atNotificationsController = StreamController>.broadcast(); + Stream> get atNotificationsStream => atNotificationsController.stream as Stream>; + StreamSink> get atNotificationsSink => atNotificationsController.sink as StreamSink>; @@ -60,7 +64,7 @@ class KeyStreamService { /// adds all share and request location notifications to [atNotificationsSink] void getAllNotifications() async { - AtClientManager.getInstance().syncService.sync(); + AtClientManager.getInstance().atClient.syncService.sync(); var allResponse = await atClientInstance!.getKeys( regex: 'sharelocation-', @@ -151,6 +155,7 @@ class KeyStreamService { }); } + /// Updates the pending status of a location notification void updatePendingStatus(LocationNotificationModel notification) { for (var i = 0; i < allLocationNotifications.length; i++) { if ((allLocationNotifications[i] @@ -338,6 +343,7 @@ class KeyStreamService { } } + /// Checks if a location notification is in the past isPastNotification(LocationNotificationModel _locationNotificationModel) { if ((_locationNotificationModel.to != null) && (_locationNotificationModel.to!.isBefore(DateTime.now()))) { @@ -384,6 +390,7 @@ class KeyStreamService { return tempHyridNotificationModel; } + /// Retrieves the value of an AtKey Future getAtValue(AtKey key) async { try { var atvalue = @@ -402,6 +409,7 @@ class KeyStreamService { } } + /// Deletes data associated with a LocationNotificationModel deleteData(LocationNotificationModel locationNotificationModel) async { if (isPastNotification(locationNotificationModel)) { notifyListeners(); diff --git a/packages/at_location_flutter/lib/service/location_service.dart b/packages/at_location_flutter/lib/service/location_service.dart index 9ebe3b2c6..ffbd651b5 100644 --- a/packages/at_location_flutter/lib/service/location_service.dart +++ b/packages/at_location_flutter/lib/service/location_service.dart @@ -7,6 +7,7 @@ import 'package:at_location_flutter/location_modal/hybrid_model.dart'; import 'package:at_location_flutter/service/master_location_service.dart'; import 'package:at_location_flutter/utils/constants/init_location_service.dart'; import 'package:geolocator/geolocator.dart'; + // ignore: import_of_legacy_library_into_null_safe import 'package:latlong2/latlong.dart'; @@ -17,7 +18,9 @@ import 'package:at_utils/at_logger.dart'; class LocationService { LocationService._(); + static final LocationService _instance = LocationService._(); + factory LocationService() => _instance; final _logger = AtSignLogger('LocationService'); @@ -44,8 +47,10 @@ class LocationService { late StreamController _atHybridUsersController = StreamController>.broadcast(); + Stream> get atHybridUsersStream => _atHybridUsersController.stream as Stream>; + StreamSink> get atHybridUsersSink => _atHybridUsersController.sink as StreamSink>; @@ -109,6 +114,7 @@ class LocationService { } } + /// Adds the current user's details to the hybridUsersList Future addMyDetailsToHybridUsersList() async { var permission = await Geolocator.checkPermission(); if (((permission == LocationPermission.always) || @@ -142,6 +148,7 @@ class LocationService { } } + /// Updates the current user's latitude and longitude void updateMyLatLng(HybridModel _myData) async { if (etaFrom != null) { _myData.eta = await _calculateEta(_myData); @@ -167,6 +174,7 @@ class LocationService { } } + /// Adds a centre marker to the hybridUsersList void addCentreMarker() { centreMarker = HybridModel( displayName: textForCenter, latLng: etaFrom, eta: '', image: null); diff --git a/packages/at_location_flutter/lib/service/master_location_service.dart b/packages/at_location_flutter/lib/service/master_location_service.dart index 54426c1ab..dee3edf2d 100644 --- a/packages/at_location_flutter/lib/service/master_location_service.dart +++ b/packages/at_location_flutter/lib/service/master_location_service.dart @@ -14,7 +14,9 @@ import 'package:at_utils/at_logger.dart'; class MasterLocationService { MasterLocationService._(); + static final MasterLocationService _instance = MasterLocationService._(); + factory MasterLocationService() => _instance; late AtClient atClientInstance; late Function getAtValueFromMainApp; @@ -22,6 +24,7 @@ class MasterLocationService { String? currentAtSign; Map _allReceivedUsersList = {}; + // ignore: prefer_final_fields Map _locationReceivedData = {}; @@ -32,8 +35,10 @@ class MasterLocationService { StreamController _allReceivedUsersController = StreamController>.broadcast(); + Stream> get allReceivedUsersStream => _allReceivedUsersController.stream as Stream>; + StreamSink> get allReceivedUsersSink => _allReceivedUsersController.sink as StreamSink>; @@ -50,6 +55,7 @@ class MasterLocationService { /// and DateTime.now() is between from and to of the locationSharingFor value /// then we will return the HybridModel of the atsign in _allReceivedUsersList + /// Retrieves the HybridModel for a given Atsign and optional id HybridModel? getHybridModel(String atsign, {String? id}) { if (id != null) { id = trimAtsignsFromKey(id); @@ -124,6 +130,7 @@ class MasterLocationService { createHybridFromLocationDataModel(); } + /// Creates HybridModels from LocationDataModel and updates the allReceivedUsersSink void createHybridFromLocationDataModel() async { await Future.forEach(_locationReceivedData.entries, (MapEntry _locationData) async { @@ -139,6 +146,7 @@ class MasterLocationService { allReceivedUsersSink.add(_allReceivedUsersList); } + /// Updates the hybrid list with a new user or updates an existing user void updateHybridList(LocationDataModel _newUser) async { var contains = _allReceivedUsersList[_newUser.sender] != null; @@ -178,6 +186,7 @@ class MasterLocationService { KeyStreamService().notifyListeners(); } + /// Deletes received data for a given atsign void deleteReceivedData(String atsign) { _locationReceivedData.remove(atsign); @@ -186,6 +195,7 @@ class MasterLocationService { allReceivedUsersSink.add(_allReceivedUsersList); } + /// Retrieves the image of an atsign from the contact details Future getImageOfAtsignNew(String? atsign) async { try { AtContact contact; @@ -205,6 +215,7 @@ class MasterLocationService { } } + /// Retrieves the value of an AtKey from the AtClient instance Future getAtValue(AtKey key) async { try { var atvalue = await atClientInstance.get(key).catchError( 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 bd3dcbd2f..96a7e6fe3 100644 --- a/packages/at_location_flutter/lib/service/notify_and_put.dart +++ b/packages/at_location_flutter/lib/service/notify_and_put.dart @@ -1,13 +1,17 @@ import 'package:at_client_mobile/at_client_mobile.dart'; + // ignore: implementation_imports import 'package:at_utils/at_logger.dart'; class NotifyAndPut { NotifyAndPut._(); + static final NotifyAndPut _instance = NotifyAndPut._(); + factory NotifyAndPut() => _instance; final _logger = AtSignLogger('NotifyAndPut'); + /// Notifies and puts the value of an AtKey Future notifyAndPut(AtKey atKey, dynamic value, {bool saveDataIfUndelivered = false}) async { try { @@ -23,13 +27,15 @@ class NotifyAndPut { atKey.sharedWith = '@${atKey.sharedWith!}'; } - var result = - await AtClientManager.getInstance().notificationService.notify( - NotificationParams.forUpdate( - atKey, - value: value, - ), - ); + var result = await AtClientManager.getInstance() + .atClient + .notificationService + .notify( + NotificationParams.forUpdate( + atKey, + value: value, + ), + ); _logger.finer( 'notifyAndPut result for $atKey - $result ${result.atClientException}'); @@ -54,18 +60,14 @@ class NotifyAndPut { } } + /// Removes the namespace from the AtKey AtKey removeNamespaceFromKey(AtKey atKey) { if (AtClientManager.getInstance().atClient.getPreferences()!.namespace != null) { - if (atKey.key!.contains('.${AtClientManager.getInstance() - .atClient - .getPreferences()! - .namespace!}')) { + if (atKey.key!.contains( + '.${AtClientManager.getInstance().atClient.getPreferences()!.namespace!}')) { atKey.key = atKey.key!.replaceAll( - ('.${AtClientManager.getInstance() - .atClient - .getPreferences()! - .namespace!}'), + ('.${AtClientManager.getInstance().atClient.getPreferences()!.namespace!}'), ''); } } @@ -73,6 +75,7 @@ class NotifyAndPut { return atKey; } + /// Removes the namespace from a string String removeNamespaceFromString(String _id) { var _namespace = AtClientManager.getInstance().atClient.getPreferences()!.namespace; diff --git a/packages/at_location_flutter/lib/service/search_location_service.dart b/packages/at_location_flutter/lib/service/search_location_service.dart index 6d9508847..bcc8d99d4 100644 --- a/packages/at_location_flutter/lib/service/search_location_service.dart +++ b/packages/at_location_flutter/lib/service/search_location_service.dart @@ -30,7 +30,7 @@ class SearchLocationService { /// /// Make sure that [apiKey] is passed while initialising. void getAddressLatLng(String address, LatLng? currentLocation) async { - currentLocation ??= LatLng(0, 0); + currentLocation ??= const LatLng(0, 0); var url = '$placesUrl?q=${address.replaceAll(RegExp(' '), '+')}&apiKey=${MixedConstants.API_KEY}&at=${currentLocation.latitude},${currentLocation.longitude}'; 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 917f683e9..4ca98034e 100644 --- a/packages/at_location_flutter/lib/service/send_location_notification.dart +++ b/packages/at_location_flutter/lib/service/send_location_notification.dart @@ -12,8 +12,10 @@ import 'package:at_location_flutter/service/my_location.dart'; import 'package:at_location_flutter/service/notify_and_put.dart'; import 'package:at_location_flutter/utils/constants/init_location_service.dart'; import 'package:geolocator/geolocator.dart'; + // ignore: import_of_legacy_library_into_null_safe import 'package:latlong2/latlong.dart'; + // ignore: implementation_imports import 'key_stream_service.dart'; import 'package:at_utils/at_logger.dart'; @@ -26,8 +28,10 @@ import 'package:at_utils/at_logger.dart'; /// true if needed. class SendLocationNotification { SendLocationNotification._(); + static final SendLocationNotification _instance = SendLocationNotification._(); + factory SendLocationNotification() => _instance; Timer? timer; final String locationKey = 'location-notify'; @@ -397,6 +401,7 @@ class SendLocationNotification { } } + /// Prepares location data and sends it to the specified receiver Future prepareLocationDataAndSend(String receiver, LocationDataModel locationData, LatLng? myLocation) async { //// don't send anything to logged in atsign @@ -493,6 +498,7 @@ class SendLocationNotification { return result; } + /// Deletes all location keys void deleteAllLocationKey() async { var response = await atClient?.getKeys( regex: locationKey, @@ -509,6 +515,7 @@ class SendLocationNotification { }); } + /// Creates a new AtKey with the specified parameters AtKey newAtKey(int ttr, String key, String sharedWith, {int? ttl}) { if (sharedWith[0] != '@') { sharedWith = '@$sharedWith'; 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 ed600a373..ddbb6e9a1 100644 --- a/packages/at_location_flutter/lib/service/sharing_location_service.dart +++ b/packages/at_location_flutter/lib/service/sharing_location_service.dart @@ -17,6 +17,7 @@ import 'package:at_utils/at_logger.dart'; class SharingLocationService { static final SharingLocationService _singleton = SharingLocationService._internal(); + SharingLocationService._internal(); final _logger = AtSignLogger('SharingLocationService'); @@ -279,6 +280,7 @@ class SharingLocationService { } } + /// Removes a person from the location sharing Future removePerson( LocationNotificationModel locationNotificationModel) async { var result; @@ -340,6 +342,7 @@ class SharingLocationService { } } + /// Deletes all keys Future deleteAllKey() async { var response = await AtLocationNotificationListener().atClientInstance!.getKeys( diff --git a/packages/at_location_flutter/lib/show_location.dart b/packages/at_location_flutter/lib/show_location.dart index dc7f1a3d0..806191807 100644 --- a/packages/at_location_flutter/lib/show_location.dart +++ b/packages/at_location_flutter/lib/show_location.dart @@ -34,7 +34,7 @@ Widget showLocation(Key? key, MapController? mapController, } } else { marker = - buildMarker(HybridModel(latLng: LatLng(45, 45)), singleMarker: true); + buildMarker(HybridModel(latLng: const LatLng(45, 45)), singleMarker: true); showMarker = false; } @@ -59,7 +59,7 @@ Widget showLocation(Key? key, MapController? mapController, ? markerList[0].point : (location != null) ? location - : LatLng(45, 45), + : const LatLng(45, 45), zoom: markerList != null ? 5 : (location != null) diff --git a/packages/at_location_flutter/pubspec.yaml b/packages/at_location_flutter/pubspec.yaml index dc614a35a..05aa2d556 100644 --- a/packages/at_location_flutter/pubspec.yaml +++ b/packages/at_location_flutter/pubspec.yaml @@ -1,44 +1,43 @@ name: at_location_flutter description: A Flutter plugin project to share locations between two atSigns and track them on OSM (OpenStreetMap). -version: 3.1.8 +version: 3.1.9 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_location_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_location_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_location_flutter +documentation: https://docs.atsign.com/ environment: - sdk: '>=2.12.0 <4.0.0' + sdk: '>=2.14.0 <4.0.0' flutter: ">=1.20.0" dependencies: flutter: sdk: flutter - tuple: ^2.0.0 - latlong2: ^0.8.1 + tuple: ^2.0.2 + latlong2: ^0.9.0 positioned_tap_detector_2: ^1.0.4 - transparent_image: ^2.0.0 - async: ^2.8.2 - flutter_image: ^4.1.0 - cached_network_image: ^3.2.0 - path_provider: ^2.0.9 - vector_math: ^2.1.1 - proj4dart: ^2.0.0 - meta: ^1.7.0 - geolocator: ^8.2.1 + 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.4 - fluttertoast: ^8.0.9 + http: ^0.13.0 + fluttertoast: ^8.2.2 # at_chat_flutter: ^2.0.2 - at_client_mobile: ^3.2.7 - at_lookup: ^3.0.31 - at_commons: ^3.0.26 + 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.11 - at_client: ^3.0.40 - at_common_flutter: ^2.0.11 - at_contacts_flutter: ^4.0.8 - + at_utils: ^3.0.14 + at_client: ^3.0.62 + at_common_flutter: ^2.0.12 + at_contacts_flutter: ^4.0.10 dev_dependencies: flutter_lints: ^2.0.1 diff --git a/packages/at_location_flutter/test/at_location_flutter_test.dart b/packages/at_location_flutter/test/at_location_flutter_test.dart index de23b768e..4d9fe07ad 100644 --- a/packages/at_location_flutter/test/at_location_flutter_test.dart +++ b/packages/at_location_flutter/test/at_location_flutter_test.dart @@ -1,15 +1,12 @@ -import 'package:at_client/at_client.dart'; import 'package:at_contact/at_contact.dart'; import 'package:at_location_flutter/location_modal/hybrid_model.dart'; import 'package:at_location_flutter/location_modal/key_location_model.dart'; import 'package:at_location_flutter/location_modal/location_notification.dart'; import 'package:at_location_flutter/service/at_location_notification_listener.dart'; import 'package:at_location_flutter/service/contact_service.dart'; -import 'package:at_location_flutter/service/distance_calculate.dart'; import 'package:at_location_flutter/service/home_screen_service.dart'; import 'package:at_location_flutter/service/key_stream_service.dart'; import 'package:at_location_flutter/service/location_service.dart'; -import 'package:at_location_flutter/service/master_location_service.dart'; import 'package:at_location_flutter/service/my_location.dart'; import 'package:at_location_flutter/service/request_location_service.dart'; import 'package:flutter/material.dart'; @@ -35,8 +32,6 @@ Position get mockPosition => Position( class MockAtContactImpl extends Mock implements AtContactsImpl {} void main() { - MockAtContactImpl mockAtContactImpl = MockAtContactImpl(); - TestWidgetsFlutterBinding.ensureInitialized(); setUp(() { GeolocatorPlatform.instance = MockGeolocatorPlatform(); From cd8e661939396ca35903ce8f0b3600473013a81f Mon Sep 17 00:00:00 2001 From: sonle Date: Thu, 13 Jul 2023 17:41:34 +0700 Subject: [PATCH 034/176] feat: remove dependency override --- packages/at_events_flutter/CHANGELOG.md | 3 +++ packages/at_events_flutter/pubspec.yaml | 12 ++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/at_events_flutter/CHANGELOG.md b/packages/at_events_flutter/CHANGELOG.md index a0fd9d494..99ed93140 100644 --- a/packages/at_events_flutter/CHANGELOG.md +++ b/packages/at_events_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.1.11 +- **CHORE**: Upgraded dependencies + ## 3.1.10 - **CHORE**: Improved pub score diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 6b10d8604..1cb8b34d0 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_events_flutter description: A Flutter plugin project to manage events (time, place and attendees) using the atPlatform. -version: 3.1.10 +version: 3.1.11 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 @@ -13,10 +13,10 @@ environment: dependencies: flutter: sdk: flutter - latlong2: ^0.8.1 + latlong2: ^0.9.0 fluttertoast: ^8.2.2 sliding_up_panel: ^2.0.0+1 - geolocator: ^8.2.1 + geolocator: ^9.0.2 at_commons: ^3.0.51 at_client_mobile: ^3.2.10 @@ -28,13 +28,9 @@ dependencies: at_contacts_group_flutter: ^4.0.12 # at_chat_flutter: ^2.0.2 at_contacts_flutter: ^4.0.10 - at_location_flutter: ^3.1.8 + at_location_flutter: ^3.1.9 at_common_flutter: ^2.0.11 -dependency_overrides: - geolocator: ^9.0.2 - latlong2: ^0.9.0 - dev_dependencies: flutter_lints: ^2.0.1 mocktail: ^0.3.0 From 12f50c81ce4864ba5f4bffd9581896c507530f2a Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Tue, 18 Jul 2023 10:50:03 -0400 Subject: [PATCH 035/176] chore: Update README.md --- packages/at_onboarding_flutter/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/README.md b/packages/at_onboarding_flutter/README.md index b15ed9148..22914c212 100644 --- a/packages/at_onboarding_flutter/README.md +++ b/packages/at_onboarding_flutter/README.md @@ -127,11 +127,13 @@ Go to your project folder, macOS/Runner/DebugProfile.entitlements For release you need to open macOS/Runner/Release.entitlements -and add the following key: +and add the following keys: ``` com.apple.security.files.downloads.read-write +com.apple.security.network.client + ``` From acc3545fe6ae472091a48e32919be6d6a539cb3c Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Thu, 20 Jul 2023 19:11:31 +0530 Subject: [PATCH 036/176] fix: updated error messages --- packages/at_onboarding_flutter/CHANGELOG.md | 3 +++ .../Flutter/GeneratedPluginRegistrant.swift | 4 +--- .../example/macos/Podfile | 2 +- .../example/macos/Podfile.lock | 21 ++++++++++++------- .../macos/Runner.xcodeproj/project.pbxproj | 9 ++++---- .../screen/at_onboarding_activate_screen.dart | 6 +++--- .../screen/at_onboarding_generate_screen.dart | 6 +++--- .../lib/screen/at_onboarding_home_screen.dart | 6 +++--- packages/at_onboarding_flutter/pubspec.yaml | 2 +- 9 files changed, 34 insertions(+), 25 deletions(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index 0fe33cafd..9d47112e1 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 6.1.1 +- **FIX**: Updated error messages + ## 6.1.0 - **FEAT**: Internationalization support added for French - **FIX**: Issue fixed in UI theme diff --git a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 1aba5171c..a7b3d3d2f 100644 --- a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,10 +7,9 @@ import Foundation import at_file_saver import biometric_storage -import device_info_plus import file_selector_macos import package_info_plus -import path_provider_foundation +import path_provider_macos import share_plus_macos import shared_preferences_foundation import url_launcher_macos @@ -18,7 +17,6 @@ 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")) diff --git a/packages/at_onboarding_flutter/example/macos/Podfile b/packages/at_onboarding_flutter/example/macos/Podfile index dade8dfad..049abe295 100644 --- a/packages/at_onboarding_flutter/example/macos/Podfile +++ b/packages/at_onboarding_flutter/example/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.14' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/at_onboarding_flutter/example/macos/Podfile.lock b/packages/at_onboarding_flutter/example/macos/Podfile.lock index d8fbd13f9..46aac45b2 100644 --- a/packages/at_onboarding_flutter/example/macos/Podfile.lock +++ b/packages/at_onboarding_flutter/example/macos/Podfile.lock @@ -6,12 +6,15 @@ PODS: - file_selector_macos (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - - package_info_plus_macos (0.0.1): + - package_info_plus (0.0.1): - FlutterMacOS - path_provider_macos (0.0.1): - FlutterMacOS - share_plus_macos (0.0.1): - FlutterMacOS + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - url_launcher_macos (0.0.1): - FlutterMacOS @@ -20,9 +23,10 @@ DEPENDENCIES: - biometric_storage (from `Flutter/ephemeral/.symlinks/plugins/biometric_storage/macos`) - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) EXTERNAL SOURCES: @@ -34,12 +38,14 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos FlutterMacOS: :path: Flutter/ephemeral - package_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos path_provider_macos: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos share_plus_macos: :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos @@ -47,12 +53,13 @@ SPEC CHECKSUMS: at_file_saver: 1fc6ed722f17c7a20ce79cce168d1100fcad4b95 biometric_storage: 43caa6e7ef00e8e19c074216e7e1786dacda9e76 file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6 - FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 - package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4 + shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 -PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c +PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 COCOAPODS: 1.11.3 diff --git a/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj b/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj index ede5df3cc..b37baf503 100644 --- a/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -256,6 +256,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -404,7 +405,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -483,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -530,7 +531,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart index 356d6227b..fd590bac8 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart @@ -247,11 +247,11 @@ class _AtOnboardingActivateScreenState Navigator.pop(context, AtOnboardingResult.success(atsign: atsign)); } else if (authResponse == AtOnboardingResponseStatus.serverNotReached) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_not_registered, + AtOnboardingLocalizations.current.msg_atSign_unreachable, ); } else if (authResponse == AtOnboardingResponseStatus.authFailed) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_unreachable, + AtOnboardingLocalizations.current.error_authenticated_failed, ); } else { await showErrorDialog( @@ -267,7 +267,7 @@ class _AtOnboardingActivateScreenState } else if (e == AtOnboardingResponseStatus.serverNotReached) { await _showAlertDialog( e, - title: AtOnboardingLocalizations.current.error_server_not_found, + title: AtOnboardingLocalizations.current.msg_atSign_unreachable, ); } else if (e == AtOnboardingResponseStatus.timeOut) { await _showAlertDialog( diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart index 6aa5a551d..72667811a 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart @@ -480,11 +480,11 @@ class _AtOnboardingGenerateScreenState context, AtOnboardingResult.success(atsign: verifiedAtSign)); } else if (authResponse == AtOnboardingResponseStatus.serverNotReached) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_not_registered, + AtOnboardingLocalizations.current.msg_atSign_unreachable, ); } else if (authResponse == AtOnboardingResponseStatus.authFailed) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_unreachable, + AtOnboardingLocalizations.current.error_authenticated_failed, ); } else { await showErrorDialog( @@ -497,7 +497,7 @@ class _AtOnboardingGenerateScreenState _logger.severe('Error in authenticateWith cram secret'); await _showAlertDialog( e, - title: AtOnboardingLocalizations.current.msg_auth_failed, + title: AtOnboardingLocalizations.current.error_authenticated_failed, ); } else if (e == AtOnboardingResponseStatus.serverNotReached) { await _processSharedSecret( diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index 67ce4f92c..611a8301e 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -578,7 +578,7 @@ class _AtOnboardingHomeScreenState extends State { ); } else if (authResponse == AtOnboardingResponseStatus.authFailed) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_not_registered, + AtOnboardingLocalizations.current.error_authenticated_failed, ); } else { await showErrorDialog( @@ -963,11 +963,11 @@ class _AtOnboardingHomeScreenState extends State { Navigator.pop(context, AtOnboardingResult.success(atsign: atsign)); } else if (authResponse == AtOnboardingResponseStatus.serverNotReached) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_not_registered, + AtOnboardingLocalizations.current.msg_atSign_unreachable, ); } else if (authResponse == AtOnboardingResponseStatus.authFailed) { await _showAlertDialog( - AtOnboardingLocalizations.current.msg_atSign_unreachable, + AtOnboardingLocalizations.current.error_authenticated_failed, ); } else { await showErrorDialog( diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 0bc5fb2e4..64cccb62b 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.0 +version: 6.1.1 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 From 1c40cee3f9d5ed65992bac526dab821b6b5093c4 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Mon, 24 Jul 2023 13:37:50 +0530 Subject: [PATCH 037/176] chore: removed override dependency --- .../example/windows/flutter/generated_plugin_registrant.cc | 3 +++ .../example/windows/flutter/generated_plugins.cmake | 1 + packages/at_backupkey_flutter/pubspec.yaml | 5 +---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/at_backupkey_flutter/example/windows/flutter/generated_plugin_registrant.cc b/packages/at_backupkey_flutter/example/windows/flutter/generated_plugin_registrant.cc index 762731d61..036f08c22 100644 --- a/packages/at_backupkey_flutter/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/at_backupkey_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_backupkey_flutter/example/windows/flutter/generated_plugins.cmake b/packages/at_backupkey_flutter/example/windows/flutter/generated_plugins.cmake index e5c7e6138..ac2736f29 100644 --- a/packages/at_backupkey_flutter/example/windows/flutter/generated_plugins.cmake +++ b/packages/at_backupkey_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_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index 792e279e2..659dda6a8 100644 --- a/packages/at_backupkey_flutter/pubspec.yaml +++ b/packages/at_backupkey_flutter/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: path_provider: ^2.0.9 at_file_saver: ^0.1.2 at_utils: ^3.0.12 - at_client_mobile: ^3.2.10 + at_client_mobile: ^3.2.11 showcaseview: ^2.0.3 device_info_plus: ^9.0.2 # desktop - dependencies @@ -32,9 +32,6 @@ dev_dependencies: sdk: flutter flutter_lints: ^2.0.1 -dependency_overrides: - win32: ^5.0.5 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 2f61a08d546482ceab035543b47d7b85900e9e7e Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Mon, 24 Jul 2023 13:54:22 +0530 Subject: [PATCH 038/176] chore: updated version and changelog for contacts package --- packages/at_contacts_flutter/CHANGELOG.md | 3 +++ .../example/ios/Podfile.lock | 17 ++++++++++++----- .../lib/services/contact_service.dart | 1 - packages/at_contacts_flutter/pubspec.yaml | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/at_contacts_flutter/CHANGELOG.md b/packages/at_contacts_flutter/CHANGELOG.md index d8cc5abf6..f192a5c68 100644 --- a/packages/at_contacts_flutter/CHANGELOG.md +++ b/packages/at_contacts_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.0.11 +- **CHORE**: Updated dependency and improved pub score + ## 4.0.10 - **FIX**: fetching contacts made faster diff --git a/packages/at_contacts_flutter/example/ios/Podfile.lock b/packages/at_contacts_flutter/example/ios/Podfile.lock index ed01c10cb..7bce96573 100644 --- a/packages/at_contacts_flutter/example/ios/Podfile.lock +++ b/packages/at_contacts_flutter/example/ios/Podfile.lock @@ -62,6 +62,9 @@ PODS: - SDWebImage/Core (5.15.5) - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - SwiftyGif (5.4.4) - url_launcher_ios (0.0.1): - Flutter @@ -78,10 +81,11 @@ DEPENDENCIES: - Flutter (from `Flutter`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -113,13 +117,15 @@ EXTERNAL SOURCES: package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -133,19 +139,20 @@ SPEC CHECKSUMS: biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + file_picker: ce3938a0df3cc1ef404671531facef740d03f920 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e + package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 - webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 diff --git a/packages/at_contacts_flutter/lib/services/contact_service.dart b/packages/at_contacts_flutter/lib/services/contact_service.dart index 49ed7b6a0..48faa276f 100644 --- a/packages/at_contacts_flutter/lib/services/contact_service.dart +++ b/packages/at_contacts_flutter/lib/services/contact_service.dart @@ -134,7 +134,6 @@ class ContactService { Future?> fetchContacts() async { try { /// if contact list is already present, data is not fetched again - if (baseContactList.isNotEmpty) { List baseContacts = baseContactList.map((e) => e.contact).toList(); diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index a13d5c21e..a5955dfef 100644 --- a/packages/at_contacts_flutter/pubspec.yaml +++ b/packages/at_contacts_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_contacts_flutter description: A Flutter plugin project to provide ease of managing contacts for an atSign using atPlatform. -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_contacts_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues @@ -16,7 +16,7 @@ dependencies: flutter_slidable: ^3.0.0 - at_client_mobile: ^3.2.10 + at_client_mobile: ^3.2.11 at_commons: ^3.0.48 at_lookup: ^3.0.37 at_contact: ^3.0.7 From 7cf16a75e310a318cc3b3d6e9401bca4732cb106 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Tue, 25 Jul 2023 16:27:09 +0530 Subject: [PATCH 039/176] chore: updated response timed out error message --- .../lib/screen/at_onboarding_activate_screen.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart index fd590bac8..9c182a156 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart @@ -272,7 +272,7 @@ class _AtOnboardingActivateScreenState } else if (e == AtOnboardingResponseStatus.timeOut) { await _showAlertDialog( e, - title: AtOnboardingLocalizations.current.title_session_expired, + title: AtOnboardingLocalizations.current.msg_response_time_out, ); } } From 47eff48e6f7eab1601ed636cdab327df47aecd60 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Thu, 27 Jul 2023 00:34:39 +0530 Subject: [PATCH 040/176] chore: removed override and updated package version --- packages/at_contacts_group_flutter/CHANGELOG.md | 3 +++ .../at_contacts_group_flutter/example/pubspec.yaml | 6 +----- packages/at_contacts_group_flutter/pubspec.yaml | 10 ++-------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/at_contacts_group_flutter/CHANGELOG.md b/packages/at_contacts_group_flutter/CHANGELOG.md index c423f2051..3b72bd09a 100644 --- a/packages/at_contacts_group_flutter/CHANGELOG.md +++ b/packages/at_contacts_group_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.0.13 +- **CHORE**: Updated dependency and improved pub score + ## 4.0.12 - **FIX**: fetching contacts made faster. diff --git a/packages/at_contacts_group_flutter/example/pubspec.yaml b/packages/at_contacts_group_flutter/example/pubspec.yaml index 46909ad9d..727d44530 100644 --- a/packages/at_contacts_group_flutter/example/pubspec.yaml +++ b/packages/at_contacts_group_flutter/example/pubspec.yaml @@ -52,11 +52,7 @@ dependency_overrides: file_selector_windows: ^0.9.3 file_selector_linux: ^0.9.2 flutter_slidable: ^3.0.0 - at_contacts_flutter: - git: - url: https://github.com/atsign-foundation/at_widgets.git - path: packages/at_contacts_flutter - ref: trunk + at_contacts_flutter: ^4.0.11 diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index 06a363d80..cb4ec904d 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_contacts_group_flutter description: A Flutter plugin project to provide group functionality with contacts using atPlatform. -version: 4.0.12 +version: 4.0.13 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter @@ -33,16 +33,10 @@ dependencies: at_client_mobile: ^3.2.9 at_commons: ^3.0.45 at_common_flutter: ^2.0.11 - at_contacts_flutter: ^4.0.10 + at_contacts_flutter: ^4.0.11 at_contact: ^3.0.7 at_utils: ^3.0.12 -dependency_overrides: - at_contacts_flutter: - git: - url: https://github.com/atsign-foundation/at_widgets.git - path: packages/at_contacts_flutter - ref: trunk dev_dependencies: flutter_lints: ^2.0.1 From 86f96c59b491f32affd9a27d2af911c513bb04a0 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Thu, 27 Jul 2023 14:19:52 +0530 Subject: [PATCH 041/176] chore: dart analyze resolved --- .../example/lib/main.dart | 13 +++++-------- .../example/macos/Podfile | 2 +- .../example/macos/Podfile.lock | 2 +- .../macos/Runner.xcodeproj/project.pbxproj | 4 +++- .../example/pubspec.yaml | 1 - .../lib/services/desktop_image_picker.dart | 2 +- .../test/at_contacts_group_flutter_test.dart | 19 ++----------------- 7 files changed, 13 insertions(+), 30 deletions(-) diff --git a/packages/at_contacts_group_flutter/example/lib/main.dart b/packages/at_contacts_group_flutter/example/lib/main.dart index 59001332e..6cd2c390f 100644 --- a/packages/at_contacts_group_flutter/example/lib/main.dart +++ b/packages/at_contacts_group_flutter/example/lib/main.dart @@ -23,6 +23,7 @@ Future loadAtClientPreference() async { ..commitLogPath = dir.path ..isLocalStoreRequired = true; } + final StreamController updateThemeMode = StreamController.broadcast(); @@ -38,7 +39,6 @@ class _MyAppState extends State { Future futurePreference = loadAtClientPreference(); AtClientPreference? atClientPreference; - @override Widget build(BuildContext context) { return StreamBuilder( @@ -52,18 +52,15 @@ class _MyAppState extends State { brightness: Brightness.light, primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( - primary: const Color(0xFFf4533d), - ), - backgroundColor: Colors.white, + primary: const Color(0xFFf4533d), background: Colors.white), scaffoldBackgroundColor: Colors.white, ), darkTheme: ThemeData().copyWith( brightness: Brightness.dark, primaryColor: Colors.blue, - colorScheme: ThemeData.dark().colorScheme.copyWith( - primary: Colors.blue, - ), - backgroundColor: Colors.grey[850], + colorScheme: ThemeData.dark() + .colorScheme + .copyWith(primary: Colors.blue, background: Colors.white), scaffoldBackgroundColor: Colors.grey[850], ), themeMode: themeMode, diff --git a/packages/at_contacts_group_flutter/example/macos/Podfile b/packages/at_contacts_group_flutter/example/macos/Podfile index 049abe295..9ec46f8cd 100644 --- a/packages/at_contacts_group_flutter/example/macos/Podfile +++ b/packages/at_contacts_group_flutter/example/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.14' +platform :osx, '10.15' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/at_contacts_group_flutter/example/macos/Podfile.lock b/packages/at_contacts_group_flutter/example/macos/Podfile.lock index 5d9a884ed..8cbb8cefe 100644 --- a/packages/at_contacts_group_flutter/example/macos/Podfile.lock +++ b/packages/at_contacts_group_flutter/example/macos/Podfile.lock @@ -71,6 +71,6 @@ SPEC CHECKSUMS: shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 -PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 +PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0 COCOAPODS: 1.11.3 diff --git a/packages/at_contacts_group_flutter/example/macos/Runner.xcodeproj/project.pbxproj b/packages/at_contacts_group_flutter/example/macos/Runner.xcodeproj/project.pbxproj index 14a63eebd..49e7b09be 100644 --- a/packages/at_contacts_group_flutter/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/at_contacts_group_flutter/example/macos/Runner.xcodeproj/project.pbxproj @@ -159,7 +159,6 @@ 83ADE63BE9B2B2923D0D637C /* Pods-Runner.release.xcconfig */, 16D544DD9B836153DEE26858 /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -427,6 +426,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.15; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -553,6 +553,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.15; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -573,6 +574,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.15; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/packages/at_contacts_group_flutter/example/pubspec.yaml b/packages/at_contacts_group_flutter/example/pubspec.yaml index 727d44530..6fdfca725 100644 --- a/packages/at_contacts_group_flutter/example/pubspec.yaml +++ b/packages/at_contacts_group_flutter/example/pubspec.yaml @@ -55,7 +55,6 @@ dependency_overrides: at_contacts_flutter: ^4.0.11 - dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/at_contacts_group_flutter/lib/services/desktop_image_picker.dart b/packages/at_contacts_group_flutter/lib/services/desktop_image_picker.dart index 4567f5211..1869a0ceb 100644 --- a/packages/at_contacts_group_flutter/lib/services/desktop_image_picker.dart +++ b/packages/at_contacts_group_flutter/lib/services/desktop_image_picker.dart @@ -10,7 +10,7 @@ Future desktopImagePicker() async { AtSignLogger atSignLogger = AtSignLogger('desktopImagePicker'); try { // ignore: omit_local_variable_types - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', extensions: ['jpg', 'png', 'jpeg'], ); diff --git a/packages/at_contacts_group_flutter/test/at_contacts_group_flutter_test.dart b/packages/at_contacts_group_flutter/test/at_contacts_group_flutter_test.dart index 9f35773b5..cef6ba565 100644 --- a/packages/at_contacts_group_flutter/test/at_contacts_group_flutter_test.dart +++ b/packages/at_contacts_group_flutter/test/at_contacts_group_flutter_test.dart @@ -2,7 +2,6 @@ import 'package:at_client_mobile/at_client_mobile.dart'; import 'package:at_contact/at_contact.dart'; import 'package:at_contacts_flutter/services/contact_service.dart'; import 'package:at_contacts_group_flutter/services/group_service.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; @@ -15,18 +14,12 @@ class MockGroupService extends Mock implements GroupService {} class MockContactService extends Mock implements ContactService {} void main() { - const channel = MethodChannel('at_contacts_group_flutter'); MockAtContactImpl mockAtContactImpl = MockAtContactImpl(); MockAtClient mockAtClient = MockAtClient(); - MockContactService mockContactService = MockContactService(); TestWidgetsFlutterBinding.ensureInitialized(); - setUp(() { - channel.setMockMethodCallHandler((MethodCall methodCall) async { - return '42'; - }); - }); + setUp(() {}); test("create_group_test", () async { AtGroup grp = AtGroup("new_test_group", groupId: "1"); @@ -108,12 +101,4 @@ void main() { expect(res, true); }); - - tearDown(() { - channel.setMockMethodCallHandler(null); - }); - - // test('getPlatformVersion', () async { - // expect(await AtContactsGroupFlutter.platformVersion, '42'); - // }); -} \ No newline at end of file +} From 8946c45ec93237f7a5cfee93dd2f02937b47c49b Mon Sep 17 00:00:00 2001 From: sonle Date: Fri, 11 Aug 2023 13:50:06 +0700 Subject: [PATCH 042/176] feat: update CHANGELOG and dependency in pubspec.yaml --- packages/at_onboarding_flutter/CHANGELOG.md | 3 ++ .../example/ios/Podfile.lock | 41 +++++++++----- .../Flutter/GeneratedPluginRegistrant.swift | 6 ++- .../example/pubspec.yaml | 9 ++-- .../flutter/generated_plugin_registrant.cc | 3 ++ .../windows/flutter/generated_plugins.cmake | 1 + .../generated/intl/messages_all.dart | 13 ++--- .../lib/screen/at_onboarding_home_screen.dart | 4 +- packages/at_onboarding_flutter/pubspec.yaml | 53 ++++++++++--------- 9 files changed, 77 insertions(+), 56 deletions(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index 9d47112e1..d1a6699d7 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 6.1.2 +- **CHORE**: Update to support Dart 3 + ## 6.1.1 - **FIX**: Updated error messages diff --git a/packages/at_onboarding_flutter/example/ios/Podfile.lock b/packages/at_onboarding_flutter/example/ios/Podfile.lock index d9f553a58..265eebed6 100644 --- a/packages/at_onboarding_flutter/example/ios/Podfile.lock +++ b/packages/at_onboarding_flutter/example/ios/Podfile.lock @@ -7,6 +7,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 @@ -41,15 +43,18 @@ 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 - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -73,11 +78,13 @@ 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`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) @@ -102,16 +109,20 @@ 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: :path: ".symlinks/plugins/flutter_keychain/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: @@ -130,23 +141,25 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 + device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 + share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 + shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de - webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f + url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index a7b3d3d2f..508252dd8 100644 --- a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,16 +7,18 @@ 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")) diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index 60c8b9410..3cecca45e 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -33,19 +33,16 @@ dependencies: # 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_backupkey_flutter: ^4.0.8 + cupertino_icons: ^1.0.5 + at_app_flutter: ^5.2.0 + at_backupkey_flutter: ^4.0.10 flutter_localizations: sdk: flutter intl: any dependency_overrides: - path: 1.8.3 - package_info_plus: ^3.0.0 at_onboarding_flutter: path: ../ - at_client_mobile: ^3.2.9 intl: ^0.18.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 diff --git a/packages/at_onboarding_flutter/example/windows/flutter/generated_plugin_registrant.cc b/packages/at_onboarding_flutter/example/windows/flutter/generated_plugin_registrant.cc index 762731d61..036f08c22 100644 --- a/packages/at_onboarding_flutter/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/at_onboarding_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_onboarding_flutter/example/windows/flutter/generated_plugins.cmake b/packages/at_onboarding_flutter/example/windows/flutter/generated_plugins.cmake index e5c7e6138..ac2736f29 100644 --- a/packages/at_onboarding_flutter/example/windows/flutter/generated_plugins.cmake +++ b/packages/at_onboarding_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_onboarding_flutter/lib/localizations/generated/intl/messages_all.dart b/packages/at_onboarding_flutter/lib/localizations/generated/intl/messages_all.dart index 6f849c1e5..f9e94e515 100644 --- a/packages/at_onboarding_flutter/lib/localizations/generated/intl/messages_all.dart +++ b/packages/at_onboarding_flutter/lib/localizations/generated/intl/messages_all.dart @@ -11,6 +11,7 @@ import 'dart:async'; +import 'package:flutter/foundation.dart'; import 'package:intl/intl.dart'; import 'package:intl/message_lookup_by_library.dart'; import 'package:intl/src/intl_helpers.dart'; @@ -20,8 +21,8 @@ import 'messages_fr.dart' as messages_fr; typedef Future LibraryLoader(); Map _deferredLibraries = { - 'en': () => new Future.value(null), - 'fr': () => new Future.value(null), + 'en': () => new SynchronousFuture(null), + 'fr': () => new SynchronousFuture(null), }; MessageLookupByLibrary? _findExact(String localeName) { @@ -36,18 +37,18 @@ MessageLookupByLibrary? _findExact(String localeName) { } /// User programs should call this before using [localeName] for messages. -Future initializeMessages(String localeName) async { +Future initializeMessages(String localeName) { var availableLocale = Intl.verifiedLocale( localeName, (locale) => _deferredLibraries[locale] != null, onFailure: (_) => null); if (availableLocale == null) { - return new Future.value(false); + return new SynchronousFuture(false); } var lib = _deferredLibraries[availableLocale]; - await (lib == null ? new Future.value(false) : lib()); + lib == null ? new SynchronousFuture(false) : lib(); initializeInternalMessageLookup(() => new CompositeMessageLookup()); messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor); - return new Future.value(true); + return new SynchronousFuture(true); } bool _messagesExistFor(String locale) { diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index 611a8301e..a31a40fe5 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -426,7 +426,7 @@ class _AtOnboardingHomeScreenState extends State { var image = img.decodePng(File(imagepath).readAsBytesSync())!; LuminanceSource source = RGBLuminanceSource(image.width, image.height, - image.getBytes(format: img.Format.abgr).buffer.asInt32List()); + image.getBytes(order: img.ChannelOrder.abgr).buffer.asInt32List()); var bitmap = BinaryBitmap(HybridBinarizer(source)); var reader = QRCodeReader(); @@ -1022,7 +1022,7 @@ class _AtOnboardingHomeScreenState extends State { img.Image image = img.decodePng(selectedFile.readAsBytesSync())!; LuminanceSource source = RGBLuminanceSource(image.width, image.height, - image.getBytes(format: img.Format.abgr).buffer.asInt32List()); + image.getBytes(order: img.ChannelOrder.abgr).buffer.asInt32List()); BinaryBitmap bitmap = BinaryBitmap(HybridBinarizer(source)); QRCodeReader reader = QRCodeReader(); diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 64cccb62b..23930e166 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.1 +version: 6.1.2 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 @@ -16,36 +16,37 @@ dependencies: flutter: sdk: flutter - intl: ^0.18.0 - archive: ^3.3.0 - file_picker: ^5.2.4 - qr_code_scanner: ^1.0.0 - url_launcher: ^6.1.2 - permission_handler: ^9.2.0 - path_provider: ^2.0.9 - webview_flutter: ^4.0.0 - http: ^0.13.4 - pin_code_fields: ^7.4.0 - zxing2: ^0.1.0 - image: ^3.1.3 - shared_preferences: ^2.0.15 - tutorial_coach_mark: ^1.2.3 + 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' + pin_code_fields: ^8.0.1 + zxing2: ^0.2.0 + image: ^4.0.17 + shared_preferences: ^2.2.0 + tutorial_coach_mark: ^1.2.9 # desktop - dependencies - file_selector: ^0.8.4+1 - file_selector_macos: ^0.8.2 - file_selector_windows: ^0.8.2 - file_selector_linux: ^0.0.2+1 + 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.8 - at_client: ^3.0.56 - at_client_mobile: ^3.2.9 - at_commons: ^3.0.43 + at_backupkey_flutter: ^4.0.10 + at_client: ^3.0.64 + at_client_mobile: ^3.2.11 + at_commons: ^3.0.53 at_server_status: ^1.0.3 - at_utils: ^3.0.12 - at_sync_ui_flutter: ^1.0.1 - + at_utils: ^3.0.15 + at_sync_ui_flutter: ^1.0.8 +dependency_overrides: + file_selector: ^1.0.0 dev_dependencies: flutter_test: From 28f6539edfeb6c78f3480e91ad28871fe05b090c Mon Sep 17 00:00:00 2001 From: sonle Date: Mon, 21 Aug 2023 18:19:17 +0700 Subject: [PATCH 043/176] feat: update to the latest at_client_mobile package --- packages/at_onboarding_flutter/CHANGELOG.md | 3 +++ packages/at_onboarding_flutter/pubspec.yaml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index d1a6699d7..089d357f5 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 6.1.3 +- **CHORE**: Updated at_client_mobile package to fix onboarding issue on Windows + ## 6.1.2 - **CHORE**: Update to support Dart 3 diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 23930e166..ab983a21d 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.2 +version: 6.1.3 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 @@ -39,7 +39,7 @@ dependencies: at_backupkey_flutter: ^4.0.10 at_client: ^3.0.64 - at_client_mobile: ^3.2.11 + at_client_mobile: ^3.2.12 at_commons: ^3.0.53 at_server_status: ^1.0.3 at_utils: ^3.0.15 From a9461445fcc014d3c95534c1674a3d2f546bc044 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 10:50:07 +0000 Subject: [PATCH 044/176] build(deps): bump actions/checkout from 3.5.3 to 3.6.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/c85c95e3d7251135ab7dc9ce3241c5835cc595a9...f43a0e5ff2bd294095638e18286ca9a3d1956744) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 9c82bf87c..087007e26 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false From 7fbd6b6432ffa243507b8cd2ce8dd7c5e3ac3245 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Fri, 1 Sep 2023 14:39:53 +0100 Subject: [PATCH 045/176] ci: Add dependency checker and static analysis --- .github/workflows/codeql.yml | 78 +++++++++++++++++++++++++ .github/workflows/dependency-review.yml | 27 +++++++++ 2 files changed, 105 insertions(+) create mode 100644 .github/workflows/codeql.yml create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..41c2240b0 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,78 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: ["trunk"] + pull_request: + # The branches below must be a subset of the branches above + branches: ["trunk"] + schedule: + - cron: "0 0 * * 1" + +permissions: + contents: read + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: ["python"] + # CodeQL supports [ $supported-codeql-languages ] + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Harden Runner + uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1 + with: + egress-policy: audit + + - name: Checkout repository + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + with: + category: "/language:${{matrix.language}}" diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 000000000..3f5e9c0a5 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,27 @@ +# Dependency Review Action +# +# This Action will scan dependency manifest files that change as part of a Pull Request, +# surfacing known-vulnerable versions of the packages declared or updated in the PR. +# Once installed, if the workflow run is marked as required, +# PRs introducing known-vulnerable packages will be blocked from merging. +# +# Source repository: https://github.com/actions/dependency-review-action +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: Harden Runner + uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1 + with: + egress-policy: audit + + - name: 'Checkout Repository' + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - name: 'Dependency Review' + uses: actions/dependency-review-action@7d90b4f05fea31dde1c4a1fb3fa787e197ea93ab # v3.0.7 From c333c3ab7f2655670c902434ebe3eba29880c9fb Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Fri, 1 Sep 2023 14:49:16 +0100 Subject: [PATCH 046/176] ci: Remove (Python only) static analysis --- .github/workflows/codeql.yml | 78 ------------------------------------ 1 file changed, 78 deletions(-) delete mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 41c2240b0..000000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,78 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: ["trunk"] - pull_request: - # The branches below must be a subset of the branches above - branches: ["trunk"] - schedule: - - cron: "0 0 * * 1" - -permissions: - contents: read - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: ["python"] - # CodeQL supports [ $supported-codeql-languages ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Harden Runner - uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1 - with: - egress-policy: audit - - - name: Checkout repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 - with: - category: "/language:${{matrix.language}}" From 765815a3c68e595c14d746c1d66d57c3e2918f28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:28:29 +0000 Subject: [PATCH 047/176] build(deps): bump actions/checkout from 3.5.3 to 3.6.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.3...f43a0e5ff2bd294095638e18286ca9a3d1956744) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 3f5e9c0a5..a9c7fbec4 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: 'Dependency Review' uses: actions/dependency-review-action@7d90b4f05fea31dde1c4a1fb3fa787e197ea93ab # v3.0.7 From 39344a95358cbfff6053bdc7d708085fb0a03c5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:32:00 +0000 Subject: [PATCH 048/176] build(deps): bump actions/dependency-review-action from 3.0.7 to 3.0.8 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.0.7 to 3.0.8. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/7d90b4f05fea31dde1c4a1fb3fa787e197ea93ab...f6fff72a3217f580d5afd49a46826795305b63c7) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a9c7fbec4..1945848a2 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: 'Dependency Review' - uses: actions/dependency-review-action@7d90b4f05fea31dde1c4a1fb3fa787e197ea93ab # v3.0.7 + uses: actions/dependency-review-action@f6fff72a3217f580d5afd49a46826795305b63c7 # v3.0.8 From f3caa1be97a340ee8079b4119db2ebbcfd733480 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 10:29:38 +0000 Subject: [PATCH 049/176] build(deps): bump actions/checkout from 3.6.0 to 4.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/f43a0e5ff2bd294095638e18286ca9a3d1956744...3df4ab11eba7bda6032a0b82a6bb43b11571feac) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/scorecards.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 1945848a2..d06526571 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: 'Dependency Review' uses: actions/dependency-review-action@f6fff72a3217f580d5afd49a46826795305b63c7 # v3.0.8 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 087007e26..31d124e60 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false From fd36b74ae574a1c9d0becc37b9de12ddac0abef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:27:45 +0000 Subject: [PATCH 050/176] build(deps): bump actions/upload-artifact from 3.1.2 to 3.1.3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/0b7f8abb1508181956e8e162db84b466c27e18ce...a8a3f3ad30e3422c9c7b888a15615d19a852ae32) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 31d124e60..64917873e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: SARIF file path: results.sarif From b707f3a42ab1c3ee109851234fe0b6a9cc5c1853 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 10:06:32 +0000 Subject: [PATCH 051/176] build(deps): bump actions/dependency-review-action from 3.0.8 to 3.1.0 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.0.8 to 3.1.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/f6fff72a3217f580d5afd49a46826795305b63c7...6c5ccdad469c9f8a2996bfecaec55a631a347034) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d06526571..ee8c1c249 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: 'Dependency Review' - uses: actions/dependency-review-action@f6fff72a3217f580d5afd49a46826795305b63c7 # v3.0.8 + uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0 From 8f4ce3b4e7e4f2a67e1d7b66108151ef5e6dd11e Mon Sep 17 00:00:00 2001 From: Xavier Chanthavong Date: Wed, 13 Sep 2023 12:20:43 +0800 Subject: [PATCH 052/176] ci: Create melos_bootstrap.yaml --- .github/workflows/melos_bootstrap.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/melos_bootstrap.yaml diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml new file mode 100644 index 000000000..2a228e301 --- /dev/null +++ b/.github/workflows/melos_bootstrap.yaml @@ -0,0 +1,16 @@ +name: 'Melos bootstrap' +on: [pull_request] + +permissions: + contents: read + +jobs: + melos-bootstrap: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f # v1.5.0 + - name: dart pub get + run: dart pub get + - name: Do melos bootstrap + run: dart run melos bootstrap From 249d031aca8e702f6d7f9d564b9ffc8d094b1697 Mon Sep 17 00:00:00 2001 From: Xavier Chanthavong Date: Wed, 13 Sep 2023 12:27:16 +0800 Subject: [PATCH 053/176] ci: Use flutter for melos_bootstrap.yaml --- .github/workflows/melos_bootstrap.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index 2a228e301..b346f7cdb 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,8 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f # v1.5.0 - - name: dart pub get - run: dart pub get + - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0 + with: + channel: "stable" + - name: flutter pub get + run: flutter pub get - name: Do melos bootstrap run: dart run melos bootstrap From c402858ed451be055fe03e566a70319f2544d6ec Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 17:00:32 +0800 Subject: [PATCH 054/176] 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 055/176] 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 056/176] 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 057/176] 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 058/176] 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 059/176] 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 060/176] 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 061/176] 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 062/176] 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 063/176] 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 064/176] 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 065/176] 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 330cd2b57abc07d3517164cae98cd4a99c215dcd Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 22:27:46 +0800 Subject: [PATCH 066/176] fix: add atkey file definition to fix onboarding on macos --- .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/ios/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/ios/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ packages/at_onboarding_flutter/README.md | 43 +++++++++++++++---- .../example/macos/Podfile.lock | 31 +++++++------ .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ .../example/macos/Runner/Info.plist | 22 ++++++++++ 18 files changed, 364 insertions(+), 22 deletions(-) diff --git a/packages/at_backupkey_flutter/example/macos/Runner/Info.plist b/packages/at_backupkey_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_backupkey_flutter/example/macos/Runner/Info.plist +++ b/packages/at_backupkey_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_chat_flutter/example/macos/Runner/Info.plist b/packages/at_chat_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_chat_flutter/example/macos/Runner/Info.plist +++ b/packages/at_chat_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_common_flutter/example/macos/Runner/Info.plist b/packages/at_common_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_common_flutter/example/macos/Runner/Info.plist +++ b/packages/at_common_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_contacts_flutter/example/macos/Runner/Info.plist b/packages/at_contacts_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_contacts_flutter/example/macos/Runner/Info.plist +++ b/packages/at_contacts_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_contacts_group_flutter/example/macos/Runner/Info.plist b/packages/at_contacts_group_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_contacts_group_flutter/example/macos/Runner/Info.plist +++ b/packages/at_contacts_group_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_events_flutter/example/macos/Runner/Info.plist b/packages/at_events_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_events_flutter/example/macos/Runner/Info.plist +++ b/packages/at_events_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_follows_flutter/example/ios/Runner/Info.plist b/packages/at_follows_flutter/example/ios/Runner/Info.plist index ba1a2bd3c..34874e7ff 100644 --- a/packages/at_follows_flutter/example/ios/Runner/Info.plist +++ b/packages/at_follows_flutter/example/ios/Runner/Info.plist @@ -45,5 +45,27 @@ UIApplicationSupportsIndirectInputEvents + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_invitation_flutter/example/macos/Runner/Info.plist b/packages/at_invitation_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_invitation_flutter/example/macos/Runner/Info.plist +++ b/packages/at_invitation_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_location_flutter/example/macos/Runner/Info.plist b/packages/at_location_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_location_flutter/example/macos/Runner/Info.plist +++ b/packages/at_location_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_login_flutter/example/ios/Runner/Info.plist b/packages/at_login_flutter/example/ios/Runner/Info.plist index f60084dd6..02157ec1b 100644 --- a/packages/at_login_flutter/example/ios/Runner/Info.plist +++ b/packages/at_login_flutter/example/ios/Runner/Info.plist @@ -45,5 +45,27 @@ UIApplicationSupportsIndirectInputEvents + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_notify_flutter/example/macos/Runner/Info.plist b/packages/at_notify_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_notify_flutter/example/macos/Runner/Info.plist +++ b/packages/at_notify_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_onboarding_flutter/README.md b/packages/at_onboarding_flutter/README.md index 22914c212..43ce0f58c 100644 --- a/packages/at_onboarding_flutter/README.md +++ b/packages/at_onboarding_flutter/README.md @@ -136,6 +136,33 @@ and add the following keys: ``` +Then to ensure that the .atKeys file type is supported by macOS, open +macos/Runner/Info.plist and add the following array: +``` +UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + +``` + ### 3. Migration guide @@ -153,14 +180,14 @@ and add the following keys: ## Usage -| Parameters | Description | -| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- | -| domain | Domain can differ based on the environment you are using.Default the plugin connects to 'root.atsign.org' to perform onboarding. | -| atClientPreference | The atClientPreference to continue with the onboarding. | -| rootEnvironment | Permission to access the device's location is allowed even when the App is running in the background. | -| appAPIKey | API authentication key for getting free atsigns. | -| isSwitchingAtsign | Param specifies whether this action is switching atsign or not. Default is false | -| atsign | The atsign name when change the primary atsign. Default is null | +| Parameters | Description | +| ------------------ | -------------------------------------------------------------------------------------------------------------------------------- | +| domain | Domain can differ based on the environment you are using.Default the plugin connects to 'root.atsign.org' to perform onboarding. | +| atClientPreference | The atClientPreference to continue with the onboarding. | +| rootEnvironment | Permission to access the device's location is allowed even when the App is running in the background. | +| appAPIKey | API authentication key for getting free atsigns. | +| isSwitchingAtsign | Param specifies whether this action is switching atsign or not. Default is false | +| atsign | The atsign name when change the primary atsign. Default is null | ```dart TextButton diff --git a/packages/at_onboarding_flutter/example/macos/Podfile.lock b/packages/at_onboarding_flutter/example/macos/Podfile.lock index 46aac45b2..bc434a2a8 100644 --- a/packages/at_onboarding_flutter/example/macos/Podfile.lock +++ b/packages/at_onboarding_flutter/example/macos/Podfile.lock @@ -3,14 +3,17 @@ PODS: - FlutterMacOS - biometric_storage (0.0.1): - FlutterMacOS + - device_info_plus (0.0.1): + - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - package_info_plus (0.0.1): - FlutterMacOS - - path_provider_macos (0.0.1): + - path_provider_foundation (0.0.1): + - Flutter - FlutterMacOS - - share_plus_macos (0.0.1): + - share_plus (0.0.1): - FlutterMacOS - shared_preferences_foundation (0.0.1): - Flutter @@ -21,11 +24,12 @@ PODS: DEPENDENCIES: - at_file_saver (from `Flutter/ephemeral/.symlinks/plugins/at_file_saver/macos`) - biometric_storage (from `Flutter/ephemeral/.symlinks/plugins/biometric_storage/macos`) + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`) - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) @@ -34,16 +38,18 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/at_file_saver/macos biometric_storage: :path: Flutter/ephemeral/.symlinks/plugins/biometric_storage/macos + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos file_selector_macos: :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos FlutterMacOS: :path: Flutter/ephemeral package_info_plus: :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos - path_provider_macos: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos - share_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + share_plus: + :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos shared_preferences_foundation: :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin url_launcher_macos: @@ -52,12 +58,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: at_file_saver: 1fc6ed722f17c7a20ce79cce168d1100fcad4b95 biometric_storage: 43caa6e7ef00e8e19c074216e7e1786dacda9e76 - file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6 + device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f + file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 - share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4 - shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 diff --git a/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj b/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj index b37baf503..d0f70dfa6 100644 --- a/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/project.pbxproj @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { diff --git a/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index fb7259e17..83d887283 100644 --- a/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_onboarding_flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_sync_ui_flutter/example/macos/Runner/Info.plist b/packages/at_sync_ui_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_sync_ui_flutter/example/macos/Runner/Info.plist +++ b/packages/at_sync_ui_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + diff --git a/packages/at_theme_flutter/example/macos/Runner/Info.plist b/packages/at_theme_flutter/example/macos/Runner/Info.plist index 4789daa6a..96349e965 100644 --- a/packages/at_theme_flutter/example/macos/Runner/Info.plist +++ b/packages/at_theme_flutter/example/macos/Runner/Info.plist @@ -28,5 +28,27 @@ MainMenu NSPrincipalClass NSApplication + UTImportedTypeDeclarations + + + UTTypeIdentifier + com.atsign.atkeys + UTTypeConformsTo + + public.json + + UTTypeDescription + Atsign Cryptographic Key File + UTTypeTagSpecification + + public.filename-extension + + atkeys + + + UTTypeReferenceURL + https://github.com/atsign-foundation/at_protocol + + From 2700f28e4e0485bbef365a2be95d840766c17d28 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 22:30:16 +0800 Subject: [PATCH 067/176] chore: explicitly add UTIs for macOS --- .../lib/screen/at_onboarding_home_screen.dart | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index a31a40fe5..2c5c37601 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -521,19 +521,15 @@ class _AtOnboardingHomeScreenState extends State { Future _desktopKeyPicker() async { try { - // ignore: prefer_const_constructors - XTypeGroup typeGroup = XTypeGroup( - label: 'images', - // ignore: prefer_const_literals_to_create_immutables - extensions: ['atKeys'], + XFile? file = await openFile( + acceptedTypeGroups: const [ + // General file extensions + XTypeGroup(extensions: ['atKeys', 'atkeys']), + // Apple specific UTIs + XTypeGroup(uniformTypeIdentifiers: ['com.atsign.atkeys']), + ], ); - List files = - await openFiles(acceptedTypeGroups: [typeGroup]); - if (files.isEmpty) { - return null; - } - XFile file = files[0]; - return file.path; + return file?.path; } catch (e) { _logger.severe('Error in desktopImagePicker $e'); return null; From 6614d2060f7bda629c245c66bcfa07be9b1b067e Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Wed, 13 Sep 2023 22:30:41 +0800 Subject: [PATCH 068/176] format: remove whitespace in at_onboarding.dart --- .../lib/at_onboarding.dart | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart index e115b050a..38b7a6fb0 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding.dart @@ -12,7 +12,6 @@ import 'package:at_onboarding_flutter/services/onboarding_service.dart'; import 'package:at_onboarding_flutter/utils/at_onboarding_app_constants.dart'; import 'package:flutter/material.dart'; - class AtOnboarding { /// Using this function to get onboard atsing. /// @@ -65,12 +64,12 @@ class AtOnboarding { if (result is AtOnboardingResult) { return result; - } - + } + return AtOnboardingResult.cancelled(); - } + } - if (context.mounted){ + if (context.mounted) { final result = await Navigator.push( context, MaterialPageRoute( @@ -80,7 +79,7 @@ class AtOnboarding { ); }, ), - ); + ); if (result is AtOnboardingResult) { //Update primary atsign after onboard success @@ -89,7 +88,7 @@ class AtOnboarding { await changePrimaryAtsign(atsign: result.atsign!); } return result; - } + } } return AtOnboardingResult.cancelled(); @@ -101,8 +100,8 @@ class AtOnboarding { }) async { /// Initial Setup await _initialSetup(context); - - if(context.mounted){ + + if (context.mounted) { final result = await Navigator.push( context, MaterialPageRoute( @@ -119,7 +118,7 @@ class AtOnboarding { return result; } } - + return AtOnboardingResult.cancelled(); } @@ -135,7 +134,7 @@ class AtOnboarding { /// Initial Setup await _initialSetup(context); - if(context.mounted){ + if (context.mounted) { final result = await Navigator.push(context, MaterialPageRoute(builder: (BuildContext context) { return AtOnboardingResetScreen(config: config); From fd8bea3af5ffa08374950d87d5a9a9bcab4387a6 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Thu, 21 Sep 2023 15:39:07 +0800 Subject: [PATCH 069/176] 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 070/176] 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 071/176] 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 072/176] 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 073/176] 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; }); } } From c85bd7f6e7d9d61fe0e80124d1e906e08823acd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 10:53:40 +0000 Subject: [PATCH 074/176] build(deps): bump actions/checkout from 4.0.0 to 4.1.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/3df4ab11eba7bda6032a0b82a6bb43b11571feac...8ade135a41bc03ea155e62e844d188df1ea18608) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/scorecards.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index ee8c1c249..4df80eaec 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: 'Dependency Review' uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0 diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index b346f7cdb..3cd4ccced 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -8,7 +8,7 @@ jobs: melos-bootstrap: runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0 with: channel: "stable" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 64917873e..97088aec1 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: persist-credentials: false From 9d56a02737e5595139f39195921683d6e6d935e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:48:18 +0000 Subject: [PATCH 075/176] build(deps): bump leonsteinhaeuser/project-beta-automations Bumps [leonsteinhaeuser/project-beta-automations](https://github.com/leonsteinhaeuser/project-beta-automations) from 2.1.0 to 2.2.1. - [Release notes](https://github.com/leonsteinhaeuser/project-beta-automations/releases) - [Commits](https://github.com/leonsteinhaeuser/project-beta-automations/compare/d1c1261558118c0876fdb2b57a649303925e5a70...939000fb1900c9fc4f7b5058a09d9f833ebc6859) --- updated-dependencies: - dependency-name: leonsteinhaeuser/project-beta-automations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/autobug.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobug.yaml b/.github/workflows/autobug.yaml index 3463b88c9..a753a507e 100644 --- a/.github/workflows/autobug.yaml +++ b/.github/workflows/autobug.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Move issue to "Triage"' - uses: leonsteinhaeuser/project-beta-automations@d1c1261558118c0876fdb2b57a649303925e5a70 # v2.1.0 + uses: leonsteinhaeuser/project-beta-automations@939000fb1900c9fc4f7b5058a09d9f833ebc6859 # v2.2.1 with: gh_token: ${{ secrets.MY_GITHUB_TOKEN }} organization: atsign-foundation From e561f502f3b8a2ee80d528d5cb4ad204a7d7ee23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:39:04 +0000 Subject: [PATCH 076/176] build(deps): bump step-security/harden-runner from 2.5.1 to 2.6.0 Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.5.1 to 2.6.0. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/8ca2b8b2ece13480cda6dacd3511b49857a23c09...1b05615854632b887b69ae1be8cbefe72d3ae423) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 4df80eaec..dc49c09bc 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1 + uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0 with: egress-policy: audit From d85ad925f7021b5fd7589f63bf36a53eab356330 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:10:05 +0000 Subject: [PATCH 077/176] build(deps): bump ossf/scorecard-action from 2.2.0 to 2.3.0 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/08b4669551908b1024bb425080c797723083c031...483ef80eb98fb506c348f7d62e28055e49fe2398) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 97088aec1..96ad44a39 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -37,7 +37,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0 + uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0 with: results_file: results.sarif results_format: sarif From a2af0af1cc88232240f26c4855e3454c560e0158 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:11:07 +0000 Subject: [PATCH 078/176] build(deps): bump actions/checkout from 4.1.0 to 4.1.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8ade135a41bc03ea155e62e844d188df1ea18608...b4ffde65f46336ab88eb53be808477a3936bae11) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/scorecards.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index dc49c09bc..104d2718a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0 diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index 3cd4ccced..c355289e0 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -8,7 +8,7 @@ jobs: melos-bootstrap: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0 with: channel: "stable" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 96ad44a39..bff3cb9a0 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false From 62447dc690729692a9eeda2009066cfb3c47a2ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:20:29 +0000 Subject: [PATCH 079/176] build(deps): bump subosito/flutter-action from 2.10.0 to 2.11.0 Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/48cafc24713cca54bbe03cdc3a423187d413aafa...cc97e1648fff6ca5cc647fa67f47e70f7895510b) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/melos_bootstrap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index c355289e0..207886e8c 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0 + - uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0 with: channel: "stable" - name: flutter pub get From 4aa0d9aa3d0f5b31a6a63719e6d5cbff38dabe31 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 19 Oct 2023 15:57:27 +0530 Subject: [PATCH 080/176] fix: fixed tutorial_caoch_mark issue in at_omboarding --- .../at_onboarding_flutter/example/ios/Podfile.lock | 6 +++--- .../macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- packages/at_onboarding_flutter/example/pubspec.yaml | 4 ++-- .../lib/screen/at_onboarding_generate_screen.dart | 7 ++++++- .../lib/screen/at_onboarding_home_screen.dart | 10 ++++++++-- packages/at_onboarding_flutter/pubspec.yaml | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/at_onboarding_flutter/example/ios/Podfile.lock b/packages/at_onboarding_flutter/example/ios/Podfile.lock index 265eebed6..912368ca6 100644 --- a/packages/at_onboarding_flutter/example/ios/Podfile.lock +++ b/packages/at_onboarding_flutter/example/ios/Podfile.lock @@ -141,7 +141,7 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: ce3938a0df3cc1ef404671531facef740d03f920 @@ -149,12 +149,12 @@ SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 - share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 diff --git a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 508252dd8..591d027b4 100644 --- a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_onboarding_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_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index e59328e0d..781d137f1 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -29,8 +29,6 @@ environment: dependencies: at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 - at_onboarding_flutter: - path: ../packages/at_onboarding_flutter cupertino_icons: ^1.0.6 flutter: sdk: flutter @@ -45,6 +43,8 @@ dev_dependencies: dependency_overrides: intl: ^0.17.0 + at_onboarding_flutter: + path: ../ # 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/lib/screen/at_onboarding_generate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart index 72667811a..1734d5ec4 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart @@ -106,10 +106,15 @@ class _AtOnboardingGenerateScreenState paddingFocus: 10, opacityShadow: 0.8, onFinish: _endTutorial, - onSkip: _endTutorial, + onSkip: skipTutorial, )..show(context: context); } + bool skipTutorial() { + _endTutorial(); + return true; + } + void _endTutorial() async { var tutorialInfo = await AtOnboardingTutorialService.getTutorialInfo(); tutorialInfo ??= AtTutorialServiceInfo(); diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index 2c5c37601..e0cf329bb 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -101,7 +101,8 @@ class _AtOnboardingHomeScreenState extends State { void _init() async { initTargets(); - await _checkShowTutorial(); + _showTutorial(); + // await _checkShowTutorial(); } Future _checkShowTutorial() async { @@ -139,10 +140,15 @@ class _AtOnboardingHomeScreenState extends State { paddingFocus: 10, opacityShadow: 0.8, onFinish: _endTutorial, - onSkip: _endTutorial, + onSkip: skipTutorial, )..show(context: context); } + bool skipTutorial() { + _endTutorial(); + return true; + } + void _endTutorial() async { var tutorialInfo = await AtOnboardingTutorialService.getTutorialInfo(); tutorialInfo ??= AtTutorialServiceInfo(); diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index aeb450f8d..3e590adfa 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: pin_code_fields: ^8.0.1 qr_code_scanner: ^1.0.1 shared_preferences: ^2.2.1 - tutorial_coach_mark: ^1.2.9 + tutorial_coach_mark: ^1.2.11 url_launcher: ^6.1.14 webview_flutter: ^4.2.4 zxing2: ^0.2.0 From 8c2aac869f1a321fb5add1924c952183dabf8686 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 19 Oct 2023 16:08:24 +0530 Subject: [PATCH 081/176] chore: removed test code --- .../lib/screen/at_onboarding_home_screen.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index e0cf329bb..d6b0ba8ff 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -101,8 +101,7 @@ class _AtOnboardingHomeScreenState extends State { void _init() async { initTargets(); - _showTutorial(); - // await _checkShowTutorial(); + await _checkShowTutorial(); } Future _checkShowTutorial() async { From 68d712014f30e97e905d1afdbdd7fbda969ec825 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 19 Oct 2023 16:22:05 +0530 Subject: [PATCH 082/176] chore: updated version and changelog --- packages/at_onboarding_flutter/CHANGELOG.md | 3 +++ packages/at_onboarding_flutter/pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index afcbb0de6..24b597dee 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 6.1.3 +- **CHORE**: Updated tutorial_coach_mark from 1.2.9 to 1.2.11 + ## 6.1.4 - **CHORE**: Bumped all dependency versions - Major version increase of permission_handler from ^10.4.3 to ^11.0.0 diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 3e590adfa..80ba97cb8 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.4 +version: 6.1.5 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 From f6ba14ea7a42e0f4a087d8f5b3d0be8534deec3c Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 19 Oct 2023 16:23:59 +0530 Subject: [PATCH 083/176] chore: changelog --- packages/at_onboarding_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index 24b597dee..de0ecad23 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,4 +1,4 @@ -## 6.1.3 +## 6.1.5 - **CHORE**: Updated tutorial_coach_mark from 1.2.9 to 1.2.11 ## 6.1.4 From 9dc6d52ea6a0079372871118898d670eb8bf9ee5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:04:37 +0000 Subject: [PATCH 084/176] build(deps): bump ossf/scorecard-action from 2.3.0 to 2.3.1 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/483ef80eb98fb506c348f7d62e28055e49fe2398...0864cf19026789058feabb7e87baa5f140aac736) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index bff3cb9a0..dff448973 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -37,7 +37,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0 + uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 with: results_file: results.sarif results_format: sarif From 1c79b22b7f055c9cda88862616cfc059f2386f9a Mon Sep 17 00:00:00 2001 From: sonle Date: Thu, 26 Oct 2023 18:06:08 +0700 Subject: [PATCH 085/176] feat: add dart doc for at_onboarding_flutter package --- .../lib/screen/at_onboarding_accounts_screen.dart | 9 +++++---- .../lib/screen/at_onboarding_activate_screen.dart | 7 ++++++- .../lib/screen/at_onboarding_backup_screen.dart | 2 ++ .../lib/screen/at_onboarding_generate_screen.dart | 6 ++++++ .../lib/screen/at_onboarding_home_screen.dart | 12 +++++++++++- .../screen/at_onboarding_input_atsign_screen.dart | 2 ++ .../lib/screen/at_onboarding_intro_screen.dart | 2 ++ .../lib/screen/at_onboarding_otp_screen.dart | 12 +++++++++++- .../lib/screen/at_onboarding_pair_screen.dart | 7 ++++++- .../lib/screen/at_onboarding_qrcode_screen.dart | 6 ++++++ .../lib/screen/at_onboarding_reference_screen.dart | 7 +++++++ .../lib/screen/at_onboarding_reset_screen.dart | 4 ++-- .../lib/screen/at_onboarding_start_screen.dart | 2 ++ .../lib/screen/at_onboarding_webview_screen.dart | 4 ++++ 14 files changed, 72 insertions(+), 10 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart index b0d7e2dcb..155ca324d 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart @@ -4,17 +4,18 @@ import 'package:at_onboarding_flutter/utils/at_onboarding_dimens.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:flutter/material.dart'; -/// This screen shows the list of atsigns already available for the given email +/// This screen shows the list of atSign already available for the given email class AtOnboardingAccountsScreen extends StatefulWidget { - /// list of atsigns for the email + /// list of atSign for the email final List atsigns; - /// message to display along with the atsign list + /// message to display along with the atSign list final String? message; - /// the new atsign selected in the free atsign generator + /// the new atSign selected in the free atSign generator final String? newAtsign; + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingAccountsScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart index 9c182a156..8f5775d26 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart @@ -20,10 +20,15 @@ import 'package:at_sync_ui_flutter/at_sync_material.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; +/// This screen for activating an atSign during onboarding class AtOnboardingActivateScreen extends StatefulWidget { - ///will hide webpage references. + /// If true, will hide webpage references final bool hideReferences; + + /// The atSign to be activated final String? atSign; + + /// The configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingActivateScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart index 81456847a..275ca7a11 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart @@ -9,7 +9,9 @@ import 'package:at_onboarding_flutter/utils/at_onboarding_strings.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:flutter/material.dart'; +/// This screen for backing up an @ sign key during onboarding class AtOnboardingBackupScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingBackupScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart index 1734d5ec4..fd9d1a11b 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart @@ -21,13 +21,19 @@ import 'package:flutter/material.dart'; import 'package:tutorial_coach_mark/tutorial_coach_mark.dart'; import 'package:url_launcher/url_launcher.dart'; +/// This screen for generating an new atSign key during onboarding class AtOnboardingGenerateScreen extends StatefulWidget { + /// Callback function to be called when generation is successful + /// It receives the generated atSign and its corresponding secret final Function({ required String atSign, required String secret, })? onGenerateSuccess; + /// Configuration for the onboarding process final AtOnboardingConfig config; + + /// Indicates whether the screen is navigated from the intro screen final bool isFromIntroScreen; const AtOnboardingGenerateScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index d6b0ba8ff..3af9aa9a9 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -35,15 +35,25 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:zxing2/qrcode.dart'; import 'package:image/image.dart' as img; +/// The home screen for the At Onboarding process class AtOnboardingHomeScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; - /// If true, shows the custom dialog to get an atsign + /// If true, shows the custom dialog to get an atSign final bool getAtSign; + + /// If true, hides references final bool hideReferences; + + /// If true, hides QR code scanning final bool hideQrScan; + /// Set status for onboarding process + /// Set the [onboardStatus] to OnboardingStatus.ACTIVATE by default final onboardStatus = OnboardingStatus.ACTIVATE; + + /// Specifies if the screen is being navigated from the intro screen final bool isFromIntroScreen; const AtOnboardingHomeScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart index 88ae9ba30..0dac67654 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart @@ -8,7 +8,9 @@ import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; +/// The input screen for the atSign during the At onboarding process class AtOnboardingInputAtSignScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingInputAtSignScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart index 6cca2645b..420a27a0e 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart @@ -11,7 +11,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; +/// The introductory screen for the At Onboarding process class AtOnboardingIntroScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingIntroScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart index fdce0bac0..0fd73251b 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart @@ -16,8 +16,12 @@ import 'package:flutter/services.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; import 'package:url_launcher/url_launcher.dart'; +/// Represent the result of OTP-based onboarding for an atSign class AtOnboardingOTPResult { + /// The atSign associated with the OTP result String atSign; + + /// The secret value, if available String? secret; AtOnboardingOTPResult({ @@ -26,7 +30,9 @@ class AtOnboardingOTPResult { }); } +/// This screen for perform OTP-based verification class AtOnboardingOTPScreen extends StatefulWidget { + /// Static method to navigate to this screen static Future push({ required BuildContext context, required String atSign, @@ -47,12 +53,16 @@ class AtOnboardingOTPScreen extends StatefulWidget { ); } + /// The atSign to be displayed on the OTP screen final String atSign; + + /// The email address, if provided final String? email; - ///will hide webpage references. + /// If true, will hide webpage references final bool hideReferences; + /// The configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingOTPScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart index 473e332f9..fdda12d51 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart @@ -14,17 +14,22 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:url_launcher/url_launcher.dart'; +/// This screen for pairing an atSign during onboarding process class AtOnboardingPairScreen extends StatefulWidget { + /// The atSign to be paired final String atSign; - ///will hide webpage references. + /// If true, will hide webpage references. final bool hideReferences; + /// A function to be called when the pairing is successful + /// It takes [atSign] and [secret] as required parameters final Function({ required String atSign, required String secret, })? onGenerateSuccess; + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingPairScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart index 853a630b8..cb7b0f92f 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart @@ -7,8 +7,12 @@ import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart'; +/// Represents the result of scanning a QR code during the onboarding process class AtOnboardingQRCodeResult { + /// The atSign associated with the QR result final String atSign; + + /// The secret associated with the QR result final String secret; AtOnboardingQRCodeResult({ @@ -17,7 +21,9 @@ class AtOnboardingQRCodeResult { }); } +/// The QR code screen used during the onboarding process. class AtOnboardingQRCodeScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingQRCodeScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart index 2c656c421..25ece4ba1 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart @@ -5,7 +5,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; +/// Displays onboarding reference screens class AtOnboardingReferenceScreen extends StatefulWidget { + /// Static method to navigate to this screen static push({ required BuildContext context, required String? url, @@ -24,8 +26,13 @@ class AtOnboardingReferenceScreen extends StatefulWidget { ); } + /// The URL to display on the screen final String? url; + + /// The title for the screen final String? title; + + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingReferenceScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart index 95659de90..bb777062c 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart @@ -8,9 +8,9 @@ import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart'; import 'package:flutter/material.dart'; import 'package:at_onboarding_flutter/at_onboarding_result.dart'; - - +/// The screen used for resetting the atSign keys during the onboarding process class AtOnboardingResetScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingResetScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart index d5522606e..e929e9dcb 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart @@ -13,7 +13,9 @@ import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart'; import 'package:at_sync_ui_flutter/at_sync_material.dart'; import 'package:flutter/material.dart'; +/// The starting screen for the onboarding process class AtOnboardingStartScreen extends StatefulWidget { + /// Configuration for the onboarding process final AtOnboardingConfig config; const AtOnboardingStartScreen({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart index 8ee64c826..ba1ae6589 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart @@ -3,8 +3,12 @@ import 'package:at_onboarding_flutter/localizations/generated/l10n.dart'; import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; +/// The screen for showing WebView during the onboarding process class AtOnboardingWebviewScreen extends StatefulWidget { + /// The URL to be displayed final String? url; + + /// The title of the screen final String? title; const AtOnboardingWebviewScreen({ From 43aa2894915b7820d2d713d12d369282df6bd32e Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Tue, 31 Oct 2023 17:46:30 +0530 Subject: [PATCH 086/176] docs: updated docs for onboarding screens --- .../lib/screen/at_onboarding_activate_screen.dart | 2 +- .../lib/screen/at_onboarding_backup_screen.dart | 2 +- .../lib/screen/at_onboarding_generate_screen.dart | 4 ++-- .../lib/screen/at_onboarding_home_screen.dart | 2 +- .../lib/screen/at_onboarding_input_atsign_screen.dart | 2 +- .../lib/screen/at_onboarding_intro_screen.dart | 5 ++++- .../lib/screen/at_onboarding_otp_screen.dart | 4 ++-- .../lib/screen/at_onboarding_pair_screen.dart | 2 +- .../lib/screen/at_onboarding_reference_screen.dart | 1 + .../lib/screen/at_onboarding_reset_screen.dart | 2 +- .../lib/screen/at_onboarding_webview_screen.dart | 2 +- 11 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart index 8f5775d26..7cc8575d3 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart @@ -20,7 +20,7 @@ import 'package:at_sync_ui_flutter/at_sync_material.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; -/// This screen for activating an atSign during onboarding +/// This screen is for activating an atSign during onboarding process class AtOnboardingActivateScreen extends StatefulWidget { /// If true, will hide webpage references final bool hideReferences; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart index 275ca7a11..b72cf2ea2 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_backup_screen.dart @@ -9,7 +9,7 @@ import 'package:at_onboarding_flutter/utils/at_onboarding_strings.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:flutter/material.dart'; -/// This screen for backing up an @ sign key during onboarding +/// This screen is for backing up an atKey during onboarding class AtOnboardingBackupScreen extends StatefulWidget { /// Configuration for the onboarding process final AtOnboardingConfig config; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart index fd9d1a11b..3dd2baa19 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart @@ -21,9 +21,9 @@ import 'package:flutter/material.dart'; import 'package:tutorial_coach_mark/tutorial_coach_mark.dart'; import 'package:url_launcher/url_launcher.dart'; -/// This screen for generating an new atSign key during onboarding +/// This screen is for generating atKey class AtOnboardingGenerateScreen extends StatefulWidget { - /// Callback function to be called when generation is successful + /// Callback function to be called when atKey generation is successful /// It receives the generated atSign and its corresponding secret final Function({ required String atSign, diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index 3af9aa9a9..f22a494b8 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -35,7 +35,7 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:zxing2/qrcode.dart'; import 'package:image/image.dart' as img; -/// The home screen for the At Onboarding process +/// Home screen provides multiple options like upload atKey, generate new atSign, activatte existing atSign class AtOnboardingHomeScreen extends StatefulWidget { /// Configuration for the onboarding process final AtOnboardingConfig config; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart index 0dac67654..2f7e6c6a4 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_input_atsign_screen.dart @@ -8,7 +8,7 @@ import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; -/// The input screen for the atSign during the At onboarding process +/// [AtOnboardingInputAtSignScreen] allows to enter atSign for activation process class AtOnboardingInputAtSignScreen extends StatefulWidget { /// Configuration for the onboarding process final AtOnboardingConfig config; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart index 420a27a0e..ce36e5853 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_intro_screen.dart @@ -11,7 +11,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; -/// The introductory screen for the At Onboarding process +/// The introductory screen for the at onboarding process +/// [AtOnboardingIntroScreen] gives two options +/// 1. Already have an atSign - proceeds to home screen to upload atKey +/// 2. Get a free atSign - proceeds to generate free atSign class AtOnboardingIntroScreen extends StatefulWidget { /// Configuration for the onboarding process final AtOnboardingConfig config; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart index 0fd73251b..7a37978c5 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart @@ -30,7 +30,7 @@ class AtOnboardingOTPResult { }); } -/// This screen for perform OTP-based verification +/// This screen is to perform OTP-based verification class AtOnboardingOTPScreen extends StatefulWidget { /// Static method to navigate to this screen static Future push({ @@ -630,4 +630,4 @@ class _AtOnboardingOTPScreenState extends State { }, ); } -} \ No newline at end of file +} diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart index fdda12d51..3cf44f6e7 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart @@ -14,7 +14,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:url_launcher/url_launcher.dart'; -/// This screen for pairing an atSign during onboarding process +/// This screen is for pairing an atSign during onboarding process class AtOnboardingPairScreen extends StatefulWidget { /// The atSign to be paired final String atSign; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart index 25ece4ba1..718f575c3 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reference_screen.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; /// Displays onboarding reference screens +/// It uses weview to display the [url] class AtOnboardingReferenceScreen extends StatefulWidget { /// Static method to navigate to this screen static push({ diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart index bb777062c..c6c6b7d49 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_reset_screen.dart @@ -8,7 +8,7 @@ import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart'; import 'package:flutter/material.dart'; import 'package:at_onboarding_flutter/at_onboarding_result.dart'; -/// The screen used for resetting the atSign keys during the onboarding process +/// The screen is used for resetting the paired atSign class AtOnboardingResetScreen extends StatefulWidget { /// Configuration for the onboarding process final AtOnboardingConfig config; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart index ba1ae6589..25166bf6d 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_webview_screen.dart @@ -3,7 +3,7 @@ import 'package:at_onboarding_flutter/localizations/generated/l10n.dart'; import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; -/// The screen for showing WebView during the onboarding process +/// This screen is for showing WebView during the onboarding process class AtOnboardingWebviewScreen extends StatefulWidget { /// The URL to be displayed final String? url; From 70f0e099f23e61d3d92219d45e737ea39b2cb49e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:20:41 +0000 Subject: [PATCH 087/176] build(deps): bump subosito/flutter-action from 2.11.0 to 2.12.0 Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.11.0 to 2.12.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/cc97e1648fff6ca5cc647fa67f47e70f7895510b...2783a3f08e1baf891508463f8c6653c258246225) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/melos_bootstrap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index 207886e8c..8ce44dab4 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0 + - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # v2.12.0 with: channel: "stable" - name: flutter pub get From 9a6ff3518f52d1a686692887b99d726a6b268182 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:40:05 +0000 Subject: [PATCH 088/176] build(deps): bump actions/dependency-review-action from 3.1.0 to 3.1.1 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/6c5ccdad469c9f8a2996bfecaec55a631a347034...9f45b2463b475767b61721ccfef113fef513e6aa) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 104d2718a..92d358bc1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0 + uses: actions/dependency-review-action@9f45b2463b475767b61721ccfef113fef513e6aa # v3.1.1 From 8d419ab9febccd18ca7ab8336a1be4a098b88e29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:21:49 +0000 Subject: [PATCH 089/176] build(deps): bump actions/dependency-review-action from 3.1.1 to 3.1.2 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/9f45b2463b475767b61721ccfef113fef513e6aa...fde92acd0840415674c16b39c7d703fc28bc511e) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 92d358bc1..97b8bb8d3 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@9f45b2463b475767b61721ccfef113fef513e6aa # v3.1.1 + uses: actions/dependency-review-action@fde92acd0840415674c16b39c7d703fc28bc511e # v3.1.2 From 8e54fcd65856d4805485e5c208a91d7e4cb1256c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:39:37 +0000 Subject: [PATCH 090/176] build(deps): bump actions/dependency-review-action from 3.1.2 to 3.1.3 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/fde92acd0840415674c16b39c7d703fc28bc511e...7bbfa034e752445ea40215fff1c3bf9597993d3f) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 97b8bb8d3..2b301fab5 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@fde92acd0840415674c16b39c7d703fc28bc511e # v3.1.2 + uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3 From 0da6173e63262e61c79c66eed283ca741aebdfb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:49:22 +0000 Subject: [PATCH 091/176] build(deps): bump step-security/harden-runner from 2.6.0 to 2.6.1 Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/1b05615854632b887b69ae1be8cbefe72d3ae423...eb238b55efaa70779f274895e782ed17c84f2895) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2b301fab5..ffb82342b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0 + uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1 with: egress-policy: audit From a810eba897028d96745758e7bb10c45f2fe905f8 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:50:51 +0000 Subject: [PATCH 092/176] ci: Add static analysis --- .github/workflows/static_analysis.yml | 61 +++++++ tools/osv-scanner/go.sum | 229 ++++++++++++++++++++++++++ 2 files changed, 290 insertions(+) create mode 100644 .github/workflows/static_analysis.yml create mode 100644 tools/osv-scanner/go.sum diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml new file mode 100644 index 000000000..f50fd3573 --- /dev/null +++ b/.github/workflows/static_analysis.yml @@ -0,0 +1,61 @@ +name: static_analysis +# Runs the workflow on the below events: +# 1. on pull request raised to trunk branch. +# 2. on push event to trunk branch. +on: + push: + branches: + - trunk + pull_request: + branches: + - trunk + +permissions: # added using https://github.com/step-security/secure-workflows + contents: read + +jobs: + static_analysis: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + package: + - at_backupkey_flutter + - at_chat_flutter + - at_common_flutter + - at_contacts_flutter + - at_contacts_group_flutter + - at_events_flutter + - at_follows_flutter + - at_invitation_flutter + - at_location_flutter + - at_login_flutter + - at_notify_flutter + - at_onboarding_flutter + - at_sync_ui_flutter + - at_theme_flutter + + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1.6.0 + with: + sdk: stable + - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + with: + go-version: 'stable' + cache-dependency-path: tools/osv-scanner/go.sum + + - name: Install dependencies and analyze in ${{ matrix.package }} + working-directory: packages/${{ matrix.package }} + run: | + dart pub get + dart analyze + + # Runs osv-scanner to find any vulnerable Dart dependencies + # It needs to look at pubspec.lock files, which is why it's + # placed here, as the `dart pub get` above will create them + - name: Run osv-scanner + working-directory: packages/${{ matrix.package }} + run: | + go install github.com/google/osv-scanner/cmd/osv-scanner@6316373e47d7e3e4b4fd3630c4bbc10987738de6 # v1.4.3 + osv-scanner --lockfile=./pubspec.lock \ No newline at end of file diff --git a/tools/osv-scanner/go.sum b/tools/osv-scanner/go.sum new file mode 100644 index 000000000..bd4693c2d --- /dev/null +++ b/tools/osv-scanner/go.sum @@ -0,0 +1,229 @@ +github.com/google/osv-scanner v1.4.3 h1:V+vIjrC+HsDSzq8vWok/prjXl3Xg6i8u7gpejEIkcME= +github.com/google/osv-scanner v1.4.3/go.mod h1:e2jwYUxCBQxlXlcMP7FdlmNu5XlBKA4hEhVXDBZZSzA= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +deps.dev/api/v3alpha v0.0.0-20231029115524-a2ccd033c6d4 h1:y/JsYdh5JCgcI1WtxfTYrhj48YK8DsZUHFVVtZT4Qwc= +deps.dev/api/v3alpha v0.0.0-20231029115524-a2ccd033c6d4/go.mod h1:uRN72FJn1F0FD/2ZYUOqdyFMu8VUsyHxvmZAMW30/DA= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/CycloneDX/cyclonedx-go v0.7.2 h1:kKQ0t1dPOlugSIYVOMiMtFqeXI2wp/f5DBIdfux8gnQ= +github.com/CycloneDX/cyclonedx-go v0.7.2/go.mod h1:K2bA+324+Og0X84fA8HhN2X066K7Bxz4rpMQ4ZhjtSk= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= +github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA= +github.com/anchore/go-struct-converter v0.0.0-20230627203149-c72ef8859ca9 h1:6COpXWpHbhWM1wgcQN95TdsmrLTba8KQfPgImBXzkjA= +github.com/anchore/go-struct-converter v0.0.0-20230627203149-c72ef8859ca9/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git/v5 v5.10.0 h1:F0x3xXrAWmhwtzoCokU4IMPcBdncG+HAAqi9FcOOjbQ= +github.com/go-git/go-git/v5 v5.10.0/go.mod h1:1FOZ/pQnqw24ghP2n7cunVl0ON55BsjPYvhWHvZGhoo= +github.com/goark/errs v1.3.2 h1:ifccNe1aK7Xezt4XVYwHUqalmnfhuphnEvh3FshCReQ= +github.com/goark/errs v1.3.2/go.mod h1:ZsQucxaDFVfSB8I99j4bxkDRfNOrlKINwg72QMuRWKw= +github.com/goark/go-cvss v1.6.6 h1:WJFuIWqmAw1Ilb9USv0vuX+nYzOWJp8lIujseJ/y3sU= +github.com/goark/go-cvss v1.6.6/go.mod h1:H3qbfUSUlV7XtA3EwWNunvXz6OySwWHOuO+R6ZPMQPI= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= +github.com/ianlancetaylor/demangle v0.0.0-20231023195312-e2daf7ba7156 h1:XaXfcSUnkTV/iujizC1//N5IrJA1v6KQHwMDbsZesoM= +github.com/ianlancetaylor/demangle v0.0.0-20231023195312-e2daf7ba7156/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jedib0t/go-pretty/v6 v6.4.9 h1:vZ6bjGg2eBSrJn365qlxGcaWu09Id+LHtrfDWlB2Usc= +github.com/jedib0t/go-pretty/v6 v6.4.9/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= +github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/owenrumney/go-sarif v1.1.1/go.mod h1:dNDiPlF04ESR/6fHlPyq7gHKmrM0sHUvAGjsoh8ZH0U= +github.com/owenrumney/go-sarif/v2 v2.3.0 h1:wP5yEpI53zr0v5cBmagXzLbHZp9Oylyo3AJDpfLBITs= +github.com/owenrumney/go-sarif/v2 v2.3.0/go.mod h1:MSqMMx9WqlBSY7pXoOZWgEsVB4FDNfhcaXDA1j6Sr+w= +github.com/package-url/packageurl-go v0.1.2 h1:0H2DQt6DHd/NeRlVwW4EZ4oEI6Bn40XlNPRqegcxuo4= +github.com/package-url/packageurl-go v0.1.2/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= +github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM= +github.com/spdx/gordf v0.0.0-20221230105357-b735bd5aac89 h1:dArkMwZ7Mf2JiU8OfdmqIv8QaHT4oyifLIe1UhsF1SY= +github.com/spdx/gordf v0.0.0-20221230105357-b735bd5aac89/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM= +github.com/spdx/tools-golang v0.5.3 h1:ialnHeEYUC4+hkm5vJm4qz2x+oEJbS0mAMFrNXdQraY= +github.com/spdx/tools-golang v0.5.3/go.mod h1:/ETOahiAo96Ob0/RAIBmFZw6XN0yTnyr/uFZm2NTMhI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= +github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= +github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= +github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/vuln v1.0.1 h1:KUas02EjQK5LTuIx1OylBQdKKZ9jeugs+HiqO5HormU= +golang.org/x/vuln v1.0.1/go.mod h1:bb2hMwln/tqxg32BNY4CcxHWtHXuYa3SbIBmtsyjxtM= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= From 1ab0d465fe99ba7b4ee4befdcb1d5c9da8a2a9be Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:54:27 +0000 Subject: [PATCH 093/176] fix: Use flutter rather than dart --- .github/workflows/static_analysis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index f50fd3573..24c574fa5 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -37,9 +37,9 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1.6.0 + - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # v2.12.0 with: - sdk: stable + channel: "stable" - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: go-version: 'stable' @@ -48,8 +48,8 @@ jobs: - name: Install dependencies and analyze in ${{ matrix.package }} working-directory: packages/${{ matrix.package }} run: | - dart pub get - dart analyze + flutter pub get + flutter analyze # Runs osv-scanner to find any vulnerable Dart dependencies # It needs to look at pubspec.lock files, which is why it's From 086246a07602bcfea07416ffe50ce7a7176a1321 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:58:53 +0000 Subject: [PATCH 094/176] fix: Add --no-fatal-infos flag --- .github/workflows/static_analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 24c574fa5..3bba78dbc 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -49,7 +49,7 @@ jobs: working-directory: packages/${{ matrix.package }} run: | flutter pub get - flutter analyze + flutter analyze --no-fatal-infos # Runs osv-scanner to find any vulnerable Dart dependencies # It needs to look at pubspec.lock files, which is why it's From eef5f110bd105782f02136f4bd66532fe50ec88c Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:13:52 +0000 Subject: [PATCH 095/176] fix: Dummy .env for analysis --- .github/workflows/static_analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 3bba78dbc..c69ca1503 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -48,6 +48,7 @@ jobs: - name: Install dependencies and analyze in ${{ matrix.package }} working-directory: packages/${{ matrix.package }} run: | + touch example/.env flutter pub get flutter analyze --no-fatal-infos From 2ab221aaa09f4e58199ecdc4d9328b2eda301310 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:27:30 +0000 Subject: [PATCH 096/176] ci: Supress failing packages (for now) --- .github/workflows/static_analysis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index c69ca1503..bd70b57cd 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -20,19 +20,19 @@ jobs: fail-fast: false matrix: package: - - at_backupkey_flutter - - at_chat_flutter + # at_backupkey_flutter + #- at_chat_flutter - at_common_flutter - at_contacts_flutter - at_contacts_group_flutter - at_events_flutter - - at_follows_flutter - - at_invitation_flutter - - at_location_flutter - - at_login_flutter + #- at_follows_flutter + #- at_invitation_flutter + #- at_location_flutter + #- at_login_flutter - at_notify_flutter - at_onboarding_flutter - - at_sync_ui_flutter + #- at_sync_ui_flutter - at_theme_flutter steps: From 5e234fbb1fe802f6729d02b464c71e21978ddf54 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:56:03 +0000 Subject: [PATCH 097/176] docs: Add OpenSSF Best Practices badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 305440b87..abc86c7ce 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![GitHub License](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets/badge)](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets) +[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8129/badge)](https://www.bestpractices.dev/projects/8129) # at_widgets From e238ce511f1d27e2cf735efb763c40e797330399 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:26:41 +0000 Subject: [PATCH 098/176] build(deps): bump actions/dependency-review-action from 3.1.3 to 3.1.4 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/7bbfa034e752445ea40215fff1c3bf9597993d3f...01bc87099ba56df1e897b6874784491ea6309bc4) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index ffb82342b..10eb78023 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3 + uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4 From 677a53ea4665033a9f4937680811b0419bf63583 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Tue, 28 Nov 2023 16:53:38 -0500 Subject: [PATCH 099/176] docs: Update README.md logo --- README.md | 2 +- packages/at_backupkey_flutter/README.md | 2 +- packages/at_backupkey_flutter/example/README.md | 2 +- packages/at_chat_flutter/README.md | 2 +- packages/at_chat_flutter/example/README.md | 2 +- packages/at_common_flutter/README.md | 2 +- packages/at_common_flutter/example/README.md | 2 +- packages/at_contacts_flutter/README.md | 2 +- packages/at_contacts_flutter/example/README.md | 2 +- packages/at_contacts_group_flutter/README.md | 2 +- packages/at_contacts_group_flutter/example/README.md | 2 +- packages/at_events_flutter/README.md | 2 +- packages/at_events_flutter/example/README.md | 2 +- packages/at_follows_flutter/README.md | 2 +- packages/at_invitation_flutter/README.md | 2 +- packages/at_invitation_flutter/example/README.md | 2 +- packages/at_location_flutter/README.md | 2 +- packages/at_location_flutter/example/README.md | 2 +- packages/at_login_flutter/README.md | 2 +- packages/at_notify_flutter/README.md | 2 +- packages/at_notify_flutter/example/README.md | 2 +- packages/at_onboarding_flutter/README.md | 2 +- packages/at_onboarding_flutter/example/README.md | 2 +- packages/at_sync_ui_flutter/README.md | 2 +- packages/at_sync_ui_flutter/example/README.md | 2 +- packages/at_theme_flutter/README.md | 2 +- packages/at_theme_flutter/example/README.md | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index abc86c7ce..17cecf351 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![GitHub License](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets/badge)](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets) diff --git a/packages/at_backupkey_flutter/README.md b/packages/at_backupkey_flutter/README.md index 16de94ee7..a79d732e4 100644 --- a/packages/at_backupkey_flutter/README.md +++ b/packages/at_backupkey_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_backupkey_flutter)](https://pub.dev/packages/at_backupkey_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_backupkey_flutter/example/README.md b/packages/at_backupkey_flutter/example/README.md index 60423c279..1863d079c 100644 --- a/packages/at_backupkey_flutter/example/README.md +++ b/packages/at_backupkey_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_backupkey_flutter example The at_backupkey_flutter package is designed to make it easy to take backup of secret keys in any Flutter app on the atPlatform. diff --git a/packages/at_chat_flutter/README.md b/packages/at_chat_flutter/README.md index e2af248ba..f2725b927 100644 --- a/packages/at_chat_flutter/README.md +++ b/packages/at_chat_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_chat_flutter)](https://pub.dev/packages/at_chat_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_chat_flutter/example/README.md b/packages/at_chat_flutter/example/README.md index 1a0e51054..543a5a3f2 100644 --- a/packages/at_chat_flutter/example/README.md +++ b/packages/at_chat_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # at_chat_flutter example diff --git a/packages/at_common_flutter/README.md b/packages/at_common_flutter/README.md index 5a3708ea4..352af0d1d 100644 --- a/packages/at_common_flutter/README.md +++ b/packages/at_common_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_common_flutter)](https://pub.dev/packages/at_common_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_common_flutter/example/README.md b/packages/at_common_flutter/example/README.md index 9122785d6..d816cdeb3 100644 --- a/packages/at_common_flutter/example/README.md +++ b/packages/at_common_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # at_common_flutter example diff --git a/packages/at_contacts_flutter/README.md b/packages/at_contacts_flutter/README.md index c739cad33..69bdd68d0 100644 --- a/packages/at_contacts_flutter/README.md +++ b/packages/at_contacts_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_client_mobile)](https://pub.dev/packages/at_client_mobile) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_contacts_flutter/example/README.md b/packages/at_contacts_flutter/example/README.md index 6ddb51882..b5fde802d 100644 --- a/packages/at_contacts_flutter/example/README.md +++ b/packages/at_contacts_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_contacts_flutter example The at_contacts_flutter package is designed to make it easy to manage contacts in a flutter app with the following features: diff --git a/packages/at_contacts_group_flutter/README.md b/packages/at_contacts_group_flutter/README.md index fe71c4cc8..a324af6ac 100644 --- a/packages/at_contacts_group_flutter/README.md +++ b/packages/at_contacts_group_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_contacts_group_flutter)](https://pub.dev/packages/at_contacts_group_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_contacts_group_flutter/example/README.md b/packages/at_contacts_group_flutter/example/README.md index eb7a5b9a9..19e1c2f44 100644 --- a/packages/at_contacts_group_flutter/example/README.md +++ b/packages/at_contacts_group_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_contacts_group_flutter example diff --git a/packages/at_events_flutter/README.md b/packages/at_events_flutter/README.md index a06745d3b..99005d554 100644 --- a/packages/at_events_flutter/README.md +++ b/packages/at_events_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_events_flutter)](https://pub.dev/packages/at_events_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_events_flutter/example/README.md b/packages/at_events_flutter/example/README.md index 2c2bd90c5..cb3f33ff8 100644 --- a/packages/at_events_flutter/example/README.md +++ b/packages/at_events_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_events_flutter example The [at_events_flutter] package is designed to make it easy to manage events between atsigns. diff --git a/packages/at_follows_flutter/README.md b/packages/at_follows_flutter/README.md index dc07b8938..ebe6499d6 100644 --- a/packages/at_follows_flutter/README.md +++ b/packages/at_follows_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_follows_flutter)](https://pub.dev/packages/at_follows_flutter) [![pub points](https://img.shields.io/pub/points/at_follows_flutter?logo=dart)](https://pub.dev/packages/at_follows_flutter/score) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_invitation_flutter/README.md b/packages/at_invitation_flutter/README.md index 270c0aab1..bd3c37bcd 100644 --- a/packages/at_invitation_flutter/README.md +++ b/packages/at_invitation_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_invitation_flutter)](https://pub.dev/packages/at_invitation_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_invitation_flutter/example/README.md b/packages/at_invitation_flutter/example/README.md index 8f9cffb76..3271ef30c 100644 --- a/packages/at_invitation_flutter/example/README.md +++ b/packages/at_invitation_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_invitation_flutter example diff --git a/packages/at_location_flutter/README.md b/packages/at_location_flutter/README.md index 647fa2428..1f54f77d6 100644 --- a/packages/at_location_flutter/README.md +++ b/packages/at_location_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_location_flutter)](https://pub.dev/packages/at_location_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_location_flutter/example/README.md b/packages/at_location_flutter/example/README.md index 30e597a93..629855557 100644 --- a/packages/at_location_flutter/example/README.md +++ b/packages/at_location_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_location_flutter example The [at_location_flutter] package is designed to make it easy to share/receive locations between two atsigns and also see it on a map. diff --git a/packages/at_login_flutter/README.md b/packages/at_login_flutter/README.md index 16cb06d42..2d3941f0d 100644 --- a/packages/at_login_flutter/README.md +++ b/packages/at_login_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # at_login_flutter diff --git a/packages/at_notify_flutter/README.md b/packages/at_notify_flutter/README.md index d3d896d5b..6535f3a26 100644 --- a/packages/at_notify_flutter/README.md +++ b/packages/at_notify_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_notify_flutter)](https://pub.dev/packages/at_notify_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_notify_flutter/example/README.md b/packages/at_notify_flutter/example/README.md index 1be301d84..7cf5ee661 100644 --- a/packages/at_notify_flutter/example/README.md +++ b/packages/at_notify_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_notify_flutter example The at_notify_flutter package is designed to make it easy to add notifications in atProtocol apps. diff --git a/packages/at_onboarding_flutter/README.md b/packages/at_onboarding_flutter/README.md index 43ce0f58c..e76489693 100644 --- a/packages/at_onboarding_flutter/README.md +++ b/packages/at_onboarding_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_onboarding_flutter)](https://pub.dev/packages/at_onboarding_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_onboarding_flutter/example/README.md b/packages/at_onboarding_flutter/example/README.md index 7d8236db7..761d98c8c 100644 --- a/packages/at_onboarding_flutter/example/README.md +++ b/packages/at_onboarding_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_onboarding_flutter example The at_onboarding_flutter package is designed to make it easy to add onboarding flow to a flutter app on atPlatform with the following features: diff --git a/packages/at_sync_ui_flutter/README.md b/packages/at_sync_ui_flutter/README.md index 96babb2e5..8ee69c02b 100644 --- a/packages/at_sync_ui_flutter/README.md +++ b/packages/at_sync_ui_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_sync_ui_flutter)](https://pub.dev/packages/at_sync_ui_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_sync_ui_flutter/example/README.md b/packages/at_sync_ui_flutter/example/README.md index 531380c43..d7b00b5e9 100644 --- a/packages/at_sync_ui_flutter/example/README.md +++ b/packages/at_sync_ui_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_sync_ui_flutter example The [at_sync_ui_flutter] package is designed to make it easy for displaying status of sync process in atProtocol apps. diff --git a/packages/at_theme_flutter/README.md b/packages/at_theme_flutter/README.md index c984dfb8a..0b1e2a68a 100644 --- a/packages/at_theme_flutter/README.md +++ b/packages/at_theme_flutter/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation [![pub package](https://img.shields.io/pub/v/at_theme_flutter)](https://pub.dev/packages/at_theme_flutter) [![](https://img.shields.io/static/v1?label=Backend&message=atPlatform&color=)](https://atsign.dev) [![](https://img.shields.io/static/v1?label=Publisher&message=Atsign&color=F05E3E)](https://atsign.com) [![gitHub license](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) diff --git a/packages/at_theme_flutter/example/README.md b/packages/at_theme_flutter/example/README.md index 841ab9768..2227e3716 100644 --- a/packages/at_theme_flutter/example/README.md +++ b/packages/at_theme_flutter/example/README.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_theme_flutter example From a96fd46b0f5f00e7ea551695bb4ad5c02a298f58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 10:08:55 +0000 Subject: [PATCH 100/176] build(deps): bump actions/setup-go from 4.1.0 to 5.0.0 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/93397bea11091df50f3d7e59dc26a7711a8bcfbe...0c52d547c9bc32b1aa3301fd7a9cb496313a4491) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/static_analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index bd70b57cd..35bca164d 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -40,7 +40,7 @@ jobs: - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # v2.12.0 with: channel: "stable" - - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: go-version: 'stable' cache-dependency-path: tools/osv-scanner/go.sum From ac7f0e798e8eb46e66bfd7cb748714a0dee207e1 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 13 Dec 2023 15:04:00 +0530 Subject: [PATCH 101/176] fix: optimized initContactService method --- .../lib/services/contact_service.dart | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/at_contacts_flutter/lib/services/contact_service.dart b/packages/at_contacts_flutter/lib/services/contact_service.dart index 48faa276f..106fa834a 100644 --- a/packages/at_contacts_flutter/lib/services/contact_service.dart +++ b/packages/at_contacts_flutter/lib/services/contact_service.dart @@ -111,7 +111,8 @@ class ContactService { List allContactsList = []; Future initContactsService( - String rootDomainFromApp, int rootPortFromApp) async { + String rootDomainFromApp, int rootPortFromApp, + {bool fetchContacts = true}) async { loggedInUserDetails = null; rootDomain = rootDomainFromApp; rootPort = rootPortFromApp; @@ -119,9 +120,11 @@ class ContactService { currentAtsign = atClientManager.atClient.getCurrentAtSign()!; atContactImpl = await AtContactsImpl.getInstance(currentAtsign); loggedInUserDetails = await getAtSignDetails(currentAtsign); - cachedContactList = await atContactImpl.listContacts(); - await fetchContactList(); - await fetchBlockContactList(); + if (fetchContacts) { + cachedContactList = await atContactImpl.listContacts(); + await fetchContactList(); + await fetchBlockContactList(); + } } void resetData() { From 74ed83458d16e2bf5b8c6692a7b9e67ae31d6d9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 10:16:53 +0000 Subject: [PATCH 102/176] build(deps): bump actions/upload-artifact from 3.1.3 to 4.0.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.3 to 4.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/a8a3f3ad30e3422c9c7b888a15615d19a852ae32...c7d193f32edcb7bfad88892161225aeda64e9392) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index dff448973..b11b8adf7 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: name: SARIF file path: results.sarif From 972855cc64fabb78757638b26dc657c4593d51a6 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 21 Dec 2023 14:45:45 +0530 Subject: [PATCH 103/176] fix: fixed profile picture fetch methods --- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../lib/services/contact_service.dart | 53 ++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 508252dd8..591d027b4 100644 --- a/packages/at_contacts_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/at_contacts_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_contacts_flutter/lib/services/contact_service.dart b/packages/at_contacts_flutter/lib/services/contact_service.dart index 106fa834a..d5fe7fe33 100644 --- a/packages/at_contacts_flutter/lib/services/contact_service.dart +++ b/packages/at_contacts_flutter/lib/services/contact_service.dart @@ -574,7 +574,11 @@ class ContactService { key.metadata?.isBinary = true; key.key = contactFields[2]; Uint8List? image; - var result = await atClientManager.atClient.get(key); + + GetRequestOptions options = GetRequestOptions(); + options.bypassCache = true; + var result = + await atClientManager.atClient.get(key, getRequestOptions: options); if (result.value != null) { try { @@ -595,6 +599,53 @@ class ContactService { return contactDetails; } + getProfilePicture(String atsign) async { + var contactDetails = {}; + + var metadata = Metadata(); + metadata.isPublic = true; + metadata.namespaceAware = false; + var key = AtKey(); + key.sharedBy = atsign; + key.metadata = metadata; + // making isPublic true (as get method changes it to false) + key.metadata?.isBinary = true; + key.key = "image.wavi"; + + GetRequestOptions options = GetRequestOptions(); + options.bypassCache = true; + var result = + await atClientManager.atClient.get(key, getRequestOptions: options); + + if (result.value != null) { + try { + List intList = result.value.cast(); + var image = Uint8List.fromList(intList); + contactDetails['image'] = image; + return contactDetails; + } catch (e) { + print('invalid iamge data: $e'); + contactDetails['image'] = null; + return contactDetails; + } + } + } + + fetchProfilePictureMetaData(String atsign) async { + var metadata = Metadata(); + metadata.isPublic = true; + metadata.namespaceAware = false; + var key = AtKey(); + key.sharedBy = atsign; + key.metadata = metadata; + // making isPublic true (as get method changes it to false) + key.metadata?.isBinary = true; + key.key = "image.wavi"; + + var result = await atClientManager.atClient.getMeta(key); + return result; + } + /// updates status of contacts for [baseContactList] and [baseBlockedList] void updateState(STATE_UPDATE stateToUpdate, AtContact contact, bool state) { int indexToUpdate; From 0122544bb900a40d1e48e783eb038e532265e152 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 22 Dec 2023 12:28:32 +0530 Subject: [PATCH 104/176] chore: added return type to functions --- .../at_contacts_flutter/lib/services/contact_service.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/at_contacts_flutter/lib/services/contact_service.dart b/packages/at_contacts_flutter/lib/services/contact_service.dart index d5fe7fe33..b22e4ada0 100644 --- a/packages/at_contacts_flutter/lib/services/contact_service.dart +++ b/packages/at_contacts_flutter/lib/services/contact_service.dart @@ -599,7 +599,7 @@ class ContactService { return contactDetails; } - getProfilePicture(String atsign) async { + Future?> getProfilePicture(String atsign) async { var contactDetails = {}; var metadata = Metadata(); @@ -628,10 +628,12 @@ class ContactService { contactDetails['image'] = null; return contactDetails; } + }else { + return null; } } - fetchProfilePictureMetaData(String atsign) async { + Future fetchProfilePictureMetaData(String atsign) async { var metadata = Metadata(); metadata.isPublic = true; metadata.namespaceAware = false; From 91a1605cb2b829140fb3c3660072d0bb793eba84 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 22 Dec 2023 13:47:25 +0530 Subject: [PATCH 105/176] feat: release changes for version 4.0.13 --- packages/at_contacts_flutter/CHANGELOG.md | 3 +++ packages/at_contacts_flutter/pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/at_contacts_flutter/CHANGELOG.md b/packages/at_contacts_flutter/CHANGELOG.md index 4f529cd6f..64791c8e3 100644 --- a/packages/at_contacts_flutter/CHANGELOG.md +++ b/packages/at_contacts_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.0.13 + +- **FIX**: Fixed methods for fetching profile picture ## 4.0.12 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index 1dd26c641..eb7db78f6 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.12 +version: 4.0.13 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 From ad5cb66ed2ae5949493675ffd8490ecbc89dc1c8 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 27 Dec 2023 15:55:46 +0530 Subject: [PATCH 106/176] fix: fixed passing on flag fetchContacts --- .../lib/utils/init_contacts_service.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/at_contacts_flutter/lib/utils/init_contacts_service.dart b/packages/at_contacts_flutter/lib/utils/init_contacts_service.dart index 9ccc01242..bfe6279cf 100644 --- a/packages/at_contacts_flutter/lib/utils/init_contacts_service.dart +++ b/packages/at_contacts_flutter/lib/utils/init_contacts_service.dart @@ -5,8 +5,11 @@ import 'package:at_contacts_flutter/services/contact_service.dart'; /// Function to initialise contacts Service Future initializeContactsService( - {rootDomain = 'root.atsign.org', rootPort = 64}) async { - await ContactService().initContactsService(rootDomain, rootPort); + {rootDomain = 'root.atsign.org', + rootPort = 64, + bool fetchContacts = true}) async { + await ContactService() + .initContactsService(rootDomain, rootPort, fetchContacts: fetchContacts); } /// Function call from app to dispose stream controllers used in the package From 53c62f484e11cb7848ac56e7b321b48f9960bfb9 Mon Sep 17 00:00:00 2001 From: sonle Date: Thu, 4 Jan 2024 18:13:59 +0700 Subject: [PATCH 107/176] fix: resolve noted issues --- .../example/lib/main.dart | 11 +-- .../at_backupkey_flutter/example/pubspec.yaml | 6 +- .../test/at_backupkey_flutter_test.dart | 16 +++- .../test/backupkey_service_test.dart | 31 ++++--- .../widgets_test/backup_key_widget_test.dart | 12 +-- .../at_chat_flutter/example/lib/main.dart | 85 ++++++++++--------- .../example/lib/second_screen.dart | 11 +-- .../example/lib/third_screen.dart | 8 +- packages/at_chat_flutter/example/pubspec.yaml | 5 ++ .../lib/screens/chat_screen.dart | 18 ++-- .../lib/services/chat_service.dart | 3 +- .../at_chat_flutter/lib/utils/colors.dart | 2 +- .../lib/widgets/bottom_sheet_dialog.dart | 2 +- .../lib/widgets/incoming_message_bubble.dart | 4 +- .../lib/widgets/outgoing_message_bubble.dart | 2 +- .../lib/widgets/send_message.dart | 4 +- .../bottom_sheet_dialog_test.dart | 6 +- .../test/widget_tests/button_widget_test.dart | 12 +-- .../widget_tests/contacts_intials_test.dart | 41 +++++---- .../incoming_message_bubble_test.dart | 10 +-- .../outgoing_message_bubble_test.dart | 10 +-- .../at_follows_flutter/example/lib/main.dart | 1 - .../example/lib/screens/follows_screen.dart | 1 - .../example/lib/services/at_service.dart | 7 +- .../lib/services/connections_service.dart | 5 +- .../lib/services/sdk_service.dart | 3 +- .../lib/widgets/web_view_screen.dart | 6 +- .../unit_tests/connections_service_test.dart | 26 +++--- .../example/lib/main.dart | 6 +- .../example/lib/second_screen.dart | 12 +-- .../example/pubspec.yaml | 7 +- .../lib/services/invitation_service.dart | 1 - .../lib/widgets/otp_dialog.dart | 2 +- .../lib/widgets/share_dialog.dart | 33 +++---- .../test/at_invitation_flutter_test.dart | 16 +++- .../test/widgets_test/otp_dialog_test.dart | 32 +++---- .../test/widgets_test/share_dialog_test.dart | 31 ++++--- .../test/at_location_flutter_test.dart | 25 +++--- .../lib/services/at_login_service.dart | 21 ++--- .../lib/services/custom_nav.dart | 2 +- .../lib/utils/at_login_utils.dart | 5 +- .../widgets/at_login_dashboard_widget.dart | 1 - .../lib/widgets/at_login_widget.dart | 11 +-- packages/at_login_flutter/pubspec.yaml | 1 + .../test/at_login_flutter_test.dart | 17 ++-- .../at_sync_ui_flutter/example/lib/main.dart | 4 +- .../example/lib/second_screen.dart | 6 ++ .../at_sync_ui_flutter/example/pubspec.yaml | 8 +- .../lib/services/at_sync_ui_services.dart | 7 +- 49 files changed, 346 insertions(+), 250 deletions(-) diff --git a/packages/at_backupkey_flutter/example/lib/main.dart b/packages/at_backupkey_flutter/example/lib/main.dart index 6191edd5a..f7d61f6e4 100644 --- a/packages/at_backupkey_flutter/example/lib/main.dart +++ b/packages/at_backupkey_flutter/example/lib/main.dart @@ -40,7 +40,6 @@ class _MyAppState extends State { Future futurePreference = loadAtClientPreference(); AtClientPreference? atClientPreference; - @override Widget build(BuildContext context) { return StreamBuilder( @@ -55,8 +54,8 @@ class _MyAppState extends State { primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), + background: Colors.white, ), - backgroundColor: Colors.white, scaffoldBackgroundColor: Colors.white, ), darkTheme: ThemeData().copyWith( @@ -64,8 +63,8 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark().colorScheme.copyWith( primary: Colors.blue, + background: Colors.grey[850], ), - backgroundColor: Colors.grey[850], scaffoldBackgroundColor: Colors.grey[850], ), themeMode: themeMode, @@ -188,7 +187,7 @@ class _HomeScreenState extends State { /// Use the AtClientManager instance to get the current atsign Text( 'Current @sign: ${atClientManager.atClient.getCurrentAtSign()}'), - + ElevatedButton.icon( icon: const Icon( Icons.file_copy, @@ -196,7 +195,9 @@ class _HomeScreenState extends State { ), label: const Text('Backup your key'), onPressed: () async { - BackupKeyWidget(atsign: atClientManager.atClient.getCurrentAtSign() ?? '') + BackupKeyWidget( + atsign: + atClientManager.atClient.getCurrentAtSign() ?? '') .showBackupDialog(context); }, ), diff --git a/packages/at_backupkey_flutter/example/pubspec.yaml b/packages/at_backupkey_flutter/example/pubspec.yaml index 769121666..b298a24a9 100644 --- a/packages/at_backupkey_flutter/example/pubspec.yaml +++ b/packages/at_backupkey_flutter/example/pubspec.yaml @@ -11,8 +11,6 @@ environment: dependencies: at_app_flutter: ^5.2.0 - at_backupkey_flutter: - path: ../ at_client_mobile: ^3.2.12 at_onboarding_flutter: ^6.1.3 cupertino_icons: ^1.0.6 @@ -24,6 +22,10 @@ dependencies: dev_dependencies: flutter_lints: ^2.0.3 +dependency_overrides: + at_backupkey_flutter: + path: ../ + # 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_backupkey_flutter/test/at_backupkey_flutter_test.dart b/packages/at_backupkey_flutter/test/at_backupkey_flutter_test.dart index 8db536ad0..930d3d288 100644 --- a/packages/at_backupkey_flutter/test/at_backupkey_flutter_test.dart +++ b/packages/at_backupkey_flutter/test/at_backupkey_flutter_test.dart @@ -7,12 +7,20 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); setUp(() { - channel.setMockMethodCallHandler((MethodCall methodCall) async { - return '42'; - }); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( + channel, + (MethodCall methodCall) async { + return '42'; + }, + ); }); tearDown(() { - channel.setMockMethodCallHandler(null); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( + channel, + null, + ); }); } diff --git a/packages/at_backupkey_flutter/test/backupkey_service_test.dart b/packages/at_backupkey_flutter/test/backupkey_service_test.dart index cd16b58ac..7b6d37975 100644 --- a/packages/at_backupkey_flutter/test/backupkey_service_test.dart +++ b/packages/at_backupkey_flutter/test/backupkey_service_test.dart @@ -13,36 +13,36 @@ void main() { group('Fetching AESKey', () { test('for registered @sign', () async { - MockDataService _mockDataService = MockDataService(atsign); - String aesKey = _mockDataService.getAESKey; + MockDataService mockDataService = MockDataService(atsign); + String aesKey = mockDataService.getAESKey; expect(aesKey.length == 44, true); }); test('for unregistered @sign', () async { - MockDataService _mockDataService = MockDataService(atsign + '123'); - String? aesKey = _mockDataService.getAESKey; + MockDataService mockDataService = MockDataService('${atsign}123'); + String? aesKey = mockDataService.getAESKey; expect(aesKey, null); }); }); group('Fetch EncryptedKeys', () { test('for registerd @sign', () async { - MockDataService _mockDataService = MockDataService(atsign); - var map = _mockDataService.getEncryptedKeys(); + MockDataService mockDataService = MockDataService(atsign); + var map = mockDataService.getEncryptedKeys(); expect(map.length, greaterThan(0)); }); test('for unregisterd @sign', () async { - MockDataService _mockDataService = MockDataService(atsign + '123'); - var map = _mockDataService.getEncryptedKeys(); + MockDataService mockDataService = MockDataService('${atsign}123'); + var map = mockDataService.getEncryptedKeys(); expect(map, {}); }); }); group('generate backupkey file', () { test('for registered @sign', () async { - MockDataService _mockDataService = MockDataService(atsign); - var aesEncryptedKeys = _mockDataService.getEncryptedKeys(); + MockDataService mockDataService = MockDataService(atsign); + var aesEncryptedKeys = mockDataService.getEncryptedKeys(); expect(aesEncryptedKeys.isNotEmpty, true); var result = await _generateFile(atsign, aesEncryptedKeys); expect(result, true); @@ -50,9 +50,9 @@ void main() { }); test('for unregistered @sign', () async { - String atSign = atsign + '123'; - MockDataService _mockDataService = MockDataService(atSign); - var aesEncryptedKeys = _mockDataService.getEncryptedKeys(); + String atSign = '${atsign}123'; + MockDataService mockDataService = MockDataService(atSign); + var aesEncryptedKeys = mockDataService.getEncryptedKeys(); expect(aesEncryptedKeys.isNotEmpty, false); var result = await _generateFile(atSign, aesEncryptedKeys); expect(result, false); @@ -82,7 +82,9 @@ Future setUpFunc(String atsign) async { // To setup encryption keys await atClient.getLocalSecondary()!.putValue( - AT_ENCRYPTION_PRIVATE_KEY, demo_data.encryptionPrivateKeyMap[atsign]!); + AtConstants.atEncryptionPrivateKey, + demo_data.encryptionPrivateKeyMap[atsign]!, + ); } AtClientPreference getAtSignPreference(String atsign) { @@ -113,6 +115,7 @@ class MockDataService { late String atsign; MockDataService(this.atsign); + get getAESKey => demo_data.aesKeyMap[atsign]; Map getEncryptedKeys() { diff --git a/packages/at_backupkey_flutter/test/widgets_test/backup_key_widget_test.dart b/packages/at_backupkey_flutter/test/widgets_test/backup_key_widget_test.dart index 43eb1f9f1..83ab3117c 100644 --- a/packages/at_backupkey_flutter/test/widgets_test/backup_key_widget_test.dart +++ b/packages/at_backupkey_flutter/test/widgets_test/backup_key_widget_test.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget backupKeyWidget}) { + Widget wrapWidgetWithMaterialApp({required Widget backupKeyWidget}) { return TestMaterialApp( home: Builder( builder: (BuildContext context) { @@ -28,31 +28,31 @@ void main() { // Test case to check backupkey widget is displayed testWidgets('BackupKey widget is used', (WidgetTester tester) async { await tester.pumpWidget( - _wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); + wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); expect(find.byType(BackupKeyWidget), findsOneWidget); }); // Test case to identify atsign text testWidgets("Identify atsign text", (WidgetTester tester) async { await tester.pumpWidget( - _wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); + wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); expect(backupKeyWidget.atsign, 'bluebellrelated86'); }); // Test case to identify button text testWidgets("Identify button text", (WidgetTester tester) async { await tester.pumpWidget( - _wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); + wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); expect(backupKeyWidget.buttonText, 'Click here'); }); // Test case to check icon Color testWidgets('Test case to check icon color', (WidgetTester tester) async { await tester.pumpWidget( - _wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); + wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); expect(backupKeyWidget.iconColor, Colors.purple); }); // Test case to check button Color testWidgets('Test case to check button color', (WidgetTester tester) async { await tester.pumpWidget( - _wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); + wrapWidgetWithMaterialApp(backupKeyWidget: backupKeyWidget)); expect(backupKeyWidget.buttonColor, Colors.white); }); }); diff --git a/packages/at_chat_flutter/example/lib/main.dart b/packages/at_chat_flutter/example/lib/main.dart index dbf5a9dde..f9567ba3c 100644 --- a/packages/at_chat_flutter/example/lib/main.dart +++ b/packages/at_chat_flutter/example/lib/main.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:at_chat_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'; import 'package:at_utils/at_logger.dart' show AtSignLogger; import 'package:path_provider/path_provider.dart' @@ -27,8 +26,9 @@ 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 { @@ -70,44 +70,51 @@ class _MyAppState extends State { setState(() { atClientPreference = preference; }); - final result = await AtOnboarding.onboard( - context: context, - config: AtOnboardingConfig( - atClientPreference: atClientPreference!, - domain: AtEnv.rootDomain, - appAPIKey: '477b-876u-bcez-c42z-6a3d', - rootEnvironment: AtEnv.rootEnvironment, - ), - ); - switch (result.status) { - case AtOnboardingResultStatus.success: - await Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) => const SecondScreen(), - )); - break; - case AtOnboardingResultStatus.error: - _logger.severe( - 'Onboarding throws ${result.errorCode} 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')) - ], + if (mounted) { + final result = await AtOnboarding.onboard( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference!, + domain: AtEnv.rootDomain, + appAPIKey: '477b-876u-bcez-c42z-6a3d', + rootEnvironment: AtEnv.rootEnvironment, + ), + ); + + switch (result.status) { + case AtOnboardingResultStatus.success: + if (mounted) { + await Navigator.pushReplacement( + context, + MaterialPageRoute( + builder: (context) => const SecondScreen(), + )); + } + break; + case AtOnboardingResultStatus.error: + _logger.severe( + 'Onboarding throws ${result.errorCode} error'); + if (mounted) { + 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')) + ], + ); + }, ); - }, - ); - break; - case AtOnboardingResultStatus.cancel: - break; + } + break; + case AtOnboardingResultStatus.cancel: + break; + } } }, child: const Text('Start onboarding'), diff --git a/packages/at_chat_flutter/example/lib/second_screen.dart b/packages/at_chat_flutter/example/lib/second_screen.dart index bbed4cd78..3476af9e4 100644 --- a/packages/at_chat_flutter/example/lib/second_screen.dart +++ b/packages/at_chat_flutter/example/lib/second_screen.dart @@ -9,7 +9,7 @@ class SecondScreen extends StatefulWidget { const SecondScreen({Key? key}) : super(key: key); @override - _SecondScreenState createState() => _SecondScreenState(); + State createState() => _SecondScreenState(); } class _SecondScreenState extends State { @@ -26,6 +26,7 @@ class _SecondScreenState extends State { /// Get the AtClientManager instance var atClientManager = AtClientManager.getInstance(); + @override void initState() { getAtSignAndInitializeChat(); @@ -222,8 +223,8 @@ class _SecondScreenState extends State { if (member1.trim() != '' && member2.trim() != '' && groupId != '') { setChatWithAtSign(null, isGroup: true, groupId: groupId, groupMembers: [ activeAtSign!, - member1.startsWith('@') ? member1 : '@' + member1, - member2.startsWith('@') ? member2 : '@' + member2 + member1.startsWith('@') ? member1 : '@$member1', + member2.startsWith('@') ? member2 : '@$member2' ]); Navigator.push(context, MaterialPageRoute(builder: (context) => const ThirdScreen())); @@ -238,8 +239,8 @@ class _SecondScreenState extends State { context: context, builder: (BuildContext context) { return AlertDialog( - title: Row( - children: const [Text('Some details are missing!')], + title: const Row( + children: [Text('Some details are missing!')], ), content: const Text('Please enter all fields'), actions: [ diff --git a/packages/at_chat_flutter/example/lib/third_screen.dart b/packages/at_chat_flutter/example/lib/third_screen.dart index a34ab7c09..1e63afefc 100644 --- a/packages/at_chat_flutter/example/lib/third_screen.dart +++ b/packages/at_chat_flutter/example/lib/third_screen.dart @@ -5,7 +5,7 @@ class ThirdScreen extends StatefulWidget { const ThirdScreen({Key? key}) : super(key: key); @override - _ThirdScreenState createState() => _ThirdScreenState(); + State createState() => _ThirdScreenState(); } class _ThirdScreenState extends State { @@ -28,8 +28,10 @@ class _ThirdScreenState extends State { var result = await deleteMessages(); var message = result ? 'Messages are deleted' : 'Failed to delete'; - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text(message))); + if (mounted) { + ScaffoldMessenger.of(context) + .showSnackBar(SnackBar(content: Text(message))); + } }, ), ]), diff --git a/packages/at_chat_flutter/example/pubspec.yaml b/packages/at_chat_flutter/example/pubspec.yaml index a03846371..e497ce7fb 100644 --- a/packages/at_chat_flutter/example/pubspec.yaml +++ b/packages/at_chat_flutter/example/pubspec.yaml @@ -36,6 +36,10 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ at_onboarding_flutter: ^6.1.3 + at_client_mobile: ^3.2.13 + at_utils: ^3.0.15 + path_provider: ^2.1.1 + flutter_keychain: ^2.4.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -56,6 +60,7 @@ flutter: uses-material-design: true dev_dependencies: + flutter_lints: ^3.0.1 flutter_test: sdk: flutter # To add assets to your application, add an assets section, like this: diff --git a/packages/at_chat_flutter/lib/screens/chat_screen.dart b/packages/at_chat_flutter/lib/screens/chat_screen.dart index 1fcf00bae..192aa3089 100644 --- a/packages/at_chat_flutter/lib/screens/chat_screen.dart +++ b/packages/at_chat_flutter/lib/screens/chat_screen.dart @@ -51,7 +51,7 @@ class ChatScreen extends StatefulWidget { : super(key: key); @override - _ChatScreenState createState() => _ChatScreenState(); + State createState() => _ChatScreenState(); } class _ChatScreenState extends State { @@ -174,15 +174,19 @@ class _ChatScreenState extends State { (id) async { var result = await _chatService .deleteSelectedMessage(id); - Navigator.of(context).pop(); + if (mounted) { + Navigator.of(context).pop(); + } var message = result ? 'Message is deleted' : 'Failed to delete'; - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar( - content: - Text(message))); + if (mounted) { + ScaffoldMessenger.of(context) + .showSnackBar(SnackBar( + content: + Text(message))); + } }, message: snapshot.data![index], color: @@ -225,7 +229,7 @@ class _ChatScreenState extends State { ); if ((result?.files ?? []).isNotEmpty) { final file = File(result!.files.first.path!); - await _chatService.sendImageFile(context, file); + if (mounted) await _chatService.sendImageFile(context, file); } else { // User canceled the picker } diff --git a/packages/at_chat_flutter/lib/services/chat_service.dart b/packages/at_chat_flutter/lib/services/chat_service.dart index 70f9d2de8..9edb60860 100644 --- a/packages/at_chat_flutter/lib/services/chat_service.dart +++ b/packages/at_chat_flutter/lib/services/chat_service.dart @@ -5,6 +5,7 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:at_chat_flutter/models/message_model.dart'; + // ignore: import_of_legacy_library_into_null_safe import 'package:at_client_mobile/at_client_mobile.dart'; @@ -141,7 +142,7 @@ class ChatService { if (chatWithAtSignFromApp.startsWith('@')) { chatWithAtSign = chatWithAtSignFromApp; } else { - chatWithAtSign = '@' + chatWithAtSignFromApp; + chatWithAtSign = '@$chatWithAtSignFromApp'; } } else { chatWithAtSign = ''; diff --git a/packages/at_chat_flutter/lib/utils/colors.dart b/packages/at_chat_flutter/lib/utils/colors.dart index 0fcaa8d33..993a7d63f 100644 --- a/packages/at_chat_flutter/lib/utils/colors.dart +++ b/packages/at_chat_flutter/lib/utils/colors.dart @@ -11,7 +11,7 @@ class CustomColors { class ContactInitialsColors { static Color getColor(String atsign) { if (atsign.length == 1) { - atsign = atsign + ' '; + atsign = '$atsign '; } switch (atsign[1].toUpperCase()) { case 'A': diff --git a/packages/at_chat_flutter/lib/widgets/bottom_sheet_dialog.dart b/packages/at_chat_flutter/lib/widgets/bottom_sheet_dialog.dart index 83f771afd..cbc41fc9a 100644 --- a/packages/at_chat_flutter/lib/widgets/bottom_sheet_dialog.dart +++ b/packages/at_chat_flutter/lib/widgets/bottom_sheet_dialog.dart @@ -10,7 +10,7 @@ class BottomSheetDialog extends StatefulWidget { }) : super(key: key); @override - _BottomSheetDialogState createState() => _BottomSheetDialogState(); + State createState() => _BottomSheetDialogState(); } class _BottomSheetDialogState extends State { diff --git a/packages/at_chat_flutter/lib/widgets/incoming_message_bubble.dart b/packages/at_chat_flutter/lib/widgets/incoming_message_bubble.dart index cfcb8ff48..b31f370ef 100644 --- a/packages/at_chat_flutter/lib/widgets/incoming_message_bubble.dart +++ b/packages/at_chat_flutter/lib/widgets/incoming_message_bubble.dart @@ -2,6 +2,7 @@ import 'dart:typed_data'; import 'package:at_chat_flutter/models/message_model.dart'; import 'package:at_chat_flutter/utils/colors.dart'; + // ignore: import_of_legacy_library_into_null_safe import 'package:at_common_flutter/at_common_flutter.dart'; import 'package:at_chat_flutter/widgets/contacts_initials.dart'; @@ -18,8 +19,9 @@ class IncomingMessageBubble extends StatefulWidget { this.color = CustomColors.incomingMessageColor, this.avatarColor = CustomColors.defaultColor}) : super(key: key); + @override - _IncomingMessageBubbleState createState() => _IncomingMessageBubbleState(); + State createState() => _IncomingMessageBubbleState(); } class _IncomingMessageBubbleState extends State { diff --git a/packages/at_chat_flutter/lib/widgets/outgoing_message_bubble.dart b/packages/at_chat_flutter/lib/widgets/outgoing_message_bubble.dart index 852f5ff43..0af14fc81 100644 --- a/packages/at_chat_flutter/lib/widgets/outgoing_message_bubble.dart +++ b/packages/at_chat_flutter/lib/widgets/outgoing_message_bubble.dart @@ -23,7 +23,7 @@ class OutgoingMessageBubble extends StatefulWidget { : super(key: key); @override - _OutgoingMessageBubbleState createState() => _OutgoingMessageBubbleState(); + State createState() => _OutgoingMessageBubbleState(); } class _OutgoingMessageBubbleState extends State { diff --git a/packages/at_chat_flutter/lib/widgets/send_message.dart b/packages/at_chat_flutter/lib/widgets/send_message.dart index ac0ba42ef..dd6bc9340 100644 --- a/packages/at_chat_flutter/lib/widgets/send_message.dart +++ b/packages/at_chat_flutter/lib/widgets/send_message.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + // ignore: import_of_legacy_library_into_null_safe import 'package:at_common_flutter/services/size_config.dart'; @@ -19,8 +20,9 @@ class SendMessage extends StatefulWidget { this.hintText, this.onMediaPressed, }) : super(key: key); + @override - _SendMessageState createState() => _SendMessageState(); + State createState() => _SendMessageState(); } class _SendMessageState extends State { diff --git a/packages/at_chat_flutter/test/widget_tests/bottom_sheet_dialog_test.dart b/packages/at_chat_flutter/test/widget_tests/bottom_sheet_dialog_test.dart index 534189f3d..a439fd4b2 100644 --- a/packages/at_chat_flutter/test/widget_tests/bottom_sheet_dialog_test.dart +++ b/packages/at_chat_flutter/test/widget_tests/bottom_sheet_dialog_test.dart @@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget bottomSheetDialog}) { + Widget wrapWidgetWithMaterialApp({required Widget bottomSheetDialog}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return bottomSheetDialog; @@ -21,7 +21,7 @@ void main() { testWidgets("Botton Sheet is displayed", (WidgetTester tester) async { final bottomSheetDialog = BottomSheetDialog(() {}); await tester.pumpWidget( - _wrapWidgetWithMaterialApp(bottomSheetDialog: bottomSheetDialog)); + wrapWidgetWithMaterialApp(bottomSheetDialog: bottomSheetDialog)); expect(find.byType(BottomSheetDialog), findsOneWidget); }); @@ -32,7 +32,7 @@ void main() { log('Call back is given'); }); await tester.pumpWidget( - _wrapWidgetWithMaterialApp(bottomSheetDialog: bottomSheetDialog)); + wrapWidgetWithMaterialApp(bottomSheetDialog: bottomSheetDialog)); await tester.tap((find.byType(BottomSheetDialog))); expect(bottomSheetDialog.deleteCallback.call(), null); }); diff --git a/packages/at_chat_flutter/test/widget_tests/button_widget_test.dart b/packages/at_chat_flutter/test/widget_tests/button_widget_test.dart index 3dacf5ae6..c433fcc9d 100644 --- a/packages/at_chat_flutter/test/widget_tests/button_widget_test.dart +++ b/packages/at_chat_flutter/test/widget_tests/button_widget_test.dart @@ -9,7 +9,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget buttonWidget}) { + Widget wrapWidgetWithMaterialApp({required Widget buttonWidget}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return buttonWidget; @@ -34,7 +34,7 @@ void main() { testWidgets("Button widget is used and shown on screen", (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); + .pumpWidget(wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); expect(find.byType(ButtonWidget), findsOneWidget); }); @@ -42,14 +42,14 @@ void main() { // Test case to check button string is given testWidgets("Button text displayed", (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); + .pumpWidget(wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); expect(find.text('Click here'), findsOneWidget); }); // Test case to check onPress functionality testWidgets("OnPress is given an action", (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); + .pumpWidget(wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); expect(buttonWidget.onPress!.call(), null); }); @@ -57,7 +57,7 @@ void main() { testWidgets("BorderRadius of button widget as circular", (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); + .pumpWidget(wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); final container = tester.widget(find.byType(Container)); final decoration = container.decoration as BoxDecoration; final borderRadius = decoration.borderRadius as BorderRadius; @@ -71,7 +71,7 @@ void main() { testWidgets("Color of button is button default color", (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); + .pumpWidget(wrapWidgetWithMaterialApp(buttonWidget: buttonWidget)); final container = tester.widget(find.byType(Container)); final decoration = container.decoration as BoxDecoration; expect( diff --git a/packages/at_chat_flutter/test/widget_tests/contacts_intials_test.dart b/packages/at_chat_flutter/test/widget_tests/contacts_intials_test.dart index 13284b268..c7f4644c3 100644 --- a/packages/at_chat_flutter/test/widget_tests/contacts_intials_test.dart +++ b/packages/at_chat_flutter/test/widget_tests/contacts_intials_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget contactInitial}) { + Widget wrapWidgetWithMaterialApp({required Widget contactInitial}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return contactInitial; @@ -16,21 +16,19 @@ void main() { /// Functional test cases for [contactInitial] group('Contacts Initial widget Tests:', () { - - // Test case to identify contact initial is used in screen or not - testWidgets("Button widget is used and shown on screen", + // Test case to identify contact initial is used in screen or not + testWidgets("Button widget is used and shown on screen", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(contactInitial: ContactInitial(initials:'@'))); + await tester.pumpWidget(wrapWidgetWithMaterialApp( + contactInitial: ContactInitial(initials: '@'))); expect(find.byType(ContactInitial), findsOneWidget); }); - // Test case to identify contact initial text - testWidgets("identify contact initial text", - (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(contactInitial: ContactInitial(initials:'@'))); + // Test case to identify contact initial text + testWidgets("identify contact initial text", (WidgetTester tester) async { + await tester.pumpWidget(wrapWidgetWithMaterialApp( + contactInitial: ContactInitial(initials: '@'))); expect(find.text('@'), findsOneWidget); }); @@ -38,17 +36,26 @@ void main() { // Test case to check contact initial to check background color testWidgets('Contacts initial with background color', (WidgetTester tester) async { - await tester.pumpWidget(_wrapWidgetWithMaterialApp( - contactInitial: ContactInitial(initials: '@',backgroundColor: CustomColors.defaultColor,))); + await tester.pumpWidget(wrapWidgetWithMaterialApp( + contactInitial: ContactInitial( + initials: '@', + backgroundColor: CustomColors.defaultColor, + ))); final contactsInitial = tester.widget(find.byType(ContactInitial)); - expect(contactsInitial.backgroundColor, CustomColors.defaultColor,); + expect( + contactsInitial.backgroundColor, + CustomColors.defaultColor, + ); }); - - // Test case to check contact initial to check given without background color + + // Test case to check contact initial to check given without background color testWidgets('Contacts initial without background color', (WidgetTester tester) async { - await tester.pumpWidget(_wrapWidgetWithMaterialApp(contactInitial: ContactInitial(initials: '@',))); + await tester.pumpWidget(wrapWidgetWithMaterialApp( + contactInitial: ContactInitial( + initials: '@', + ))); final contactsInitial = tester.widget(find.byType(ContactInitial)); expect(contactsInitial.backgroundColor, null); diff --git a/packages/at_chat_flutter/test/widget_tests/incoming_message_bubble_test.dart b/packages/at_chat_flutter/test/widget_tests/incoming_message_bubble_test.dart index 18126accb..fd4c2e223 100644 --- a/packages/at_chat_flutter/test/widget_tests/incoming_message_bubble_test.dart +++ b/packages/at_chat_flutter/test/widget_tests/incoming_message_bubble_test.dart @@ -10,7 +10,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget incomingMessageBubble}) { + Widget wrapWidgetWithMaterialApp({required Widget incomingMessageBubble}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return incomingMessageBubble; @@ -23,7 +23,7 @@ void main() { testWidgets("Incoming message bubble widget is used and shown on screen", (WidgetTester tester) async { const incomingMessageBubble = IncomingMessageBubble(); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( incomingMessageBubble: incomingMessageBubble)); expect(find.byType(IncomingMessageBubble), findsOneWidget); @@ -36,7 +36,7 @@ void main() { final incomingMessageBubble = IncomingMessageBubble( message: message, ); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( incomingMessageBubble: incomingMessageBubble)); expect(incomingMessageBubble.message, message); }); @@ -46,7 +46,7 @@ void main() { const incomingMessageBubble = IncomingMessageBubble( color: CustomColors.defaultColor, ); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( incomingMessageBubble: incomingMessageBubble)); final container = tester .widget(find.byType(IncomingMessageBubble)); @@ -60,7 +60,7 @@ void main() { testWidgets("Color of avatar in incoming message bubble", (WidgetTester tester) async { const incomingMessageBubble = IncomingMessageBubble(); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( incomingMessageBubble: incomingMessageBubble)); final contactInitial = tester.widget(find.byType(ContactInitial)); diff --git a/packages/at_chat_flutter/test/widget_tests/outgoing_message_bubble_test.dart b/packages/at_chat_flutter/test/widget_tests/outgoing_message_bubble_test.dart index 16b95ec5b..9e9cedd42 100644 --- a/packages/at_chat_flutter/test/widget_tests/outgoing_message_bubble_test.dart +++ b/packages/at_chat_flutter/test/widget_tests/outgoing_message_bubble_test.dart @@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget outgoingMessageBubble}) { + Widget wrapWidgetWithMaterialApp({required Widget outgoingMessageBubble}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return outgoingMessageBubble; @@ -22,7 +22,7 @@ void main() { (WidgetTester tester) async { // ignore: prefer_const_constructors final outgoingMessageBubble = OutgoingMessageBubble((message) {}); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( outgoingMessageBubble: outgoingMessageBubble)); expect(find.byType(OutgoingMessageBubble), findsOneWidget); @@ -37,7 +37,7 @@ void main() { (message) {}, message: displayMessage, ); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( outgoingMessageBubble: outgoingMessageBubble)); expect(outgoingMessageBubble.message, displayMessage); }); @@ -49,7 +49,7 @@ void main() { (message) {}, color: CustomColors.defaultColor, ); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( outgoingMessageBubble: outgoingMessageBubble)); final container = tester .widget(find.byType(OutgoingMessageBubble)); @@ -66,7 +66,7 @@ void main() { (message) {}, avatarColor: CustomColors.defaultColor, ); - await tester.pumpWidget(_wrapWidgetWithMaterialApp( + await tester.pumpWidget(wrapWidgetWithMaterialApp( outgoingMessageBubble: outgoingMessageBubble)); final avatarColor = tester .widget(find.byType(OutgoingMessageBubble)); diff --git a/packages/at_follows_flutter/example/lib/main.dart b/packages/at_follows_flutter/example/lib/main.dart index 77df912a4..6701935ac 100644 --- a/packages/at_follows_flutter/example/lib/main.dart +++ b/packages/at_follows_flutter/example/lib/main.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:at_follows_flutter_example/screens/follows_screen.dart'; import 'package:at_onboarding_flutter/services/onboarding_service.dart'; 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:at_utils/at_logger.dart' show AtSignLogger; import 'package:path_provider/path_provider.dart' diff --git a/packages/at_follows_flutter/example/lib/screens/follows_screen.dart b/packages/at_follows_flutter/example/lib/screens/follows_screen.dart index 3766cdcce..f63fd91ab 100644 --- a/packages/at_follows_flutter/example/lib/screens/follows_screen.dart +++ b/packages/at_follows_flutter/example/lib/screens/follows_screen.dart @@ -2,7 +2,6 @@ import 'package:at_follows_flutter/screens/connections.dart'; import 'package:at_follows_flutter_example/services/at_service.dart'; import 'package:at_follows_flutter_example/services/notification_service.dart'; import 'package:flutter/material.dart'; -import 'package:at_utils/at_logger.dart'; import 'package:at_follows_flutter_example/utils/app_strings.dart'; class NextScreen extends StatefulWidget { 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 b7dadde4d..815084cf9 100644 --- a/packages/at_follows_flutter/example/lib/services/at_service.dart +++ b/packages/at_follows_flutter/example/lib/services/at_service.dart @@ -2,7 +2,8 @@ import 'dart:async'; import 'dart:convert'; import 'package:at_client_mobile/at_client_mobile.dart'; -import 'package:at_follows_flutter_example/services/notification_service.dart' as follows_notification_service; +import 'package:at_follows_flutter_example/services/notification_service.dart' + as follows_notification_service; import 'package:at_follows_flutter_example/utils/app_constants.dart'; import 'package:path_provider/path_provider.dart' as path_provider; import 'package:at_commons/at_commons.dart' as at_commons; @@ -83,6 +84,7 @@ class AtService { _atsign = await getAtSign(); String? privateKey = await getPrivateKey(_atsign!); // ignore: await_only_futures + // ignore: deprecated_member_use await atClientInstance!.startMonitor(privateKey!, (response) { acceptStream(response); }); @@ -93,7 +95,8 @@ class AtService { acceptStream(response) async { response = response.toString().replaceAll('notification:', '').trim(); var notification = AtNotification.fromJson(jsonDecode(response)); - await follows_notification_service.NotificationService().showNotification(notification); + await follows_notification_service.NotificationService() + .showNotification(notification); } } diff --git a/packages/at_follows_flutter/lib/services/connections_service.dart b/packages/at_follows_flutter/lib/services/connections_service.dart index 790e19489..ccc2f76a9 100644 --- a/packages/at_follows_flutter/lib/services/connections_service.dart +++ b/packages/at_follows_flutter/lib/services/connections_service.dart @@ -410,11 +410,11 @@ class ConnectionsService { atsignData.setData(atValue); } catch (e) { - _logger.severe('Error in _getAtsignData getting value ${e}'); + _logger.severe('Error in _getAtsignData getting value $e'); } } } catch (e) { - _logger.severe('Fetching keys for $connection throws ${e}'); + _logger.severe('Fetching keys for $connection throws $e'); } return atsignData; @@ -446,6 +446,7 @@ class ConnectionsService { bool startMonitor() { AtClientManager.getInstance() + .atClient .notificationService .subscribe() .listen((notification) { diff --git a/packages/at_follows_flutter/lib/services/sdk_service.dart b/packages/at_follows_flutter/lib/services/sdk_service.dart index 4efeb9b4b..48c28f78f 100644 --- a/packages/at_follows_flutter/lib/services/sdk_service.dart +++ b/packages/at_follows_flutter/lib/services/sdk_service.dart @@ -106,6 +106,7 @@ class SDKService { Future notify(AtKey key, String value, OperationEnum operation, Function onDone, Function onError) async { var notificationResponse = await AtClientManager.getInstance() + .atClient .notificationService .notify(_getNotificationParams(key, value, operation)) .timeout(Duration(seconds: AppConstants.responseTimeLimit), @@ -168,7 +169,7 @@ class SDKService { ///Performs sync for current @sign sync() async { - AtClientManager.getInstance().syncService.sync(); + AtClientManager.getInstance().atClient.syncService.sync(); } ///Throws [ResponseTimeOutException]. 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 ae2695697..0e8904b9e 100644 --- a/packages/at_follows_flutter/lib/widgets/web_view_screen.dart +++ b/packages/at_follows_flutter/lib/widgets/web_view_screen.dart @@ -3,7 +3,7 @@ import 'package:at_follows_flutter/utils/color_constants.dart'; import 'package:at_follows_flutter/widgets/custom_appbar.dart'; import 'package:flutter/material.dart'; import 'package:at_utils/at_logger.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:url_launcher/url_launcher_string.dart'; import 'package:webview_flutter/webview_flutter.dart'; class WebViewScreen extends StatefulWidget { @@ -82,10 +82,10 @@ class _WebViewScreenState extends State { _launchURL(String url) async { // url = Uri.encodeFull(url); - if (await canLaunch(url)) { + if (await canLaunchUrlString(url)) { Navigator.pop(context); Navigator.pop(context); - await launch(url); + await launchUrlString(url); } else { _logger.severe('unable to launch $url'); } 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 b5ba7029b..14a8f1ec7 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 @@ -292,7 +292,7 @@ Future setUpFunc(String atsign) async { final atClientManager = AtClientManager.getInstance(); AtClientService atClientService = AtClientService(); final atClient = atClientManager.atClient; - atClientManager.syncService.sync(); + atClientManager.atClient.syncService.sync(); await setEncryptionKeys(atClient, atsign); return atClientService; } @@ -323,18 +323,24 @@ setEncryptionKeys(AtClient atClient, String atsign) async { metadata.namespaceAware = false; var result; // set pkam private key - result = await atClient.getLocalSecondary()!.putValue(AT_PKAM_PRIVATE_KEY, - demo_data.pkamPrivateKeyMap[atsign]!); // set pkam public key - result = await atClient - .getLocalSecondary()! - .putValue(AT_PKAM_PUBLIC_KEY, demo_data.pkamPublicKeyMap[atsign]!); + result = await atClient.getLocalSecondary()!.putValue( + AtConstants.atPkamPrivateKey, + demo_data.pkamPrivateKeyMap[atsign]!, + ); // set pkam public key + result = await atClient.getLocalSecondary()!.putValue( + AtConstants.atPkamPublicKey, + demo_data.pkamPublicKeyMap[atsign]!, + ); // set encryption private key result = await atClient.getLocalSecondary()!.putValue( - AT_ENCRYPTION_PRIVATE_KEY, demo_data.encryptionPrivateKeyMap[atsign]!); + AtConstants.atEncryptionPrivateKey, + demo_data.encryptionPrivateKeyMap[atsign]!, + ); //set aesKey - result = await atClient - .getLocalSecondary()! - .putValue(AT_ENCRYPTION_SELF_KEY, demo_data.aesKeyMap[atsign]!); + result = await atClient.getLocalSecondary()!.putValue( + AtConstants.atEncryptionSelfKey, + demo_data.aesKeyMap[atsign]!, + ); // set encryption public key. should be synced metadata.isPublic = true; diff --git a/packages/at_invitation_flutter/example/lib/main.dart b/packages/at_invitation_flutter/example/lib/main.dart index 95b1e9dc2..5a9439a1b 100644 --- a/packages/at_invitation_flutter/example/lib/main.dart +++ b/packages/at_invitation_flutter/example/lib/main.dart @@ -2,9 +2,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'; -import 'package:at_utils/at_logger.dart' show AtSignLogger; import 'package:path_provider/path_provider.dart' show getApplicationSupportDirectory; import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv; @@ -28,7 +26,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 { @@ -37,8 +35,6 @@ class _MyAppState extends State { late AtClientPreference atClientPreference; AtClientService? atClientService; - final AtSignLogger _logger = AtSignLogger(AtEnv.appNamespace); - @override Widget build(BuildContext context) { return MaterialApp( diff --git a/packages/at_invitation_flutter/example/lib/second_screen.dart b/packages/at_invitation_flutter/example/lib/second_screen.dart index b4d9b0fc9..1c55dc78d 100644 --- a/packages/at_invitation_flutter/example/lib/second_screen.dart +++ b/packages/at_invitation_flutter/example/lib/second_screen.dart @@ -2,16 +2,16 @@ import 'package:at_app_flutter/at_app_flutter.dart'; import 'package:at_invitation_flutter/at_invitation_flutter.dart'; import 'package:flutter/material.dart'; import 'package:at_client_mobile/at_client_mobile.dart'; +import 'package:url_launcher/url_launcher_string.dart'; import 'constants.dart'; import 'package:uni_links/uni_links.dart'; -import 'package:url_launcher/url_launcher.dart'; import 'package:at_utils/at_logger.dart'; class SecondScreen extends StatefulWidget { const SecondScreen({Key? key}) : super(key: key); @override - _SecondScreenState createState() => _SecondScreenState(); + State createState() => _SecondScreenState(); } class _SecondScreenState extends State { @@ -115,10 +115,10 @@ class _SecondScreenState extends State { } void _checkForInvite() async { - String _url = MixedConstants.cookiePage; - await canLaunch(_url) - ? await launch(_url, forceSafariVC: false) - : throw 'Could not launch $_url'; + String url = MixedConstants.cookiePage; + await canLaunchUrlString(url) + ? await launchUrlString(url) + : throw 'Could not launch $url'; } void _handleIncomingLinks() { diff --git a/packages/at_invitation_flutter/example/pubspec.yaml b/packages/at_invitation_flutter/example/pubspec.yaml index 02bb75638..d8c47253e 100644 --- a/packages/at_invitation_flutter/example/pubspec.yaml +++ b/packages/at_invitation_flutter/example/pubspec.yaml @@ -35,6 +35,11 @@ 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_client_mobile: ^3.2.13 + at_utils: ^3.0.15 + flutter_keychain: ^2.4.0 + path_provider: ^2.1.1 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. @@ -58,8 +63,6 @@ dev_dependencies: # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. flutter: - assets: - - .env # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in diff --git a/packages/at_invitation_flutter/lib/services/invitation_service.dart b/packages/at_invitation_flutter/lib/services/invitation_service.dart index 2c9e333e3..59a6a8c8b 100644 --- a/packages/at_invitation_flutter/lib/services/invitation_service.dart +++ b/packages/at_invitation_flutter/lib/services/invitation_service.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:math'; -import 'package:at_commons/at_commons.dart'; import 'package:at_invitation_flutter/models/message_share.dart'; import 'package:at_invitation_flutter/widgets/share_dialog.dart'; import 'package:at_invitation_flutter/widgets/otp_dialog.dart'; diff --git a/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart b/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart index f8fbb161e..9b675ec44 100644 --- a/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart +++ b/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart @@ -14,7 +14,7 @@ class OTPDialog extends StatefulWidget { : super(key: key); @override - _OTPDialogState createState() => _OTPDialogState(); + State createState() => _OTPDialogState(); } class _OTPDialogState extends State { diff --git a/packages/at_invitation_flutter/lib/widgets/share_dialog.dart b/packages/at_invitation_flutter/lib/widgets/share_dialog.dart index 32d7c7ba9..5f96300f0 100644 --- a/packages/at_invitation_flutter/lib/widgets/share_dialog.dart +++ b/packages/at_invitation_flutter/lib/widgets/share_dialog.dart @@ -4,13 +4,14 @@ import 'package:at_common_flutter/at_common_flutter.dart'; import 'package:at_invitation_flutter/utils/text_styles.dart' as invitation_text_styles; import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:url_launcher/url_launcher_string.dart'; class ShareDialog extends StatefulWidget { final String? uniqueID; final String? passcode; final String? webPageLink; final String currentAtsign; + const ShareDialog( {Key? key, this.uniqueID, @@ -20,7 +21,7 @@ class ShareDialog extends StatefulWidget { : super(key: key); @override - _ShareDialogState createState() => _ShareDialogState(); + State createState() => _ShareDialogState(); } class _ShareDialogState extends State { @@ -32,6 +33,7 @@ class _ShareDialogState extends State { String emailAddress = ''; String phoneNumber = ''; int activeOption = 0; + @override void dispose() { atSignController.dispose(); @@ -169,7 +171,7 @@ class _ShareDialogState extends State { emailAddress = value.trim(); if (emailAddress != '') { if (RegExp( - r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+") + r"^[a-zA-Z0-9.a-zA-Z0-9!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\.[a-zA-Z]+") .hasMatch(emailAddress)) { emailError = false; emailErrorMessage = ''; @@ -220,7 +222,7 @@ class _ShareDialogState extends State { setState(() { isLoading = false; }); - Navigator.pop(context); + if (mounted) Navigator.pop(context); } }, buttonColor: @@ -264,8 +266,8 @@ class _ShareDialogState extends State { Future _sendInformation() async { // construct message body - String link = (widget.webPageLink ?? '') + - '?key=${widget.uniqueID}&atsign=${widget.currentAtsign}'; + String link = + '${widget.webPageLink ?? ''}?key=${widget.uniqueID}&atsign=${widget.currentAtsign}'; String inviteText = 'Hi there, you have been invited to join this app. \n link: $link \n password: ${widget.passcode}'; @@ -274,23 +276,22 @@ class _ShareDialogState extends State { // send SMS if (phoneNumber != '') { if (Platform.isAndroid) { - var uri = 'sms:' + phoneNumber + '?body=' + messageBody; - if (await canLaunch(uri)) { - await launch(uri); + var uri = 'sms:$phoneNumber?body=$messageBody'; + if (await canLaunchUrlString(uri)) { + await launchUrlString(uri); } } else if (Platform.isIOS) { - var uri = 'sms:' + phoneNumber + '&body=' + messageBody; - if (await canLaunch(uri)) { - await launch(uri); + var uri = 'sms:$phoneNumber&body=$messageBody'; + if (await canLaunchUrlString(uri)) { + await launchUrlString(uri); } } } // send email else if (emailAddress != '') { - var uri = - 'mailto:' + emailAddress + '?subject=Invitation&body=' + messageBody; - if (await canLaunch(uri)) { - await launch(uri); + var uri = 'mailto:$emailAddress?subject=Invitation&body=$messageBody'; + if (await canLaunchUrlString(uri)) { + await launchUrlString(uri); } } } diff --git a/packages/at_invitation_flutter/test/at_invitation_flutter_test.dart b/packages/at_invitation_flutter/test/at_invitation_flutter_test.dart index 6e99279fe..93753c1ae 100644 --- a/packages/at_invitation_flutter/test/at_invitation_flutter_test.dart +++ b/packages/at_invitation_flutter/test/at_invitation_flutter_test.dart @@ -7,12 +7,20 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); setUp(() { - channel.setMockMethodCallHandler((MethodCall methodCall) async { - return '42'; - }); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( + channel, + (MethodCall methodCall) async { + return '42'; + }, + ); }); tearDown(() { - channel.setMockMethodCallHandler(null); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( + channel, + null, + ); }); } diff --git a/packages/at_invitation_flutter/test/widgets_test/otp_dialog_test.dart b/packages/at_invitation_flutter/test/widgets_test/otp_dialog_test.dart index 2805acbb9..ee80d2a5f 100644 --- a/packages/at_invitation_flutter/test/widgets_test/otp_dialog_test.dart +++ b/packages/at_invitation_flutter/test/widgets_test/otp_dialog_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget otpDialog}) { + Widget wrapWidgetWithMaterialApp({required Widget otpDialog}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return otpDialog; @@ -15,30 +15,32 @@ void main() { /// Functional test cases for OTP Dialog Widget group('OTP Dialog Widget Tests:', () { - final otpDialog = OTPDialog(uniqueID: '25',passcode: '25032511',webPageLink: 'url for the site',); + const otpDialog = OTPDialog( + uniqueID: '25', + passcode: '25032511', + webPageLink: 'url for the site', + ); // Test Case to Check OTP Dialog is displayed testWidgets("OTP Dialog is displayed", (WidgetTester tester) async { - - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(otpDialog: otpDialog)); + await tester.pumpWidget(wrapWidgetWithMaterialApp(otpDialog: otpDialog)); expect(find.byType(OTPDialog), findsOneWidget); }); - // Test case to check uniqueId given - testWidgets("Test case to check unique id is given", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(otpDialog: otpDialog)); + // Test case to check uniqueId given + testWidgets("Test case to check unique id is given", + (WidgetTester tester) async { + await tester.pumpWidget(wrapWidgetWithMaterialApp(otpDialog: otpDialog)); expect(otpDialog.uniqueID, '25'); }); // Test case to check passcode is given - testWidgets("Test case to check passcode is given", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(otpDialog: otpDialog)); + testWidgets("Test case to check passcode is given", + (WidgetTester tester) async { + await tester.pumpWidget(wrapWidgetWithMaterialApp(otpDialog: otpDialog)); expect(otpDialog.passcode, '25032511'); }); // Test case to check web page link is given - testWidgets("Test case to check web page link is given", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(otpDialog: otpDialog)); + testWidgets("Test case to check web page link is given", + (WidgetTester tester) async { + await tester.pumpWidget(wrapWidgetWithMaterialApp(otpDialog: otpDialog)); expect(otpDialog.webPageLink, 'url for the site'); }); }); diff --git a/packages/at_invitation_flutter/test/widgets_test/share_dialog_test.dart b/packages/at_invitation_flutter/test/widgets_test/share_dialog_test.dart index c17ddf746..badab1de2 100644 --- a/packages/at_invitation_flutter/test/widgets_test/share_dialog_test.dart +++ b/packages/at_invitation_flutter/test/widgets_test/share_dialog_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../test_material_app.dart'; void main() { - Widget _wrapWidgetWithMaterialApp({required Widget shareDialog}) { + Widget wrapWidgetWithMaterialApp({required Widget shareDialog}) { return TestMaterialApp(home: Builder(builder: (BuildContext context) { SizeConfig().init(context); return shareDialog; @@ -15,35 +15,44 @@ void main() { /// Functional test cases for Share Dialog Widget group('Share Dialog Widget Tests:', () { - final shareDialog = ShareDialog(currentAtsign: '@bluebellrelated86',uniqueID: '25',passcode: '25032511',webPageLink: 'url for the site',); + const shareDialog = ShareDialog( + currentAtsign: '@bluebellrelated86', + uniqueID: '25', + passcode: '25032511', + webPageLink: 'url for the site', + ); // Test Case to Check Share Dialog is displayed testWidgets("Share Dialog is displayed", (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(shareDialog: shareDialog)); + .pumpWidget(wrapWidgetWithMaterialApp(shareDialog: shareDialog)); expect(find.byType(ShareDialog), findsOneWidget); }); // Test case to check current atsign is given - testWidgets("Test case to check current atsign is given", (WidgetTester tester) async { + testWidgets("Test case to check current atsign is given", + (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(shareDialog: shareDialog)); + .pumpWidget(wrapWidgetWithMaterialApp(shareDialog: shareDialog)); expect(shareDialog.currentAtsign, '@bluebellrelated86'); }); // Test case to check uniqueId given - testWidgets("Test case to check unique id is given", (WidgetTester tester) async { + testWidgets("Test case to check unique id is given", + (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(shareDialog: shareDialog)); + .pumpWidget(wrapWidgetWithMaterialApp(shareDialog: shareDialog)); expect(shareDialog.uniqueID, '25'); }); // Test case to check passcode is given - testWidgets("Test case to check passcode is given", (WidgetTester tester) async { + testWidgets("Test case to check passcode is given", + (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(shareDialog: shareDialog)); + .pumpWidget(wrapWidgetWithMaterialApp(shareDialog: shareDialog)); expect(shareDialog.passcode, '25032511'); }); // Test case to check web page link is given - testWidgets("Test case to check web page link is given", (WidgetTester tester) async { + testWidgets("Test case to check web page link is given", + (WidgetTester tester) async { await tester - .pumpWidget(_wrapWidgetWithMaterialApp(shareDialog: shareDialog)); + .pumpWidget(wrapWidgetWithMaterialApp(shareDialog: shareDialog)); expect(shareDialog.webPageLink, 'url for the site'); }); }); diff --git a/packages/at_location_flutter/test/at_location_flutter_test.dart b/packages/at_location_flutter/test/at_location_flutter_test.dart index 4d9fe07ad..38acc55d5 100644 --- a/packages/at_location_flutter/test/at_location_flutter_test.dart +++ b/packages/at_location_flutter/test/at_location_flutter_test.dart @@ -17,17 +17,20 @@ import 'package:mocktail/mocktail.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; Position get mockPosition => Position( - latitude: 52.561270, - longitude: 5.639382, - timestamp: DateTime.fromMillisecondsSinceEpoch( - 500, - isUtc: true, - ), - altitude: 3000.0, - accuracy: 0.0, - heading: 0.0, - speed: 0.0, - speedAccuracy: 0.0); + latitude: 52.561270, + longitude: 5.639382, + timestamp: DateTime.fromMillisecondsSinceEpoch( + 500, + isUtc: true, + ), + altitude: 3000.0, + accuracy: 0.0, + heading: 0.0, + speed: 0.0, + speedAccuracy: 0.0, + altitudeAccuracy: 0.0, + headingAccuracy: 0.0, + ); class MockAtContactImpl extends Mock implements AtContactsImpl {} 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 c95ca11dc..ae60ed210 100644 --- a/packages/at_login_flutter/lib/services/at_login_service.dart +++ b/packages/at_login_flutter/lib/services/at_login_service.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:at_login_flutter/domain/at_login_model.dart'; import 'package:at_login_flutter/exceptions/at_login_exceptions.dart'; import 'package:at_login_flutter/utils/app_constants.dart'; @@ -5,19 +7,20 @@ import 'package:at_login_flutter/utils/strings.dart'; import 'package:at_client_mobile/at_client_mobile.dart'; import 'dart:core'; import 'package:at_login_flutter/utils/at_login_utils.dart'; -import 'package:at_client/src/encryption_service/sign_in_public_data.dart'; import 'package:at_server_status/at_server_status.dart'; import 'package:at_utils/at_utils.dart'; +import 'package:crypton/crypton.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; class AtLoginService { static final AtLoginService _singleton = AtLoginService._internal(); // late List _atLoginList; late AtClientPreference _atClientPreference; - late String? _requestorUrl; late String _initialised; - late String _atSign; + + Widget get nextScreen => _nextScreen; late Widget _nextScreen; late AtStatus atStatus; @@ -59,7 +62,7 @@ class AtLoginService { Future setAtsign(String? atSign) async { bool success = false; var namespace = _atClientPreference.namespace; - var result = await AtClientManager.getInstance() + await AtClientManager.getInstance() .setCurrentAtSign(atSign!, namespace, _atClientPreference); // if (result != null) success = true; return success; @@ -140,13 +143,11 @@ class AtLoginService { .localSecondary! .getEncryptionPrivateKey(); - var signature = await SignInPublicData.signInData( - atLoginObj.challenge, encryptionPrivateKey!); + var privateKey = RSAPrivateKey.fromString(encryptionPrivateKey ?? ''); + var dataSignature = privateKey.createSHA256Signature( + utf8.encode(atLoginObj.challenge ?? '') as Uint8List); + var signature = base64Encode(dataSignature); - // var rsaKey = RSAPrivateKey.fromString(privateKey!); - // var sha256signature = rsaKey.createSHA256Signature( - // utf8.encode(atLoginObj.challenge!) as Uint8List); - // var signature = base64Encode(sha256signature); await setAtsign(atLoginObj.atsign); _logger.info( 'putLoginProof|atLoginObj.requestorUrl:${atLoginObj.requestorUrl}'); diff --git a/packages/at_login_flutter/lib/services/custom_nav.dart b/packages/at_login_flutter/lib/services/custom_nav.dart index c28646ff5..ac254e1b3 100644 --- a/packages/at_login_flutter/lib/services/custom_nav.dart +++ b/packages/at_login_flutter/lib/services/custom_nav.dart @@ -9,7 +9,7 @@ class CustomNav { } push(Widget widget, context) { - WidgetsBinding.instance!.addPostFrameCallback((_) { + WidgetsBinding.instance.addPostFrameCallback((_) { Navigator.push(context, MaterialPageRoute(builder: (context) => widget)); }); } diff --git a/packages/at_login_flutter/lib/utils/at_login_utils.dart b/packages/at_login_flutter/lib/utils/at_login_utils.dart index ee3f334cf..c17ceb01d 100644 --- a/packages/at_login_flutter/lib/utils/at_login_utils.dart +++ b/packages/at_login_flutter/lib/utils/at_login_utils.dart @@ -44,8 +44,9 @@ class AtLoginUtils { var x509Pem = socket.peerCertificate!.pem; // test with an internet available certificate to ensure we are picking out the SAN and not the CN var data = X509Utils.x509CertificateFromPem(x509Pem); - var subjectAlternativeName = data.subjectAlternativNames; - var commonName = data.subject['2.5.4.3']; + var subjectAlternativeName = + data.tbsCertificate?.extensions?.subjectAlternativNames; + var commonName = data.tbsCertificate?.subject['2.5.4.3']; subjectAlternativeName!.add(commonName!); print('SAN: $subjectAlternativeName'); for (var i = 0; i < subjectAlternativeName.length; i++) { diff --git a/packages/at_login_flutter/lib/widgets/at_login_dashboard_widget.dart b/packages/at_login_flutter/lib/widgets/at_login_dashboard_widget.dart index c1a235d35..fa7304e18 100644 --- a/packages/at_login_flutter/lib/widgets/at_login_dashboard_widget.dart +++ b/packages/at_login_flutter/lib/widgets/at_login_dashboard_widget.dart @@ -1,5 +1,4 @@ import 'package:at_client_mobile/at_client_mobile.dart'; -import 'package:at_commons/at_commons.dart'; import 'package:at_login_flutter/domain/at_login_model.dart'; import 'package:at_login_flutter/services/at_login_service.dart'; import 'package:flutter/material.dart'; diff --git a/packages/at_login_flutter/lib/widgets/at_login_widget.dart b/packages/at_login_flutter/lib/widgets/at_login_widget.dart index 770bcc2ec..e206a2851 100644 --- a/packages/at_login_flutter/lib/widgets/at_login_widget.dart +++ b/packages/at_login_flutter/lib/widgets/at_login_widget.dart @@ -56,8 +56,9 @@ class AtLogin { this.domain}) { _show(); } + void _show() { - WidgetsBinding.instance!.addPostFrameCallback((timeStamp) { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { showDialog( context: context, barrierDismissible: false, @@ -329,7 +330,7 @@ class _AtLoginWidgetState extends State { ElevatedButton( child: const Text(Strings.loginDenied), style: ElevatedButton.styleFrom( - primary: Colors.red, + backgroundColor: Colors.red, // padding: EdgeInsets.symmetric(horizontal: 50, vertical: 20), textStyle: TextStyle( fontSize: 18, @@ -346,7 +347,7 @@ class _AtLoginWidgetState extends State { ElevatedButton( child: Text(Strings.loginAllowed), style: ElevatedButton.styleFrom( - primary: Colors.green, + backgroundColor: Colors.green, textStyle: TextStyle( fontSize: 18, )), @@ -378,7 +379,7 @@ class _AtLoginWidgetState extends State { ElevatedButton( child: const Text(Strings.notPairAtsign), style: ElevatedButton.styleFrom( - primary: Colors.red, + backgroundColor: Colors.red, // padding: EdgeInsets.symmetric(horizontal: 50, vertical: 20), textStyle: TextStyle( fontSize: 18, @@ -391,7 +392,7 @@ class _AtLoginWidgetState extends State { ElevatedButton( child: Text(Strings.pairAtsign), style: ElevatedButton.styleFrom( - primary: Colors.green, + backgroundColor: Colors.green, textStyle: TextStyle( fontSize: 18, )), diff --git a/packages/at_login_flutter/pubspec.yaml b/packages/at_login_flutter/pubspec.yaml index e49c0a55c..c37574c60 100644 --- a/packages/at_login_flutter/pubspec.yaml +++ b/packages/at_login_flutter/pubspec.yaml @@ -23,6 +23,7 @@ dependencies: path_provider: ^2.1.1 permission_handler: ^11.0.0 provider: ^6.0.5 + crypton: ^2.1.0 dev_dependencies: flutter_test: diff --git a/packages/at_login_flutter/test/at_login_flutter_test.dart b/packages/at_login_flutter/test/at_login_flutter_test.dart index 4906c82ff..2e4eae97f 100644 --- a/packages/at_login_flutter/test/at_login_flutter_test.dart +++ b/packages/at_login_flutter/test/at_login_flutter_test.dart @@ -8,13 +8,20 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); setUp(() { - channel.setMockMethodCallHandler((MethodCall methodCall) async { - return '42'; - }); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( + channel, + (MethodCall methodCall) async { + return '42'; + }, + ); }); tearDown(() { - channel.setMockMethodCallHandler(null); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler( + channel, + null, + ); }); - } diff --git a/packages/at_sync_ui_flutter/example/lib/main.dart b/packages/at_sync_ui_flutter/example/lib/main.dart index da81f6ea8..beebc34f2 100644 --- a/packages/at_sync_ui_flutter/example/lib/main.dart +++ b/packages/at_sync_ui_flutter/example/lib/main.dart @@ -53,8 +53,8 @@ class _MyAppState extends State { primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), + background: Colors.white, ), - backgroundColor: Colors.white, scaffoldBackgroundColor: Colors.white, ), darkTheme: ThemeData().copyWith( @@ -62,8 +62,8 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark().colorScheme.copyWith( primary: Colors.blue, + background: Colors.grey[850], ), - backgroundColor: Colors.grey[850], scaffoldBackgroundColor: Colors.grey[850], ), themeMode: themeMode, diff --git a/packages/at_sync_ui_flutter/example/lib/second_screen.dart b/packages/at_sync_ui_flutter/example/lib/second_screen.dart index b1f199cef..bb38e3c56 100644 --- a/packages/at_sync_ui_flutter/example/lib/second_screen.dart +++ b/packages/at_sync_ui_flutter/example/lib/second_screen.dart @@ -7,6 +7,7 @@ import 'main.dart'; class SecondScreen extends StatefulWidget { final String activeAtSign; + const SecondScreen({required this.activeAtSign, Key? key}) : super(key: key); @override @@ -70,12 +71,14 @@ class _SecondScreenState extends State { ), ElevatedButton( onPressed: () async { + // ignore: deprecated_member_use AtSyncUIService().sync(); }, child: const Text('Default Sync'), ), ElevatedButton( onPressed: () async { + // ignore: deprecated_member_use AtSyncUIService().sync( atSyncUIOverlay: AtSyncUIOverlay.dialog, ); @@ -84,6 +87,7 @@ class _SecondScreenState extends State { ), ElevatedButton( onPressed: () async { + // ignore: deprecated_member_use AtSyncUIService().sync( atSyncUIOverlay: AtSyncUIOverlay.snackbar, ); @@ -92,6 +96,7 @@ class _SecondScreenState extends State { ), ElevatedButton( onPressed: () async { + // ignore: deprecated_member_use AtSyncUIService().sync( atSyncUIOverlay: AtSyncUIOverlay.none, ); @@ -133,6 +138,7 @@ class _SecondScreenState extends State { ), floatingActionButton: FloatingActionButton( onPressed: () async { + // ignore: deprecated_member_use AtSyncUIService().sync( atSyncUIOverlay: AtSyncUIOverlay.none, ); diff --git a/packages/at_sync_ui_flutter/example/pubspec.yaml b/packages/at_sync_ui_flutter/example/pubspec.yaml index 3fd555aaf..94b5d73db 100644 --- a/packages/at_sync_ui_flutter/example/pubspec.yaml +++ b/packages/at_sync_ui_flutter/example/pubspec.yaml @@ -29,9 +29,7 @@ environment: dependencies: at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 - at_onboarding_flutter: ^6.1.3 - at_sync_ui_flutter: - path: ../ + at_onboarding_flutter: ^6.1.5 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.6 @@ -39,6 +37,10 @@ dependencies: sdk: flutter flutter_colorpicker: ^1.0.3 +dependency_overrides: + at_sync_ui_flutter: + path: ../ + 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_sync_ui_flutter/lib/services/at_sync_ui_services.dart b/packages/at_sync_ui_flutter/lib/services/at_sync_ui_services.dart index bd3a124fb..2acf89b9f 100644 --- a/packages/at_sync_ui_flutter/lib/services/at_sync_ui_services.dart +++ b/packages/at_sync_ui_flutter/lib/services/at_sync_ui_services.dart @@ -1,13 +1,13 @@ // ignore_for_file: implementation_imports, prefer_typing_uninitialized_variables import 'dart:async'; -import 'package:at_client/src/service/sync_service.dart'; import 'package:at_client/at_client.dart'; import 'package:at_sync_ui_flutter/at_sync_ui.dart'; import 'package:flutter/material.dart'; class AtSyncUIService extends SyncProgressListener { static final AtSyncUIService _singleton = AtSyncUIService._internal(); + AtSyncUIService._internal(); factory AtSyncUIService() { @@ -47,6 +47,7 @@ class AtSyncUIService extends SyncProgressListener { /// [atSyncUIListener] can be used to listen to sync status changes Stream get atSyncUIListener => _atSyncUIListenerController.stream as Stream; + StreamSink get _atSyncUIListenerSink => _atSyncUIListenerController.sink as StreamSink; @@ -101,10 +102,12 @@ class AtSyncUIService extends SyncProgressListener { var _atSyncUIController = AtSyncUIController(); AtSyncUI.instance.setupController(controller: _atSyncUIController); - syncService = AtClientManager.getInstance().syncService; + syncService = AtClientManager.getInstance().atClient.syncService; syncService!.addProgressListener(this); + // ignore: deprecated_member_use syncService!.setOnDone(_onSuccessCallback); + // ignore: deprecated_member_use_from_same_package sync(atSyncUIOverlay: atSyncUIOverlay!, startTimer: startTimer); } From 14dcee0a79ce4a6fbb7ad793c2a4ec775e1bb33a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:30:32 +0000 Subject: [PATCH 108/176] build(deps): bump actions/dependency-review-action from 3.1.4 to 3.1.5 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/01bc87099ba56df1e897b6874784491ea6309bc4...c74b580d73376b7750d3d2a50bfb8adc2c937507) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 10eb78023..130191f0f 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4 + uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5 From 5e15e70b5c493e8cb6b1b48bceca62c31df0ac2f Mon Sep 17 00:00:00 2001 From: Sarthak Bakre Date: Wed, 10 Jan 2024 17:03:38 +0530 Subject: [PATCH 109/176] fix: fixed windows upload atKey issues --- .../lib/screen/at_onboarding_home_screen.dart | 6 +++--- .../lib/screen/at_onboarding_start_screen.dart | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index f22a494b8..92182b4b3 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -537,11 +537,11 @@ class _AtOnboardingHomeScreenState extends State { Future _desktopKeyPicker() async { try { XFile? file = await openFile( - acceptedTypeGroups: const [ + acceptedTypeGroups: [ // General file extensions - XTypeGroup(extensions: ['atKeys', 'atkeys']), + const XTypeGroup(extensions: ['atKeys', 'atkeys']), // Apple specific UTIs - XTypeGroup(uniformTypeIdentifiers: ['com.atsign.atkeys']), + XTypeGroup(uniformTypeIdentifiers: Platform.isMacOS ? ['com.atsign.atkeys'] : null), ], ); return file?.path; diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart index e929e9dcb..bbb2ad54b 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart @@ -8,6 +8,7 @@ import 'package:at_onboarding_flutter/screen/at_onboarding_intro_screen.dart'; import 'package:at_onboarding_flutter/services/at_onboarding_config.dart'; import 'package:at_onboarding_flutter/services/onboarding_service.dart'; import 'package:at_onboarding_flutter/utils/at_onboarding_dimens.dart'; +import 'package:at_onboarding_flutter/utils/at_onboarding_error_util.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart'; import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart'; import 'package:at_sync_ui_flutter/at_sync_material.dart'; @@ -93,10 +94,11 @@ class _AtOnboardingStartScreenState extends State { Navigator.pop(context, result); } else { if (!mounted) return; + var message = AtOnboardingErrorToString().getErrorMessage(e); Navigator.pop( context, AtOnboardingResult.error( - message: "$e", + message: message, ), ); } From dc5929e1090d043dcd02c71240da021715b411dc Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 10 Jan 2024 17:49:10 +0530 Subject: [PATCH 110/176] feat: release version 6.1.6 changelog --- packages/at_onboarding_flutter/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index de0ecad23..e6940445f 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 6.1.6 +- **FIX**: Fixed file_selector issue on Windows + ## 6.1.5 - **CHORE**: Updated tutorial_coach_mark from 1.2.9 to 1.2.11 From 7f40ad170c0be74fffedf8c4e41ca69ef63a2276 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 10 Jan 2024 18:03:33 +0530 Subject: [PATCH 111/176] feat: updated package version --- 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 80ba97cb8..66178daf8 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.5 +version: 6.1.6 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 From 2d8560cb3500acd4d41c7ae6b1393fcafbb79138 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:33:59 +0000 Subject: [PATCH 112/176] build(deps): bump actions/upload-artifact from 4.0.0 to 4.1.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/c7d193f32edcb7bfad88892161225aeda64e9392...1eb3cb2b3e0f29609092a73eb033bb759a334595) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index b11b8adf7..64d98fe24 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 + uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0 with: name: SARIF file path: results.sarif From 5a625f79eb75e88ae899b612caf11bbe2c810810 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Tue, 16 Jan 2024 16:32:01 +0530 Subject: [PATCH 113/176] chore: flutter analyze resolve --- packages/at_login_flutter/lib/services/at_login_service.dart | 5 ++--- packages/at_login_flutter/lib/services/size_config.dart | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) 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 ae60ed210..a37e629ea 100644 --- a/packages/at_login_flutter/lib/services/at_login_service.dart +++ b/packages/at_login_flutter/lib/services/at_login_service.dart @@ -11,7 +11,6 @@ import 'package:at_server_status/at_server_status.dart'; import 'package:at_utils/at_utils.dart'; import 'package:crypton/crypton.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; class AtLoginService { static final AtLoginService _singleton = AtLoginService._internal(); @@ -144,8 +143,8 @@ class AtLoginService { .getEncryptionPrivateKey(); var privateKey = RSAPrivateKey.fromString(encryptionPrivateKey ?? ''); - var dataSignature = privateKey.createSHA256Signature( - utf8.encode(atLoginObj.challenge ?? '') as Uint8List); + var dataSignature = privateKey + .createSHA256Signature(utf8.encode(atLoginObj.challenge ?? '')); var signature = base64Encode(dataSignature); await setAtsign(atLoginObj.atsign); diff --git a/packages/at_login_flutter/lib/services/size_config.dart b/packages/at_login_flutter/lib/services/size_config.dart index ff9f09676..d03cc2ab6 100644 --- a/packages/at_login_flutter/lib/services/size_config.dart +++ b/packages/at_login_flutter/lib/services/size_config.dart @@ -11,7 +11,6 @@ class SizeConfig { late double screenHeight; late double blockSizeHorizontal; late double blockSizeVertical; - double? deviceTextFactor; late double _safeAreaHorizontal; late double _safeAreaVertical; @@ -29,8 +28,6 @@ class SizeConfig { refHeight = 812; refWidth = 375; - deviceTextFactor = _mediaQueryData.textScaleFactor; - // print("height is::: $screenHeight"); if (screenHeight < 1200) { From 958bfa9092ca260caf7f923a645bb40a7270a1a5 Mon Sep 17 00:00:00 2001 From: Sachin Singh Date: Tue, 16 Jan 2024 18:15:50 +0530 Subject: [PATCH 114/176] chore: update version numbers and changelogs --- packages/at_backupkey_flutter/CHANGELOG.md | 4 ++++ packages/at_backupkey_flutter/pubspec.yaml | 2 +- packages/at_chat_flutter/CHANGELOG.md | 5 +++++ packages/at_chat_flutter/pubspec.yaml | 2 +- packages/at_follows_flutter/CHANGELOG.md | 4 ++++ packages/at_follows_flutter/pubspec.yaml | 2 +- packages/at_invitation_flutter/CHANGELOG.md | 11 ++++++++++- packages/at_invitation_flutter/pubspec.yaml | 2 +- packages/at_location_flutter/CHANGELOG.md | 5 ++++- packages/at_location_flutter/pubspec.yaml | 2 +- packages/at_sync_ui_flutter/CHANGELOG.md | 4 ++++ packages/at_sync_ui_flutter/pubspec.yaml | 2 +- 12 files changed, 37 insertions(+), 8 deletions(-) diff --git a/packages/at_backupkey_flutter/CHANGELOG.md b/packages/at_backupkey_flutter/CHANGELOG.md index b76559d10..333b4e38e 100644 --- a/packages/at_backupkey_flutter/CHANGELOG.md +++ b/packages/at_backupkey_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.12: +- **CHORE**: Updated dependencies +- **CHORE**: Lint fixes + ## 4.0.11: - **CHORE**: Bumped all dependency versions - Major version increase of permission_handler from ^10.4.1 to ^11.0.0 diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index 4c3ea1922..6c4035dda 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.11 +version: 4.0.12 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 c2fffce0e..316e57903 100644 --- a/packages/at_chat_flutter/CHANGELOG.md +++ b/packages/at_chat_flutter/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.0.11 + +- **CHORE**: Updated dependencies +- **CHORE**: Lint fixes + ## 3.0.10 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index 8fc02dc4e..2fcf8aed3 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.10 +version: 3.0.11 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_follows_flutter/CHANGELOG.md b/packages/at_follows_flutter/CHANGELOG.md index 1e967cddd..3a393d0c1 100644 --- a/packages/at_follows_flutter/CHANGELOG.md +++ b/packages/at_follows_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.11 +- **CHORE**: Updated dependencies +- **CHORE**: Lint fixes + ## 3.0.10 - **CHORE**: Bumped all dependency versions - Major version increase of permission_handler from ^9.2.0 to ^11.0.0 diff --git a/packages/at_follows_flutter/pubspec.yaml b/packages/at_follows_flutter/pubspec.yaml index 63cd4c542..1ca34e6b2 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.10 +version: 3.0.11 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 a8df366b4..cd6d239b9 100644 --- a/packages/at_invitation_flutter/CHANGELOG.md +++ b/packages/at_invitation_flutter/CHANGELOG.md @@ -1,14 +1,23 @@ +## 2.0.2 + +- **CHORE**: Updated dependencies +- **CHORE**: Lint fixes + ## 2.0.1 - **CHORE**: Bumped all dependency versions - - Major version increase of pin_code_fields from ^7.3.0 to ^8.0.1 +- Major version increase of pin_code_fields from ^7.3.0 to ^8.0.1 + ## 2.0.0 + - **DOCS**: Updated documentation - **CHORE**: Updated dependencies - **CHORE**: updated example to null safe version ## 1.0.1 + - **DOCS**: Updated documentation ## 1.0.0 + - The initial release contains feature to share data and invite any contact using SMS or email. diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index 7b0baf305..549591add 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.1 +version: 2.0.2 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 5d02f6ae8..53a4ac7e2 100644 --- a/packages/at_location_flutter/CHANGELOG.md +++ b/packages/at_location_flutter/CHANGELOG.md @@ -1,6 +1,9 @@ +# 3.1.11 +- **CHORE**: Lint fixes + # 3.1.10 - **CHORE**: Bumped all dependency versions - - Major version increase of geolocator from ^9.0.2 to ^10.0.1 +- 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 09966c29c..d354fa23f 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.10 +version: 3.1.11 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_sync_ui_flutter/CHANGELOG.md b/packages/at_sync_ui_flutter/CHANGELOG.md index aede5ad5b..5849606a9 100644 --- a/packages/at_sync_ui_flutter/CHANGELOG.md +++ b/packages/at_sync_ui_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.10 +- **CHORE**: Updated dependencies +- **CHORE**: Lint fixes + ## 1.0.9 - **CHORE**: Bumped all dependency versions - **REFACTOR**: Deprecated `sync()` method and moved it's implementation to init. 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 From 929434eca93225cba645455c284c53d0969aa9c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 10:43:30 +0000 Subject: [PATCH 115/176] build(deps): bump actions/upload-artifact from 4.1.0 to 4.2.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/1eb3cb2b3e0f29609092a73eb033bb759a334595...694cdabd8bdb0f10b2cea11669e1bf5453eed0a6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 64d98fe24..cfd9bd0b5 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0 + uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0 with: name: SARIF file path: results.sarif From 4eda0ece2448d1392773b51fe9f269e181064582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 10:43:35 +0000 Subject: [PATCH 116/176] build(deps): bump actions/dependency-review-action from 3.1.5 to 4.0.0 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.5 to 4.0.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/c74b580d73376b7750d3d2a50bfb8adc2c937507...4901385134134e04cec5fbe5ddfe3b2c5bd5d976) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 130191f0f..3fa8b859b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5 + uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976 # v4.0.0 From 5f3a2464cdba8fcbfef9ab007a93ccc92b775492 Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:53:39 +0000 Subject: [PATCH 117/176] ci: Restore static analysis of packages that were previously failing --- .github/workflows/static_analysis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 35bca164d..bfa162efd 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -20,19 +20,19 @@ jobs: fail-fast: false matrix: package: - # at_backupkey_flutter - #- at_chat_flutter + - at_backupkey_flutter + - at_chat_flutter - at_common_flutter - at_contacts_flutter - at_contacts_group_flutter - at_events_flutter - #- at_follows_flutter - #- at_invitation_flutter - #- at_location_flutter - #- at_login_flutter + - at_follows_flutter + - at_invitation_flutter + - at_location_flutter + - at_login_flutter - at_notify_flutter - at_onboarding_flutter - #- at_sync_ui_flutter + - at_sync_ui_flutter - at_theme_flutter steps: From 9d5f1c92f9b8b682618acdde8b4ffc4acb0086f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:13:58 +0000 Subject: [PATCH 118/176] build(deps): bump actions/upload-artifact from 4.2.0 to 4.3.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/694cdabd8bdb0f10b2cea11669e1bf5453eed0a6...26f96dfa697d77e81fd5907df203aa23a56210a8) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index cfd9bd0b5..fecacaf9a 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0 + uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 with: name: SARIF file path: results.sarif From e6a3e974a579e528a6534f38c4f0743542c1ebd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 10:48:12 +0000 Subject: [PATCH 119/176] build(deps): bump step-security/harden-runner from 2.6.1 to 2.7.0 Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/eb238b55efaa70779f274895e782ed17c84f2895...63c24ba6bd7ba022e95695ff85de572c04a18142) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 3fa8b859b..fc3a42dfa 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1 + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 with: egress-policy: audit From 8346548a4a1dfd49c5d097b64c518b6861309afc Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 31 Jan 2024 20:01:08 +0530 Subject: [PATCH 120/176] chore: updated textScaleFactor to textScaler --- .../at_contacts_flutter/lib/widgets/add_contacts_dialog.dart | 2 +- packages/at_contacts_flutter/lib/widgets/common_button.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/at_contacts_flutter/lib/widgets/add_contacts_dialog.dart b/packages/at_contacts_flutter/lib/widgets/add_contacts_dialog.dart index 7dbd4b71e..e68d96f84 100644 --- a/packages/at_contacts_flutter/lib/widgets/add_contacts_dialog.dart +++ b/packages/at_contacts_flutter/lib/widgets/add_contacts_dialog.dart @@ -47,7 +47,7 @@ class _AddContactDialogState extends State { @override Widget build(BuildContext context) { var contactService = ContactService(); - var deviceTextFactor = MediaQuery.of(context).textScaleFactor; + var deviceTextFactor = MediaQuery.of(context).textScaler.scale(20) / 20; return SizedBox( height: 140.toHeight * deviceTextFactor, width: 100.toWidth, diff --git a/packages/at_contacts_flutter/lib/widgets/common_button.dart b/packages/at_contacts_flutter/lib/widgets/common_button.dart index abbc33380..2dd2d54e8 100644 --- a/packages/at_contacts_flutter/lib/widgets/common_button.dart +++ b/packages/at_contacts_flutter/lib/widgets/common_button.dart @@ -25,7 +25,7 @@ class CommonButton extends StatelessWidget { @override Widget build(BuildContext context) { - double deviceTextFactor = MediaQuery.of(context).textScaleFactor; + var deviceTextFactor = MediaQuery.of(context).textScaler.scale(20) / 20; return InkWell( onTap: onTap, child: Container( From be164d4109f1d700e0eea3d3f434c439e95f243e Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 6 Feb 2024 15:28:24 +0530 Subject: [PATCH 121/176] fix: updated dependencies and fixed formatting --- .../example/ios/Podfile.lock | 6 +-- .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../lib/screen/at_onboarding_home_screen.dart | 4 +- packages/at_onboarding_flutter/pubspec.yaml | 38 +++++++++---------- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/packages/at_onboarding_flutter/example/ios/Podfile.lock b/packages/at_onboarding_flutter/example/ios/Podfile.lock index 912368ca6..e5fcedfbe 100644 --- a/packages/at_onboarding_flutter/example/ios/Podfile.lock +++ b/packages/at_onboarding_flutter/example/ios/Podfile.lock @@ -144,7 +144,7 @@ SPEC CHECKSUMS: device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 @@ -155,9 +155,9 @@ SPEC CHECKSUMS: qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d diff --git a/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/project.pbxproj index 450f1a9f3..0049911a6 100644 --- a/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a33..a6b826db2 100644 --- a/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { // General file extensions const XTypeGroup(extensions: ['atKeys', 'atkeys']), // Apple specific UTIs - XTypeGroup(uniformTypeIdentifiers: Platform.isMacOS ? ['com.atsign.atkeys'] : null), + XTypeGroup( + uniformTypeIdentifiers: + Platform.isMacOS ? ['com.atsign.atkeys'] : null), ], ); return file?.path; diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 66178daf8..c32bb904a 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -13,36 +13,36 @@ 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 + archive: ^3.4.10 + at_backupkey_flutter: ^4.0.12 + at_client: ^3.0.72 + at_client_mobile: ^3.2.14 + at_commons: ^4.0.1 + at_server_status: ^1.0.4 + at_sync_ui_flutter: ^1.0.10 + at_utils: ^3.0.16 + file_picker: ^6.1.1 # desktop - dependencies - file_selector: ^1.0.1 + file_selector: ^1.0.3 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 + http: ^1.2.0 + image: ^4.1.6 - intl: ^0.17.0 - path_provider: ^2.1.1 - permission_handler: ^11.0.0 + intl: ^0.19.0 + path_provider: ^2.1.2 + permission_handler: ^11.2.0 pin_code_fields: ^8.0.1 qr_code_scanner: ^1.0.1 - shared_preferences: ^2.2.1 + shared_preferences: ^2.2.2 tutorial_coach_mark: ^1.2.11 - url_launcher: ^6.1.14 - webview_flutter: ^4.2.4 - zxing2: ^0.2.0 + url_launcher: ^6.2.4 + webview_flutter: ^4.5.0 + zxing2: ^0.2.1 From d031ca26d25a2ccd25fad2d69cf19cca3872081f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:04:36 +0000 Subject: [PATCH 122/176] build(deps): bump actions/upload-artifact from 4.3.0 to 4.3.1 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/26f96dfa697d77e81fd5907df203aa23a56210a8...5d5d22a31266ced268874388b861e4b58bb5c2f3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index fecacaf9a..55bc57aea 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: SARIF file path: results.sarif From 8f28bc9ffec75d4e0e50c5265153b8d79d6d34b7 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 7 Feb 2024 14:28:34 +0530 Subject: [PATCH 123/176] feat/v6.1.7 release changes --- packages/at_onboarding_flutter/CHANGELOG.md | 4 ++++ packages/at_onboarding_flutter/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/at_onboarding_flutter/CHANGELOG.md b/packages/at_onboarding_flutter/CHANGELOG.md index e6940445f..e220b5212 100644 --- a/packages/at_onboarding_flutter/CHANGELOG.md +++ b/packages/at_onboarding_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.1.7 +- **CHORE**: Bumped all dependency versions + - Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 6.1.6 - **FIX**: Fixed file_selector issue on Windows diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index c32bb904a..0972cddc7 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.6 +version: 6.1.7 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 From 2128213421a807b08628a1f75bc536d0299b7ecd Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 11:31:27 +0530 Subject: [PATCH 124/176] feat: uptake at_commons: 4.0.1 in at_contacts_flutter and at_chat_flutter --- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- packages/at_chat_flutter/example/pubspec.yaml | 2 +- packages/at_chat_flutter/pubspec.yaml | 8 +++--- .../example/ios/Podfile.lock | 28 +++++++++++++------ .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../at_contacts_flutter/example/pubspec.yaml | 2 +- packages/at_contacts_flutter/pubspec.yaml | 6 ++-- .../Flutter/GeneratedPluginRegistrant.swift | 4 ++- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- 10 files changed, 36 insertions(+), 22 deletions(-) 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/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_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_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_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")) From 3651a0e7117d1001303e761cc7d37bb62ecd35c1 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 13:12:42 +0530 Subject: [PATCH 125/176] chore: updated at_contacts_groups deps --- packages/at_contacts_group_flutter/example/pubspec.yaml | 5 ++++- packages/at_contacts_group_flutter/pubspec.yaml | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) 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: From 33fdd62ad52ac1b3ca783d758697e9ea7bb5ca4a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 13:27:55 +0530 Subject: [PATCH 126/176] chore: updated deps for at_location_flutter and at_events_flutter --- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 4 +++- packages/at_events_flutter/example/pubspec.yaml | 6 +++++- packages/at_events_flutter/pubspec.yaml | 8 ++++++-- packages/at_location_flutter/example/pubspec.yaml | 5 ++++- packages/at_location_flutter/pubspec.yaml | 7 +++++-- 5 files changed, 23 insertions(+), 7 deletions(-) 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_events_flutter/example/pubspec.yaml b/packages/at_events_flutter/example/pubspec.yaml index 1d8fe1c11..9c9b4d39d 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: ^5.2.4 + 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/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 969525623..8ce44ab7f 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: ^5.2.4 + dev_dependencies: flutter_lints: ^2.0.3 flutter_test: 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/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: From ad41a48a4a84ef05795c31d9877971e489185eec Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 13:42:32 +0530 Subject: [PATCH 127/176] chore: updated deps to support at_commons: 4.0.1 --- packages/at_follows_flutter/example/pubspec.yaml | 2 +- packages/at_follows_flutter/pubspec.yaml | 4 ++-- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- packages/at_invitation_flutter/example/pubspec.yaml | 2 +- packages/at_invitation_flutter/pubspec.yaml | 2 +- packages/at_login_flutter/example/pubspec.yaml | 2 +- packages/at_login_flutter/pubspec.yaml | 6 +++--- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- packages/at_notify_flutter/example/pubspec.yaml | 2 +- packages/at_notify_flutter/pubspec.yaml | 4 ++-- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- packages/at_theme_flutter/example/pubspec.yaml | 2 +- packages/at_theme_flutter/pubspec.yaml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) 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/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_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/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_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/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/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 From d6f96ac4acb12dee2cce136653adcbb2a60e2a3e Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:33:01 +0530 Subject: [PATCH 128/176] fix: fixed warnnings in at_chat_flutter --- .../lib/services/chat_service.dart | 24 +++++++++---------- .../test/unit_test/chat_screen_test.dart | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) 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/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"; From fdb2e3c2368fd107e145012051cdfe33408691b6 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:39:22 +0530 Subject: [PATCH 129/176] fix: fixed warnnings in at_contacts_flutter --- .../at_contacts_flutter/lib/services/contact_service.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/at_contacts_flutter/lib/services/contact_service.dart b/packages/at_contacts_flutter/lib/services/contact_service.dart index b22e4ada0..8d6bcc7c9 100644 --- a/packages/at_contacts_flutter/lib/services/contact_service.dart +++ b/packages/at_contacts_flutter/lib/services/contact_service.dart @@ -571,7 +571,7 @@ class ContactService { key.sharedBy = atSign; key.metadata = metadata; // making isPublic true (as get method changes it to false) - key.metadata?.isBinary = true; + key.metadata.isBinary = true; key.key = contactFields[2]; Uint8List? image; @@ -609,7 +609,7 @@ class ContactService { key.sharedBy = atsign; key.metadata = metadata; // making isPublic true (as get method changes it to false) - key.metadata?.isBinary = true; + key.metadata.isBinary = true; key.key = "image.wavi"; GetRequestOptions options = GetRequestOptions(); @@ -641,7 +641,7 @@ class ContactService { key.sharedBy = atsign; key.metadata = metadata; // making isPublic true (as get method changes it to false) - key.metadata?.isBinary = true; + key.metadata.isBinary = true; key.key = "image.wavi"; var result = await atClientManager.atClient.getMeta(key); From 5c4808733649a76b668169414015a41f8d16a83b Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:44:55 +0530 Subject: [PATCH 130/176] fix: fixed warnnings in at_events_flutter --- .../at_events_flutter/lib/services/contact_service.dart | 2 +- .../lib/services/event_key_stream_service.dart | 4 ++-- .../at_events_flutter/lib/services/event_services.dart | 8 ++++---- .../at_events_flutter/lib/services/venues_services.dart | 8 ++++---- .../at_events_flutter/lib/utils/init_events_service.dart | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) 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 = From 6a0d1d048353b01b47e9ea6f01e3c99bc5124e7a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:48:40 +0530 Subject: [PATCH 131/176] fix: fixed warnnings in at_follows_flutter --- .../example/lib/services/at_service.dart | 4 +-- .../lib/services/connections_service.dart | 26 +++++++++---------- .../lib/services/sdk_service.dart | 4 +-- .../unit_tests/connections_service_test.dart | 10 +++---- 4 files changed, 22 insertions(+), 22 deletions(-) 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/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/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 = From 6ea637b0d7d15138eb62aa270df353dafc11898b Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:50:40 +0530 Subject: [PATCH 132/176] fix: fixed warnnings in at_invitation_flutter --- .../lib/services/invitation_service.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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() From c67251336c7986435c6b07aaa9b5ae7ad688670d Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:54:41 +0530 Subject: [PATCH 133/176] fix: fixed warnnings in at_location_flutter --- .../lib/service/contact_service.dart | 2 +- .../lib/service/notify_and_put.dart | 4 ++-- .../lib/service/request_location_service.dart | 14 +++++++------- .../lib/service/send_location_notification.dart | 6 +++--- .../lib/service/sharing_location_service.dart | 14 +++++++------- .../lib/utils/constants/init_location_service.dart | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) 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; } From 0f739b09a23b77b8872f4bf2537f58ee28590aed Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:56:10 +0530 Subject: [PATCH 134/176] fix: fixed warnnings in at_login_flutter --- packages/at_login_flutter/lib/services/at_login_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'); From 1c9866c4cd0caffbb2964ec298927e91777d8c77 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:57:12 +0530 Subject: [PATCH 135/176] fix: fixed warnnings in at_theme_flutter --- packages/at_theme_flutter/lib/services/theme_service.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } From 5a284987803cdae99d7cc0ebf0f5cb21cd3c4119 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 15:23:38 +0530 Subject: [PATCH 136/176] chore: fixed file picker dependency --- packages/at_events_flutter/example/pubspec.yaml | 2 +- packages/at_events_flutter/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/at_events_flutter/example/pubspec.yaml b/packages/at_events_flutter/example/pubspec.yaml index 9c9b4d39d..3a99587bb 100644 --- a/packages/at_events_flutter/example/pubspec.yaml +++ b/packages/at_events_flutter/example/pubspec.yaml @@ -45,7 +45,7 @@ dependencies: dependency_overrides: at_commons: ^4.0.1 - file_picker: ^5.2.4 + file_picker: ^6.1.1 dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to diff --git a/packages/at_events_flutter/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 8ce44ab7f..19ada3a88 100644 --- a/packages/at_events_flutter/pubspec.yaml +++ b/packages/at_events_flutter/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: dependency_overrides: at_commons: ^4.0.1 - file_picker: ^5.2.4 + file_picker: ^6.1.1 dev_dependencies: flutter_lints: ^2.0.3 From 8519499a8373d5c6712c13cb539aac87147ed9bf Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 12:10:06 +0530 Subject: [PATCH 137/176] feat/release changes v4.0.14 --- packages/at_contacts_flutter/CHANGELOG.md | 4 ++++ packages/at_contacts_flutter/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/at_contacts_flutter/CHANGELOG.md b/packages/at_contacts_flutter/CHANGELOG.md index 64791c8e3..2d954f516 100644 --- a/packages/at_contacts_flutter/CHANGELOG.md +++ b/packages/at_contacts_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.14 +- **CHORE**: Bumped up dependency versions + - Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 4.0.13 - **FIX**: Fixed methods for fetching profile picture diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index a13d37b8f..f8a5e42fe 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.13 +version: 4.0.14 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 From 860259f5fc19a9fea7d193d7b5450561a3e32302 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 12:25:04 +0530 Subject: [PATCH 138/176] feat/updated changelogs --- packages/at_contacts_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_contacts_flutter/CHANGELOG.md b/packages/at_contacts_flutter/CHANGELOG.md index 2d954f516..8c96f9b4a 100644 --- a/packages/at_contacts_flutter/CHANGELOG.md +++ b/packages/at_contacts_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 4.0.14 - **CHORE**: Bumped up dependency versions - - Major version increase of at_commons from ^3.0.55 to ^4.0.1 +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 ## 4.0.13 From db4d83beb6bc6aee6e2cc89ed08b4f1f7c834585 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 13:12:21 +0530 Subject: [PATCH 139/176] feat: at_backupkey_flutter deps update and warnings fix --- packages/at_backupkey_flutter/example/pubspec.yaml | 2 +- packages/at_backupkey_flutter/lib/utils/size_config.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/at_backupkey_flutter/example/pubspec.yaml b/packages/at_backupkey_flutter/example/pubspec.yaml index b298a24a9..824857739 100644 --- a/packages/at_backupkey_flutter/example/pubspec.yaml +++ b/packages/at_backupkey_flutter/example/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: at_app_flutter: ^5.2.0 at_client_mobile: ^3.2.12 - 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_backupkey_flutter/lib/utils/size_config.dart b/packages/at_backupkey_flutter/lib/utils/size_config.dart index 84628d5a4..13abe444f 100644 --- a/packages/at_backupkey_flutter/lib/utils/size_config.dart +++ b/packages/at_backupkey_flutter/lib/utils/size_config.dart @@ -33,8 +33,8 @@ class SizeConfig { refHeight = height ?? 812; refWidth = width ?? 375; - deviceTextFactor = _mediaQueryData.textScaleFactor; - + deviceTextFactor = _mediaQueryData.textScaler.scale(20) / 20; + if (screenHeight < 1200) { blockSizeHorizontal = screenWidth / 100; blockSizeVertical = screenHeight / 100; From e340e6f218ad0c9703f98edbda3140b6c0c1925e Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 14:00:35 +0530 Subject: [PATCH 140/176] chore: fixed formatting --- .../at_chat_flutter/example/ios/Podfile.lock | 26 ++++++++++++------- .../lib/models/message_model.dart | 1 + .../test/test_material_app.dart | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/at_chat_flutter/example/ios/Podfile.lock b/packages/at_chat_flutter/example/ios/Podfile.lock index 044417529..5029043c6 100644 --- a/packages/at_chat_flutter/example/ios/Podfile.lock +++ b/packages/at_chat_flutter/example/ios/Podfile.lock @@ -45,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 @@ -54,7 +56,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.0): + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -81,6 +83,7 @@ DEPENDENCIES: - 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`) @@ -115,6 +118,8 @@ EXTERNAL SOURCES: :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: @@ -142,24 +147,25 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed + 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: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 - permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4 + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + 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_chat_flutter/lib/models/message_model.dart b/packages/at_chat_flutter/lib/models/message_model.dart index 2f101150d..a46a74c69 100644 --- a/packages/at_chat_flutter/lib/models/message_model.dart +++ b/packages/at_chat_flutter/lib/models/message_model.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'dart:typed_data'; enum MessageType { incoming, outgoing } + enum MessageContentType { text, image } extension MessageContentTypeExt on MessageContentType { diff --git a/packages/at_chat_flutter/test/test_material_app.dart b/packages/at_chat_flutter/test/test_material_app.dart index 0b35c2cac..0c32cf673 100644 --- a/packages/at_chat_flutter/test/test_material_app.dart +++ b/packages/at_chat_flutter/test/test_material_app.dart @@ -8,4 +8,4 @@ class TestMaterialApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp(title: 'Widget Test', home: home); } -} \ No newline at end of file +} From 23a46efafadadedc4eba427a297d3e80a2fcfe5a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:14:45 +0530 Subject: [PATCH 141/176] chore: updated textScaleFactor to textScaler --- packages/at_common_flutter/example/ios/Podfile.lock | 2 +- packages/at_common_flutter/lib/services/size_config.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/at_common_flutter/example/ios/Podfile.lock b/packages/at_common_flutter/example/ios/Podfile.lock index 7413630ec..d7fdb4f67 100644 --- a/packages/at_common_flutter/example/ios/Podfile.lock +++ b/packages/at_common_flutter/example/ios/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_common_flutter/lib/services/size_config.dart b/packages/at_common_flutter/lib/services/size_config.dart index e8f20ecc5..c4cd75ce9 100644 --- a/packages/at_common_flutter/lib/services/size_config.dart +++ b/packages/at_common_flutter/lib/services/size_config.dart @@ -44,7 +44,7 @@ class SizeConfig { refHeight = 812; refWidth = 375; - deviceTextFactor = _mediaQueryData.textScaleFactor; + deviceTextFactor = _mediaQueryData.textScaler.scale(20) / 20; // print("height is::: $screenHeight"); From ccfe4698efbf9eea42c7e1da20b256c60905fe9b Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:17:54 +0530 Subject: [PATCH 142/176] chore: fixed formatting in at_contacts_flutter --- .../at_contacts_flutter/lib/screens/contacts_screen.dart | 4 ++-- .../at_contacts_flutter/lib/services/contact_service.dart | 2 +- .../at_contacts_flutter/lib/widgets/blocked_user_card.dart | 6 +++--- packages/at_contacts_flutter/test/test_material_app.dart | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/at_contacts_flutter/lib/screens/contacts_screen.dart b/packages/at_contacts_flutter/lib/screens/contacts_screen.dart index 776017ace..2e39fc6a5 100644 --- a/packages/at_contacts_flutter/lib/screens/contacts_screen.dart +++ b/packages/at_contacts_flutter/lib/screens/contacts_screen.dart @@ -282,8 +282,8 @@ class _ContactsScreenState extends State { return Padding( padding: const EdgeInsets.all(8.0), child: Slidable( - endActionPane: ActionPane(motion: const ScrollMotion(), children: - [ + endActionPane: + ActionPane(motion: const ScrollMotion(), children: [ SlidableAction( label: TextStrings().block, backgroundColor: ColorConstants.inputFieldColor, diff --git a/packages/at_contacts_flutter/lib/services/contact_service.dart b/packages/at_contacts_flutter/lib/services/contact_service.dart index 8d6bcc7c9..1d5b14522 100644 --- a/packages/at_contacts_flutter/lib/services/contact_service.dart +++ b/packages/at_contacts_flutter/lib/services/contact_service.dart @@ -628,7 +628,7 @@ class ContactService { contactDetails['image'] = null; return contactDetails; } - }else { + } else { return null; } } diff --git a/packages/at_contacts_flutter/lib/widgets/blocked_user_card.dart b/packages/at_contacts_flutter/lib/widgets/blocked_user_card.dart index 6e7987fe1..571ddfd59 100644 --- a/packages/at_contacts_flutter/lib/widgets/blocked_user_card.dart +++ b/packages/at_contacts_flutter/lib/widgets/blocked_user_card.dart @@ -47,17 +47,17 @@ class _BlockedUserCardState extends State { contactImage = image != null ? CustomCircleAvatar( - size: SizeConfig().isTablet(context)? 32: 45, + size: SizeConfig().isTablet(context) ? 32 : 45, byteImage: image, nonAsset: true, ) : ContactInitial( - size: SizeConfig().isTablet(context)? 32: 45, + size: SizeConfig().isTablet(context) ? 32 : 45, initials: widget.blockeduser!.atSign!, ); } else { contactImage = ContactInitial( - size: SizeConfig().isTablet(context)? 32: 45, + size: SizeConfig().isTablet(context) ? 32 : 45, initials: widget.blockeduser!.atSign!, ); } diff --git a/packages/at_contacts_flutter/test/test_material_app.dart b/packages/at_contacts_flutter/test/test_material_app.dart index 0b35c2cac..0c32cf673 100644 --- a/packages/at_contacts_flutter/test/test_material_app.dart +++ b/packages/at_contacts_flutter/test/test_material_app.dart @@ -8,4 +8,4 @@ class TestMaterialApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp(title: 'Widget Test', home: home); } -} \ No newline at end of file +} From 329ccac0f5bccb983fe53a6d121c5100b35767d3 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:50:19 +0530 Subject: [PATCH 143/176] feat: removed deps overrides, fixed warnings --- .../example/ios/Podfile.lock | 75 ++++++++++--------- .../example/pubspec.yaml | 3 - .../widgets/add_contacts_group_dialog.dart | 2 +- .../lib/widgets/add_single_contact_group.dart | 2 +- .../lib/widgets/loading_widget.dart | 2 +- .../at_contacts_group_flutter/pubspec.yaml | 7 +- 6 files changed, 45 insertions(+), 46 deletions(-) diff --git a/packages/at_contacts_group_flutter/example/ios/Podfile.lock b/packages/at_contacts_group_flutter/example/ios/Podfile.lock index 03b87576e..bc518c702 100644 --- a/packages/at_contacts_group_flutter/example/ios/Podfile.lock +++ b/packages/at_contacts_group_flutter/example/ios/Podfile.lock @@ -62,38 +62,43 @@ PODS: - fluttertoast (0.0.2): - Flutter - Toast - - libwebp (1.2.4): - - libwebp/demux (= 1.2.4) - - libwebp/mux (= 1.2.4) - - libwebp/webp (= 1.2.4) - - libwebp/demux (1.2.4): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.2.4): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/webp (1.2.4) + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv - Mantle (2.2.0): - Mantle/extobjc (= 2.2.0) - Mantle/extobjc (2.2.0) - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner - - SDWebImage (5.15.5): - - SDWebImage/Core (= 5.15.5) - - SDWebImage/Core (5.15.5) - - SDWebImageWebPCoder (0.11.0): + - SDWebImage (5.18.10): + - SDWebImage/Core (= 5.18.10) + - SDWebImage/Core (5.18.10) + - SDWebImageWebPCoder (0.14.5): - libwebp (~> 1.0) - - SDWebImage/Core (~> 5.15) + - SDWebImage/Core (~> 5.17) - share_plus (0.0.1): - Flutter - - shared_preferences_ios (0.0.1): + - shared_preferences_foundation (0.0.1): - Flutter + - FlutterMacOS - SwiftyGif (5.4.4) - Toast (4.0.0) - url_launcher_ios (0.0.1): @@ -117,11 +122,11 @@ DEPENDENCIES: - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -168,16 +173,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/fluttertoast/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -190,32 +195,32 @@ SPEC CHECKSUMS: at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + emoji_picker_flutter: fe2e6151c5b548e975d546e6eeb567daf0962a58 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 - fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b - libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe - SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499 - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec + SDWebImageWebPCoder: c94f09adbca681822edad9e532ac752db713eabf + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: 00aeb49562056f541ea701239573568e7adc5deb -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_contacts_group_flutter/example/pubspec.yaml b/packages/at_contacts_group_flutter/example/pubspec.yaml index 370bf4451..b89738ef0 100644 --- a/packages/at_contacts_group_flutter/example/pubspec.yaml +++ b/packages/at_contacts_group_flutter/example/pubspec.yaml @@ -46,9 +46,6 @@ dependencies: 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/lib/widgets/add_contacts_group_dialog.dart b/packages/at_contacts_group_flutter/lib/widgets/add_contacts_group_dialog.dart index 2ecd8ebfe..af1678ae7 100644 --- a/packages/at_contacts_group_flutter/lib/widgets/add_contacts_group_dialog.dart +++ b/packages/at_contacts_group_flutter/lib/widgets/add_contacts_group_dialog.dart @@ -32,7 +32,7 @@ class _AddContactDialogState extends State { @override Widget build(BuildContext context) { var _contactService = ContactService(); - var deviceTextFactor = MediaQuery.of(context).textScaleFactor; + var deviceTextFactor = MediaQuery.of(context).textScaler.scale(20)/20; return SizedBox( height: 100.toHeight * deviceTextFactor, width: 100.toWidth, diff --git a/packages/at_contacts_group_flutter/lib/widgets/add_single_contact_group.dart b/packages/at_contacts_group_flutter/lib/widgets/add_single_contact_group.dart index bf435b27c..00b255bd8 100644 --- a/packages/at_contacts_group_flutter/lib/widgets/add_single_contact_group.dart +++ b/packages/at_contacts_group_flutter/lib/widgets/add_single_contact_group.dart @@ -25,7 +25,7 @@ class _AddSingleContactState extends State { @override Widget build(BuildContext context) { SizeConfig().init(context); - var deviceTextFactor = MediaQuery.of(context).textScaleFactor; + var deviceTextFactor = MediaQuery.of(context).textScaler.scale(20) / 20; return SizedBox( height: 100 * deviceTextFactor, width: 100, diff --git a/packages/at_contacts_group_flutter/lib/widgets/loading_widget.dart b/packages/at_contacts_group_flutter/lib/widgets/loading_widget.dart index 2495e4df6..699d7f176 100644 --- a/packages/at_contacts_group_flutter/lib/widgets/loading_widget.dart +++ b/packages/at_contacts_group_flutter/lib/widgets/loading_widget.dart @@ -44,7 +44,7 @@ class LoadingDialog { Flexible( child: Text( text, - textScaleFactor: 1, + textScaler: const TextScaler.linear(1), style: style ?? TextStyle( color: ColorConstants.mildGrey, diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index 8d5b9ddd7..fdcec9448 100644 --- a/packages/at_contacts_group_flutter/pubspec.yaml +++ b/packages/at_contacts_group_flutter/pubspec.yaml @@ -15,9 +15,9 @@ 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_contact: ^3.0.8 - at_contacts_flutter: ^4.0.13 + at_contacts_flutter: ^4.0.14 at_utils: ^3.0.15 collection: ^1.17.0 emoji_picker_flutter: ^1.6.1 @@ -34,9 +34,6 @@ 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: From 23742eed5c5755182d2ea7647188b6eded7969e8 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:56:49 +0530 Subject: [PATCH 144/176] chore: fixed textScaler issue in at_events_flutter --- .../at_events_flutter/lib/common_components/loading_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_events_flutter/lib/common_components/loading_widget.dart b/packages/at_events_flutter/lib/common_components/loading_widget.dart index a20879485..9e397d965 100644 --- a/packages/at_events_flutter/lib/common_components/loading_widget.dart +++ b/packages/at_events_flutter/lib/common_components/loading_widget.dart @@ -31,7 +31,7 @@ class LoadingDialog { Flexible( child: Text( text, - textScaleFactor: 1, + textScaler: const TextScaler.linear(1), style: TextStyle( color: AllColors().MILD_GREY, fontSize: 20.toFont, From 218307f73b5b660e2540cda076c37eda06ec9c3a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:58:01 +0530 Subject: [PATCH 145/176] chore: dart format on at_events_flutter --- .../lib/common_components/display_tile.dart | 12 +++++++----- .../lib/models/event_notification.dart | 1 - .../lib/screens/create_event.dart | 16 +++++++--------- .../map_screen/events_collapsed_content.dart | 6 +++--- .../screens/map_screen/events_map_screen.dart | 1 - .../lib/screens/recurring_event.dart | 6 ++++-- .../lib/utils/init_events_service.dart | 2 -- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/packages/at_events_flutter/lib/common_components/display_tile.dart b/packages/at_events_flutter/lib/common_components/display_tile.dart index 7cde8f08f..9a3784e86 100644 --- a/packages/at_events_flutter/lib/common_components/display_tile.dart +++ b/packages/at_events_flutter/lib/common_components/display_tile.dart @@ -125,11 +125,13 @@ class _DisplayTileState extends State { widget.semiTitle != null ? Text( widget.semiTitle!, - style: (widget.semiTitle == AllText().ACTION_REQUIRED || - widget.semiTitle == AllText().REQ_DECLINED) || - (widget.semiTitle == AllText().CANCELLED) - ? CustomTextStyles().orange12 - : CustomTextStyles().darkGrey12, + style: + (widget.semiTitle == AllText().ACTION_REQUIRED || + widget.semiTitle == + AllText().REQ_DECLINED) || + (widget.semiTitle == AllText().CANCELLED) + ? CustomTextStyles().orange12 + : CustomTextStyles().darkGrey12, maxLines: 1, overflow: TextOverflow.ellipsis, ) diff --git a/packages/at_events_flutter/lib/models/event_notification.dart b/packages/at_events_flutter/lib/models/event_notification.dart index 4fe18171b..54cca59da 100644 --- a/packages/at_events_flutter/lib/models/event_notification.dart +++ b/packages/at_events_flutter/lib/models/event_notification.dart @@ -220,7 +220,6 @@ enum Week { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY } enum EndsOn { NEVER, ON, AFTER } - /// converts a weekday string to a Week enum value // ignore: missing_return Week getWeekEnum(String? weekday) { diff --git a/packages/at_events_flutter/lib/screens/create_event.dart b/packages/at_events_flutter/lib/screens/create_event.dart index 5ae5b8956..9765c0e09 100644 --- a/packages/at_events_flutter/lib/screens/create_event.dart +++ b/packages/at_events_flutter/lib/screens/create_event.dart @@ -283,8 +283,7 @@ class _CreateEventState extends State { dateToString( DateTime .now())) - ? '${AllText() - .EVENT_TODAY} (${timeOfDayToString(eventData.event!.startTime!)})' + ? '${AllText().EVENT_TODAY} (${timeOfDayToString(eventData.event!.startTime!)})' : '${AllText().EVENT_ON} ${(dateToString(eventData.event!.date!) != dateToString(DateTime.now()) ? dateToString(eventData.event!.date!) : dateToString(DateTime.now()))} (${timeOfDayToString(eventData.event!.startTime!)})') + ((dateToString(eventData .event! @@ -331,8 +330,8 @@ class _CreateEventState extends State { eventData.event! .repeatDuration != null) - ? Text('${AllText() - .REPEATS_EVERY} ${eventData.event!.repeatDuration} ${AllText().WEEK_ON} ${eventData.event!.date!.day} ${AllText().DAY}') + ? Text( + '${AllText().REPEATS_EVERY} ${eventData.event!.repeatDuration} ${AllText().WEEK_ON} ${eventData.event!.date!.day} ${AllText().DAY}') : (eventData.event! .repeatCycle == RepeatCycle @@ -340,9 +339,8 @@ class _CreateEventState extends State { eventData.event! .occursOn != null) - ? Text('${AllText() - .REPEATS_EVERY} ${eventData.event!.repeatDuration} ${AllText() - .WEEK_ON} ${getWeekString(eventData.event!.occursOn)} ') + ? Text( + '${AllText().REPEATS_EVERY} ${eventData.event!.repeatDuration} ${AllText().WEEK_ON} ${getWeekString(eventData.event!.occursOn)} ') : const SizedBox(), EventService() .eventNotificationModel! @@ -354,8 +352,8 @@ class _CreateEventState extends State { .event! .endsOn == EndsOn.AFTER - ? Text('${AllText() - .ENDS_AFTER} ${eventData.event!.endEventAfterOccurance} ${AllText().OCCURENCE}') + ? Text( + '${AllText().ENDS_AFTER} ${eventData.event!.endEventAfterOccurance} ${AllText().OCCURENCE}') : const SizedBox(), ], ), diff --git a/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart b/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart index a3f1fe1a3..97621720a 100644 --- a/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart +++ b/packages/at_events_flutter/lib/screens/map_screen/events_collapsed_content.dart @@ -103,8 +103,7 @@ class _EventsCollapsedContentState extends State { .atClientManager, isUpdate: true, eventData: eventListenerKeyword, - onEventSaved: (event) { - }, + onEventSaved: (event) {}, ), SizeConfig().screenHeight * 0.9, ); @@ -147,7 +146,8 @@ class _EventsCollapsedContentState extends State { ), const Divider(), DisplayTile( - title: '${eventListenerKeyword.atsignCreator} ${AllText().AND} ${eventListenerKeyword.group!.members!.length} ${AllText().MORE}', + title: + '${eventListenerKeyword.atsignCreator} ${AllText().AND} ${eventListenerKeyword.group!.members!.length} ${AllText().MORE}', atsignCreator: eventListenerKeyword.atsignCreator, semiTitle: (eventListenerKeyword.group!.members!.length == 1) diff --git a/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart b/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart index 2a4abebcc..dba89f553 100644 --- a/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart +++ b/packages/at_events_flutter/lib/screens/map_screen/events_map_screen.dart @@ -52,7 +52,6 @@ class EventsMapScreenData { eventNotifier!.notifyListeners(); } - /// calculates the AtSigns of members who have exited the event in the given EventNotificationModel void _calculateExitedAtsigns(EventNotificationModel _event) { _event.group!.members!.forEach((element) { diff --git a/packages/at_events_flutter/lib/screens/recurring_event.dart b/packages/at_events_flutter/lib/screens/recurring_event.dart index 38342bba5..64546c975 100644 --- a/packages/at_events_flutter/lib/screens/recurring_event.dart +++ b/packages/at_events_flutter/lib/screens/recurring_event.dart @@ -54,7 +54,8 @@ class _RecurringEventState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - CustomHeading(heading: AllText().RECURRING_EVENT, action: AllText().CANCEL), + CustomHeading( + heading: AllText().RECURRING_EVENT, action: AllText().CANCEL), const SizedBox(height: 25), Text(AllText().REPEAT_EVERY, style: CustomTextStyles().greyLabel14), SizedBox(height: 6.toHeight), @@ -240,7 +241,8 @@ class _RecurringEventState extends State { initialEntryMode: TimePickerEntryMode.input); if (eventData!.event!.endDate == null) { - CustomToast().show(AllText().SELECT_START_TIME_FIRST, context, + CustomToast().show( + AllText().SELECT_START_TIME_FIRST, context, isError: true); return; } 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 dc958625f..d70a782f4 100644 --- a/packages/at_events_flutter/lib/utils/init_events_service.dart +++ b/packages/at_events_flutter/lib/utils/init_events_service.dart @@ -95,7 +95,6 @@ Future createEvent(EventNotificationModel eventData) async { } } - /// This method deletes an event from the remote database using the provided event key /// It retrieves the event data associated with the key and checks if the current user is the creator of the event /// If the current user is not the creator, it throws an exception @@ -203,7 +202,6 @@ Future> getRegexKeys() async { return regexList; } - /// This method retrieves the value associated with the given key from the remote database /// It fetches the value using the provided key and converts it into an EventNotificationModel object /// If the value is found and successfully converted, the method returns the event data From 0e8508836f558ad75950d55e92a96de67bde62f2 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 10:04:50 +0530 Subject: [PATCH 146/176] feat: fixed textScaleFactor in at_events_flutter --- packages/at_follows_flutter/lib/services/size_config.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_follows_flutter/lib/services/size_config.dart b/packages/at_follows_flutter/lib/services/size_config.dart index ff9f09676..a0f6a2b28 100644 --- a/packages/at_follows_flutter/lib/services/size_config.dart +++ b/packages/at_follows_flutter/lib/services/size_config.dart @@ -29,7 +29,7 @@ class SizeConfig { refHeight = 812; refWidth = 375; - deviceTextFactor = _mediaQueryData.textScaleFactor; + deviceTextFactor = _mediaQueryData.textScaler.scale(20) / 20; // print("height is::: $screenHeight"); From 2cdde97274c0ea091bf34c58a35f738c5d86c24a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 10:27:35 +0530 Subject: [PATCH 147/176] feat: updated deps, fxied warnings, added documentation --- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../example/ios/Podfile.lock | 106 +++++++++++------- .../lib/services/invitation_service.dart | 4 + .../lib/utils/init_invitation_service.dart | 3 + .../lib/widgets/otp_dialog.dart | 2 +- .../lib/widgets/share_dialog.dart | 2 +- packages/at_invitation_flutter/pubspec.yaml | 10 +- 7 files changed, 83 insertions(+), 46 deletions(-) diff --git a/packages/at_invitation_flutter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/at_invitation_flutter/example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/packages/at_invitation_flutter/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/at_invitation_flutter/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/packages/at_invitation_flutter/example/ios/Podfile.lock b/packages/at_invitation_flutter/example/ios/Podfile.lock index 0551a8953..41358d2ca 100644 --- a/packages/at_invitation_flutter/example/ios/Podfile.lock +++ b/packages/at_invitation_flutter/example/ios/Podfile.lock @@ -1,20 +1,24 @@ PODS: - at_backupkey_flutter (0.0.1): - Flutter + - at_file_saver (0.0.1): + - Flutter - at_invitation_flutter (0.0.1): - Flutter - at_onboarding_flutter (0.0.1): - Flutter - biometric_storage (0.0.1): - Flutter - - DKImagePickerController/Core (4.3.2): + - device_info_plus (0.0.1): + - Flutter + - DKImagePickerController/Core (4.3.4): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.2) - - DKImagePickerController/PhotoGallery (4.3.2): + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.3.2) + - DKImagePickerController/Resource (4.3.4) - DKPhotoGallery (0.0.17): - DKPhotoGallery/Core (= 0.0.17) - DKPhotoGallery/Model (= 0.0.17) @@ -41,23 +45,31 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - file_saver (0.0.1): + - file_selector_ios (0.0.1): - Flutter - Flutter (1.0.0) - flutter_keychain (0.0.1): - Flutter - - flutter_qr_reader (0.0.1): + - MTBBarcodeScanner (5.0.11) + - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - "permission_handler (5.1.0+2)": + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - - SDWebImage (5.11.1): - - SDWebImage/Core (= 5.11.1) - - SDWebImage/Core (5.11.1) + - qr_code_scanner (0.2.0): + - Flutter + - MTBBarcodeScanner + - SDWebImage (5.18.10): + - SDWebImage/Core (= 5.18.10) + - SDWebImage/Core (5.18.10) - share_plus (0.0.1): - Flutter - - SwiftyGif (5.4.0) + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - SwiftyGif (5.4.4) - uni_links (0.0.1): - Flutter - url_launcher_ios (0.0.1): @@ -67,17 +79,21 @@ PODS: DEPENDENCIES: - at_backupkey_flutter (from `.symlinks/plugins/at_backupkey_flutter/ios`) + - at_file_saver (from `.symlinks/plugins/at_file_saver/ios`) - at_invitation_flutter (from `.symlinks/plugins/at_invitation_flutter/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_saver (from `.symlinks/plugins/file_saver/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) - Flutter (from `Flutter`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - - flutter_qr_reader (from `.symlinks/plugins/flutter_qr_reader/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - permission_handler (from `.symlinks/plugins/permission_handler/ios`) + - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - uni_links (from `.symlinks/plugins/uni_links/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -86,34 +102,43 @@ SPEC REPOS: trunk: - DKImagePickerController - DKPhotoGallery + - MTBBarcodeScanner - SDWebImage - SwiftyGif EXTERNAL SOURCES: at_backupkey_flutter: :path: ".symlinks/plugins/at_backupkey_flutter/ios" + at_file_saver: + :path: ".symlinks/plugins/at_file_saver/ios" at_invitation_flutter: :path: ".symlinks/plugins/at_invitation_flutter/ios" at_onboarding_flutter: :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_saver: - :path: ".symlinks/plugins/file_saver/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" Flutter: :path: Flutter flutter_keychain: :path: ".symlinks/plugins/flutter_keychain/ios" - flutter_qr_reader: - :path: ".symlinks/plugins/flutter_qr_reader/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" - permission_handler: - :path: ".symlinks/plugins/permission_handler/ios" + package_info_plus: + :path: ".symlinks/plugins/package_info_plus/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + permission_handler_apple: + :path: ".symlinks/plugins/permission_handler_apple/ios" + qr_code_scanner: + :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" uni_links: :path: ".symlinks/plugins/uni_links/ios" url_launcher_ios: @@ -123,25 +148,30 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: at_backupkey_flutter: 2fc3d01138175e41bce8b574387a47544c53e01b + at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_invitation_flutter: 96015bc9cd2c14148bfea6e6b73151120d701234 at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1 - file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 - flutter_qr_reader: d930dde3b2cfe2b3d0bb7d66e5ff3e514300a5e5 - path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 - permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 - SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - SwiftyGif: 5d4af95df24caf1c570dbbcb32a3b8a0763bc6d7 + MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e + SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f uni_links: d97da20c7701486ba192624d99bffaaffcfc298a - url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af - webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.10.1 +COCOAPODS: 1.12.1 diff --git a/packages/at_invitation_flutter/lib/services/invitation_service.dart b/packages/at_invitation_flutter/lib/services/invitation_service.dart index e08aeb3de..445dc4b18 100644 --- a/packages/at_invitation_flutter/lib/services/invitation_service.dart +++ b/packages/at_invitation_flutter/lib/services/invitation_service.dart @@ -28,6 +28,8 @@ class InvitationService { bool hasMonitorStarted = false; GlobalKey get navigatorKey => navkey ?? GlobalKey(); + + /// initialize the invitation service void initInvitationService( GlobalKey? navkeyFromApp, String? webPageFromApp, @@ -113,6 +115,7 @@ class InvitationService { } } + /// share message and inviate the atsign provided Future shareAndinvite(BuildContext context, String jsonData) async { // create a key and save the json data var keyID = const Uuid().v4(); @@ -146,6 +149,7 @@ class InvitationService { } } + /// show the OTP dialog and fetch the invite data Future fetchInviteData( BuildContext context, String data, String atsign) async { String otp = await showDialog( diff --git a/packages/at_invitation_flutter/lib/utils/init_invitation_service.dart b/packages/at_invitation_flutter/lib/utils/init_invitation_service.dart index ea8d346d1..2b9c4a2bb 100644 --- a/packages/at_invitation_flutter/lib/utils/init_invitation_service.dart +++ b/packages/at_invitation_flutter/lib/utils/init_invitation_service.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:at_invitation_flutter/services/invitation_service.dart'; +/// Initialize the invitation service void initializeInvitationService( {@required GlobalKey? navkey, @required String? webPage, @@ -10,10 +11,12 @@ void initializeInvitationService( .initInvitationService(navkey, webPage, rootDomain, rootPort); } +/// call shareAndInvite method from the invitaion service void shareAndInvite(BuildContext context, String jsonData) { InvitationService().shareAndinvite(context, jsonData); } +/// call fetchInviteData method from the invitaion service fetchInviteData(BuildContext context, String data, String atsign) { InvitationService().fetchInviteData(context, data, atsign); } diff --git a/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart b/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart index 9b675ec44..1ac16d68d 100644 --- a/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart +++ b/packages/at_invitation_flutter/lib/widgets/otp_dialog.dart @@ -38,7 +38,7 @@ class _OTPDialogState extends State { @override Widget build(BuildContext context) { SizeConfig().init(context); - var deviceTextFactor = MediaQuery.of(context).textScaleFactor; + var deviceTextFactor = MediaQuery.of(context).textScaler.scale(20) / 20; return SizedBox( height: 100.toHeight * deviceTextFactor, width: 100.toWidth, diff --git a/packages/at_invitation_flutter/lib/widgets/share_dialog.dart b/packages/at_invitation_flutter/lib/widgets/share_dialog.dart index 5f96300f0..60fcc02e0 100644 --- a/packages/at_invitation_flutter/lib/widgets/share_dialog.dart +++ b/packages/at_invitation_flutter/lib/widgets/share_dialog.dart @@ -51,7 +51,7 @@ class _ShareDialogState extends State { @override Widget build(BuildContext context) { SizeConfig().init(context); - var deviceTextFactor = MediaQuery.of(context).textScaleFactor; + var deviceTextFactor = MediaQuery.of(context).textScaler.scale(20) / 20; return SizedBox( height: 100.toHeight * deviceTextFactor, width: 100.toWidth, diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index 61f911dfd..8bdf58dbe 100644 --- a/packages/at_invitation_flutter/pubspec.yaml +++ b/packages/at_invitation_flutter/pubspec.yaml @@ -2,9 +2,9 @@ name: at_invitation_flutter description: A Flutter package to invite contacts into apps that use atProtocol. version: 2.0.2 homepage: https://docs.atsign.com/ -repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/at_invitation_flutter +repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_invitation_flutter issue_tracker: https://github.com/atsign-foundation/at_widgets/issues -documentation: https://atsign.dev/docs/functional_architecture/libraries/#at_invitation_flutter +documentation: https://docs.atsign.com/ environment: sdk: ">=2.15.1 <4.0.0" @@ -15,13 +15,13 @@ dependencies: at_common_flutter: ^2.0.12 at_commons: ^4.0.1 at_lookup: ^3.0.40 - at_utils: ^3.0.15 + at_utils: ^3.0.16 flutter: sdk: flutter pin_code_fields: ^8.0.1 - url_launcher: ^6.1.14 - uuid: ^3.0.4 + url_launcher: ^6.2.4 + uuid: ^3.0.7 dev_dependencies: flutter_lints: ^2.0.3 From c424d5229ef2ec07335f66dd12a5dae4186be4ed Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:01:31 +0530 Subject: [PATCH 148/176] feat: updated deps, fixed warnings, added documentation --- .../example/ios/Podfile.lock | 106 +++++++++++------- .../example/lib/services/at_service.dart | 4 + .../lib/services/notification_service.dart | 8 +- .../at_follows_flutter/example/pubspec.yaml | 2 +- .../lib/services/connections_service.dart | 1 + .../lib/services/notification_service.dart | 10 +- .../lib/services/sdk_service.dart | 1 + .../lib/services/size_config.dart | 3 + packages/at_follows_flutter/pubspec.yaml | 2 +- .../unit_tests/connections_service_test.dart | 9 +- 10 files changed, 93 insertions(+), 53 deletions(-) diff --git a/packages/at_follows_flutter/example/ios/Podfile.lock b/packages/at_follows_flutter/example/ios/Podfile.lock index da89d90e9..34bf4d0be 100644 --- a/packages/at_follows_flutter/example/ios/Podfile.lock +++ b/packages/at_follows_flutter/example/ios/Podfile.lock @@ -1,20 +1,24 @@ PODS: - at_backupkey_flutter (0.0.1): - Flutter + - at_file_saver (0.0.1): + - Flutter - at_follows_flutter (0.0.1): - Flutter - at_onboarding_flutter (0.0.1): - Flutter - biometric_storage (0.0.1): - Flutter - - DKImagePickerController/Core (4.3.2): + - device_info_plus (0.0.1): + - Flutter + - DKImagePickerController/Core (4.3.4): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.2) - - DKImagePickerController/PhotoGallery (4.3.2): + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.3.2) + - DKImagePickerController/Resource (4.3.4) - DKPhotoGallery (0.0.17): - DKPhotoGallery/Core (= 0.0.17) - DKPhotoGallery/Model (= 0.0.17) @@ -41,25 +45,33 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - file_saver (0.0.1): + - file_selector_ios (0.0.1): - Flutter - Flutter (1.0.0) - flutter_keychain (0.0.1): - Flutter - flutter_local_notifications (0.0.1): - Flutter - - flutter_qr_reader (0.0.1): + - MTBBarcodeScanner (5.0.11) + - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - "permission_handler (5.1.0+2)": + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - - SDWebImage (5.12.3): - - SDWebImage/Core (= 5.12.3) - - SDWebImage/Core (5.12.3) + - qr_code_scanner (0.2.0): + - Flutter + - MTBBarcodeScanner + - SDWebImage (5.18.10): + - SDWebImage/Core (= 5.18.10) + - SDWebImage/Core (5.18.10) - share_plus (0.0.1): - Flutter - - SwiftyGif (5.4.3) + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - SwiftyGif (5.4.4) - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): @@ -67,18 +79,22 @@ PODS: DEPENDENCIES: - at_backupkey_flutter (from `.symlinks/plugins/at_backupkey_flutter/ios`) + - at_file_saver (from `.symlinks/plugins/at_file_saver/ios`) - at_follows_flutter (from `.symlinks/plugins/at_follows_flutter/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_saver (from `.symlinks/plugins/file_saver/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) - Flutter (from `Flutter`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - - flutter_qr_reader (from `.symlinks/plugins/flutter_qr_reader/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - permission_handler (from `.symlinks/plugins/permission_handler/ios`) + - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -86,36 +102,45 @@ SPEC REPOS: trunk: - DKImagePickerController - DKPhotoGallery + - MTBBarcodeScanner - SDWebImage - SwiftyGif EXTERNAL SOURCES: at_backupkey_flutter: :path: ".symlinks/plugins/at_backupkey_flutter/ios" + at_file_saver: + :path: ".symlinks/plugins/at_file_saver/ios" at_follows_flutter: :path: ".symlinks/plugins/at_follows_flutter/ios" at_onboarding_flutter: :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_saver: - :path: ".symlinks/plugins/file_saver/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" Flutter: :path: Flutter flutter_keychain: :path: ".symlinks/plugins/flutter_keychain/ios" flutter_local_notifications: :path: ".symlinks/plugins/flutter_local_notifications/ios" - flutter_qr_reader: - :path: ".symlinks/plugins/flutter_qr_reader/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" - permission_handler: - :path: ".symlinks/plugins/permission_handler/ios" + package_info_plus: + :path: ".symlinks/plugins/package_info_plus/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + permission_handler_apple: + :path: ".symlinks/plugins/permission_handler_apple/ios" + qr_code_scanner: + :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -123,25 +148,30 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: at_backupkey_flutter: 2fc3d01138175e41bce8b574387a47544c53e01b + at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce at_follows_flutter: cabf679ae84bc050016705c323901934a461c882 at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1 - file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 - flutter_qr_reader: d930dde3b2cfe2b3d0bb7d66e5ff3e514300a5e5 - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 - SDWebImage: 53179a2dba77246efa8a9b85f5c5b21f8f43e38f - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de - webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162 + MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e + SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.10.1 +COCOAPODS: 1.12.1 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 9bef0da85..0b8be9660 100644 --- a/packages/at_follows_flutter/example/lib/services/at_service.dart +++ b/packages/at_follows_flutter/example/lib/services/at_service.dart @@ -26,6 +26,7 @@ class AtService { set atsign(String atsign) {} + ///Sets up the [AtClientPreference] object Future getAtClientPreference({String? cramSecret}) async { final appDocumentDirectory = await path_provider.getApplicationSupportDirectory(); @@ -40,17 +41,20 @@ class AtService { return _atClientPreference; } + ///Creates a new atKey if it does not already exists. If exists, then updated the old key Future put({String? key, var value}) async { var atKey = at_commons.AtKey()..key = key ?? ""; // ..metadata = metaData; return await atClientInstance!.put(atKey, value); } + ///Deletes the atKey if exists Future delete({String? key}) async { var atKey = at_commons.AtKey()..key = key ?? ""; return await atClientInstance!.delete(atKey); } + ///Gets atKeys that matches the app namespace Future> get() async { return await atClientInstance!.getKeys(regex: AppConstants.regex); } diff --git a/packages/at_follows_flutter/example/lib/services/notification_service.dart b/packages/at_follows_flutter/example/lib/services/notification_service.dart index ff3dff684..53b72eaf3 100644 --- a/packages/at_follows_flutter/example/lib/services/notification_service.dart +++ b/packages/at_follows_flutter/example/lib/services/notification_service.dart @@ -26,15 +26,15 @@ class NotificationService { setOnNotificationClick(Function onNotificationClick) async { await _notificationsPlugin.initialize(initializationSettings, - onSelectNotification: (String? payload) async { - onNotificationClick(payload); + onDidReceiveNotificationResponse: (payload) async { + await onNotificationClick(payload); }); } initializePlatformSpecifics() { var initializationSettingsAndroid = AndroidInitializationSettings('notification_icon'); - var initializationSettingsIOS = IOSInitializationSettings( + var initializationSettingsIOS = DarwinInitializationSettings( requestAlertPermission: true, requestBadgePermission: true, requestSoundPermission: false, @@ -65,7 +65,7 @@ class NotificationService { importance: Importance.max, priority: Priority.high, showWhen: false); - var iosChannelSpecifics = IOSNotificationDetails(); + var iosChannelSpecifics = DarwinNotificationDetails(); var platformChannelSpecifics = NotificationDetails( android: androidPlatformChannelSpecifics, iOS: iosChannelSpecifics); diff --git a/packages/at_follows_flutter/example/pubspec.yaml b/packages/at_follows_flutter/example/pubspec.yaml index a57dfd025..c30fd1bb7 100644 --- a/packages/at_follows_flutter/example/pubspec.yaml +++ b/packages/at_follows_flutter/example/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: flutter: sdk: flutter flutter_keychain: ^2.3.0 - flutter_local_notifications: ^9.9.1 + flutter_local_notifications: ^14.1.1 path_provider: ^2.1.1 dev_dependencies: diff --git a/packages/at_follows_flutter/lib/services/connections_service.dart b/packages/at_follows_flutter/lib/services/connections_service.dart index a6b65075b..1856d877d 100644 --- a/packages/at_follows_flutter/lib/services/connections_service.dart +++ b/packages/at_follows_flutter/lib/services/connections_service.dart @@ -102,6 +102,7 @@ class ConnectionsService { return atsignList; } + ///Follows an [atsign] by adding it in your followers list Future follow(String? atsign) async { if (atsign == _sdkService.atsign) { return null; diff --git a/packages/at_follows_flutter/lib/services/notification_service.dart b/packages/at_follows_flutter/lib/services/notification_service.dart index 0700b3735..12e027434 100644 --- a/packages/at_follows_flutter/lib/services/notification_service.dart +++ b/packages/at_follows_flutter/lib/services/notification_service.dart @@ -28,17 +28,19 @@ class NotificationService { _logger.info('initialiazed notification service'); } + ///Gets called when user clicks on notification setOnNotificationClick(Function onNotificationClick) async { await _notificationsPlugin.initialize(initializationSettings, - onSelectNotification: (String? payload) async { - onNotificationClick(payload); + onDidReceiveNotificationResponse: (payload) async { + await onNotificationClick(payload); }); } + ///Initialize the notification settings for iOS and Android initializePlatformSpecifics() { var initializationSettingsAndroid = AndroidInitializationSettings('notification_icon'); - var initializationSettingsIOS = IOSInitializationSettings( + var initializationSettingsIOS = DarwinInitializationSettings( requestAlertPermission: true, requestBadgePermission: true, requestSoundPermission: false, @@ -75,7 +77,7 @@ class NotificationService { showWhen: false, styleInformation: BigTextStyleInformation(''), ); - var iosChannelSpecifics = IOSNotificationDetails(); + var iosChannelSpecifics = DarwinNotificationDetails(); var platformChannelSpecifics = NotificationDetails( android: androidPlatformChannelSpecifics, iOS: iosChannelSpecifics); diff --git a/packages/at_follows_flutter/lib/services/sdk_service.dart b/packages/at_follows_flutter/lib/services/sdk_service.dart index e114bf5a0..565141327 100644 --- a/packages/at_follows_flutter/lib/services/sdk_service.dart +++ b/packages/at_follows_flutter/lib/services/sdk_service.dart @@ -21,6 +21,7 @@ class SDKService { String? _atsign; + ///Sets the [rootdomain] set setClientService(AtClientService service) { this._atsign = AtClientManager.getInstance().atClient.getCurrentAtSign(); Strings.rootdomain = diff --git a/packages/at_follows_flutter/lib/services/size_config.dart b/packages/at_follows_flutter/lib/services/size_config.dart index a0f6a2b28..e36efd80d 100644 --- a/packages/at_follows_flutter/lib/services/size_config.dart +++ b/packages/at_follows_flutter/lib/services/size_config.dart @@ -84,9 +84,12 @@ class SizeConfig { } extension SizeUtils on num { + ///makes the [width] responsive on different screen sizes double get toWidth => SizeConfig().getWidthRatio(this.toDouble()); + ///makes the [height] responsive on different screen sizes double get toHeight => SizeConfig().getHeightRatio(this.toDouble()); + ///makes the [font] responsive on different screen sizes double get toFont => SizeConfig().getFontRatio(this.toDouble()); } diff --git a/packages/at_follows_flutter/pubspec.yaml b/packages/at_follows_flutter/pubspec.yaml index 47019bb94..6188addd3 100644 --- a/packages/at_follows_flutter/pubspec.yaml +++ b/packages/at_follows_flutter/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: collection: ^1.17.0 flutter: sdk: flutter - flutter_local_notifications: ^9.9.1 + flutter_local_notifications: ^14.1.1 permission_handler: ^11.0.0 provider: ^6.0.5 qr_code_scanner: ^1.0.1 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 5a1c1c313..a761e5ba0 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 @@ -71,7 +71,7 @@ void main() { test('to support wavi and persona namespace', () async { var firstAtSign = '@bob🛠'; - var bobClientService = await setUpFunc(firstAtSign); + await setUpFunc(firstAtSign); var metadata = Metadata() ..isPublic = true ..namespaceAware = false; @@ -86,7 +86,7 @@ void main() { await AtClientManager.getInstance().atClient.put(bobLastname, 'Geller'); var secondAtSign = '@colin🛠'; - var colinClientService = await setUpFunc(secondAtSign); + await setUpFunc(secondAtSign); var metadata1 = Metadata()..isPublic = true; var colinFirstname = AtKey() ..key = 'firstname' @@ -176,7 +176,7 @@ void main() { test('follow functioanlity with wavi and persona namespace support', () async { var firstAtSign = '@bob🛠'; - var bobClientService = await setUpFunc(firstAtSign); + await setUpFunc(firstAtSign); var metadata = Metadata() ..isPublic = true ..namespaceAware = false; @@ -191,7 +191,7 @@ void main() { await AtClientManager.getInstance().atClient.put(bobLastname, 'Geller'); var secondAtSign = '@colin🛠'; - var colinClientService = await setUpFunc(secondAtSign); + await setUpFunc(secondAtSign); var metadata1 = Metadata()..isPublic = true; var colinFirstname = AtKey() ..key = 'firstname' @@ -288,7 +288,6 @@ Future tearDownFunc() async { } Future setUpFunc(String atsign) async { - var preference = getAtSignPreference(atsign); final atClientManager = AtClientManager.getInstance(); AtClientService atClientService = AtClientService(); final atClient = atClientManager.atClient; From fee20b2a478be7e3b1452d55b7142286526dcd78 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:14:42 +0530 Subject: [PATCH 149/176] feat: updated deps, fixed formatting --- .../example/ios/Podfile.lock | 37 ++++++++++++++----- .../at_location_flutter/example/pubspec.yaml | 3 -- .../lib/show_location.dart | 4 +- packages/at_location_flutter/pubspec.yaml | 7 +--- .../widgets_test/contacts_inital_test.dart | 28 +++++++++----- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/packages/at_location_flutter/example/ios/Podfile.lock b/packages/at_location_flutter/example/ios/Podfile.lock index 76be08071..e41c9f548 100644 --- a/packages/at_location_flutter/example/ios/Podfile.lock +++ b/packages/at_location_flutter/example/ios/Podfile.lock @@ -11,6 +11,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 @@ -45,6 +47,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 @@ -62,7 +66,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 @@ -72,6 +76,9 @@ PODS: - SDWebImage/Core (5.15.8) - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - sqflite (0.0.3): - Flutter - FMDB (>= 2.7.5) @@ -89,7 +96,9 @@ DEPENDENCIES: - at_location_flutter (from `.symlinks/plugins/at_location_flutter/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`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) @@ -99,6 +108,7 @@ DEPENDENCIES: - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -126,8 +136,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: @@ -146,6 +160,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher_ios: @@ -160,26 +176,29 @@ SPEC CHECKSUMS: at_location_flutter: 11cdb9f57b41159f51d1ce151f78c31b9b292607 at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 - fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - 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: cb032eba469c54e0000e78bcb0a13cdde0a52798 - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 - webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 diff --git a/packages/at_location_flutter/example/pubspec.yaml b/packages/at_location_flutter/example/pubspec.yaml index 4d6fc2717..795241fba 100644 --- a/packages/at_location_flutter/example/pubspec.yaml +++ b/packages/at_location_flutter/example/pubspec.yaml @@ -44,9 +44,6 @@ 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/show_location.dart b/packages/at_location_flutter/lib/show_location.dart index 806191807..0f6edb5b6 100644 --- a/packages/at_location_flutter/lib/show_location.dart +++ b/packages/at_location_flutter/lib/show_location.dart @@ -33,8 +33,8 @@ Widget showLocation(Key? key, MapController? mapController, mapController.move(location, 8); } } else { - marker = - buildMarker(HybridModel(latLng: const LatLng(45, 45)), singleMarker: true); + marker = buildMarker(HybridModel(latLng: const LatLng(45, 45)), + singleMarker: true); showMarker = false; } diff --git a/packages/at_location_flutter/pubspec.yaml b/packages/at_location_flutter/pubspec.yaml index 95aae3fec..728fc182a 100644 --- a/packages/at_location_flutter/pubspec.yaml +++ b/packages/at_location_flutter/pubspec.yaml @@ -16,9 +16,9 @@ dependencies: 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 at_contact: ^3.0.8 - at_contacts_flutter: ^4.0.11 + at_contacts_flutter: ^4.0.14 at_lookup: ^3.0.40 at_utils: ^3.0.15 cached_network_image: ^3.2.3 @@ -38,9 +38,6 @@ 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_location_flutter/test/widgets_test/contacts_inital_test.dart b/packages/at_location_flutter/test/widgets_test/contacts_inital_test.dart index dbbb3b328..600f288bc 100644 --- a/packages/at_location_flutter/test/widgets_test/contacts_inital_test.dart +++ b/packages/at_location_flutter/test/widgets_test/contacts_inital_test.dart @@ -15,12 +15,11 @@ void main() { /// Functional test cases for [contactInitial] group('Contacts Initial widget Tests:', () { - - // Test case to identify contact initial is used in screen or not - testWidgets("Button widget is used and shown on screen", + // Test case to identify contact initial is used in screen or not + testWidgets("Button widget is used and shown on screen", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(contactInitial: ContactInitial(initials:'@'))); + await tester.pumpWidget(_wrapWidgetWithMaterialApp( + contactInitial: ContactInitial(initials: '@'))); expect(find.byType(ContactInitial), findsOneWidget); }); @@ -29,16 +28,25 @@ void main() { testWidgets('Contacts initial with background color', (WidgetTester tester) async { await tester.pumpWidget(_wrapWidgetWithMaterialApp( - contactInitial: ContactInitial(initials: '@',backgroundColor: Colors.white,))); + contactInitial: ContactInitial( + initials: '@', + backgroundColor: Colors.white, + ))); final contactsInitial = tester.widget(find.byType(ContactInitial)); - expect(contactsInitial.backgroundColor, Colors.white,); + expect( + contactsInitial.backgroundColor, + Colors.white, + ); }); - - // Test case to check contact initial to check given without background color + + // Test case to check contact initial to check given without background color testWidgets('Contacts initial without background color', (WidgetTester tester) async { - await tester.pumpWidget(_wrapWidgetWithMaterialApp(contactInitial: ContactInitial(initials: '@',))); + await tester.pumpWidget(_wrapWidgetWithMaterialApp( + contactInitial: ContactInitial( + initials: '@', + ))); final contactsInitial = tester.widget(find.byType(ContactInitial)); expect(contactsInitial.backgroundColor, null); From 6d0f8d7b82a7f5a13d7693adef2f2e01a353a3cb Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:24:26 +0530 Subject: [PATCH 150/176] feat: updated deps in at_notify_flutter --- .../example/ios/Podfile.lock | 28 +++++++++++++------ packages/at_notify_flutter/pubspec.yaml | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/at_notify_flutter/example/ios/Podfile.lock b/packages/at_notify_flutter/example/ios/Podfile.lock index 2dccda3f4..843be4b4c 100644 --- a/packages/at_notify_flutter/example/ios/Podfile.lock +++ b/packages/at_notify_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 @@ -54,7 +58,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 @@ -79,7 +83,9 @@ DEPENDENCIES: - at_notify_flutter (from `.symlinks/plugins/at_notify_flutter/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`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) @@ -111,8 +117,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: @@ -142,22 +152,24 @@ SPEC CHECKSUMS: at_notify_flutter: 9881d230ac220d5f02cbc71cc07113457996838e 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 - flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 + flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - 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 diff --git a/packages/at_notify_flutter/pubspec.yaml b/packages/at_notify_flutter/pubspec.yaml index b0a46c6f4..eb2f47011 100644 --- a/packages/at_notify_flutter/pubspec.yaml +++ b/packages/at_notify_flutter/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: at_commons: ^4.0.1 flutter: sdk: flutter - flutter_local_notifications: ^15.1.1 + flutter_local_notifications: ^16.3.2 dev_dependencies: flutter_lints: ^2.0.3 From af6c1de982ab03f8d058022374bbe416cfe24af6 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:38:57 +0530 Subject: [PATCH 151/176] feat: updated deps, fixed warnings --- .../example/ios/Podfile.lock | 46 +++++++++++++------ .../at_sync_ui_flutter/example/pubspec.yaml | 2 +- .../lib/at_sync_material.dart | 4 +- packages/at_sync_ui_flutter/pubspec.yaml | 2 +- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/packages/at_sync_ui_flutter/example/ios/Podfile.lock b/packages/at_sync_ui_flutter/example/ios/Podfile.lock index 0b1d4c1ed..4ca20b1d7 100644 --- a/packages/at_sync_ui_flutter/example/ios/Podfile.lock +++ b/packages/at_sync_ui_flutter/example/ios/Podfile.lock @@ -7,6 +7,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 @@ -41,15 +43,18 @@ 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 - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.3.0): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -59,6 +64,9 @@ PODS: - SDWebImage/Core (5.15.5) - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - SwiftyGif (5.4.4) - url_launcher_ios (0.0.1): - Flutter @@ -70,14 +78,17 @@ 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`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -98,22 +109,28 @@ 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: :path: ".symlinks/plugins/flutter_keychain/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -124,22 +141,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: b6a6c6667913d571590169ef946afbafe3b52688 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de - webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a + url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_sync_ui_flutter/example/pubspec.yaml b/packages/at_sync_ui_flutter/example/pubspec.yaml index 94b5d73db..d30db53dc 100644 --- a/packages/at_sync_ui_flutter/example/pubspec.yaml +++ b/packages/at_sync_ui_flutter/example/pubspec.yaml @@ -29,7 +29,7 @@ environment: dependencies: at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 - at_onboarding_flutter: ^6.1.5 + 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 diff --git a/packages/at_sync_ui_flutter/lib/at_sync_material.dart b/packages/at_sync_ui_flutter/lib/at_sync_material.dart index 381023fab..d6e7d2356 100644 --- a/packages/at_sync_ui_flutter/lib/at_sync_material.dart +++ b/packages/at_sync_ui_flutter/lib/at_sync_material.dart @@ -246,7 +246,7 @@ class AtSyncDialog { return showDialog( barrierDismissible: barrierDismissible, context: _context, - builder: (context) => WillPopScope( + builder: (context) => PopScope( child: AlertDialog( content: ValueListenableBuilder( valueListenable: _progress, @@ -301,7 +301,7 @@ class AtSyncDialog { }, ), ), - onWillPop: () => Future.value( + onPopInvoked: (didPop) => Future.value( barrierDismissible, ), ), diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index 578c58771..89563657a 100644 --- a/packages/at_sync_ui_flutter/pubspec.yaml +++ b/packages/at_sync_ui_flutter/pubspec.yaml @@ -12,7 +12,7 @@ environment: flutter: ">=1.17.0" dependencies: - at_client: ^3.0.64 + at_client: ^3.0.72 at_client_mobile: ^3.2.12 at_common_flutter: ^2.0.12 flutter: From 0c2d9fabe1d3f296c032b29330e3c8581bc63b6e Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:48:02 +0530 Subject: [PATCH 152/176] feat: fixed formattings, updated deps --- .../at_theme_flutter/example/ios/Podfile.lock | 46 +++++++++++++------ .../at_theme_flutter/example/lib/main.dart | 8 ++-- .../lib/services/theme_service.dart | 7 ++- .../test/widget_tests/color_card_test.dart | 3 +- .../widget_tests/theme_mode_card_test.dart | 3 +- .../widget_tests/theme_setting_page_test.dart | 7 +-- 6 files changed, 47 insertions(+), 27 deletions(-) diff --git a/packages/at_theme_flutter/example/ios/Podfile.lock b/packages/at_theme_flutter/example/ios/Podfile.lock index d6104c6b7..b83d94aa7 100644 --- a/packages/at_theme_flutter/example/ios/Podfile.lock +++ b/packages/at_theme_flutter/example/ios/Podfile.lock @@ -7,6 +7,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 @@ -41,6 +43,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 @@ -50,9 +54,10 @@ PODS: - MTBBarcodeScanner (5.0.11) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -62,6 +67,9 @@ PODS: - SDWebImage/Core (5.15.5) - share_plus (0.0.1): - Flutter + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS - SwiftyGif (5.4.4) - Toast (4.0.0) - url_launcher_ios (0.0.1): @@ -74,15 +82,18 @@ 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`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -104,8 +115,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: @@ -114,14 +129,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/fluttertoast/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -132,24 +149,27 @@ 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 - fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - 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 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_theme_flutter/example/lib/main.dart b/packages/at_theme_flutter/example/lib/main.dart index e71d8375a..619fe3647 100644 --- a/packages/at_theme_flutter/example/lib/main.dart +++ b/packages/at_theme_flutter/example/lib/main.dart @@ -78,10 +78,10 @@ class _MyAppState extends State { switch (result.status) { case AtOnboardingResultStatus.success: await Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) => - const ProfilePage())); + context, + MaterialPageRoute( + builder: (context) => + const ProfilePage())); break; case AtOnboardingResultStatus.error: ScaffoldMessenger.of(context).showSnackBar( diff --git a/packages/at_theme_flutter/lib/services/theme_service.dart b/packages/at_theme_flutter/lib/services/theme_service.dart index 1f13904d6..aa1ea7bb1 100644 --- a/packages/at_theme_flutter/lib/services/theme_service.dart +++ b/packages/at_theme_flutter/lib/services/theme_service.dart @@ -24,12 +24,11 @@ class ThemeService { currentAtsign = atClientManager.atClient.getCurrentAtSign(); } - Future updateThemeData(AppTheme themeData) async{ + Future updateThemeData(AppTheme themeData) async { AtKey atKey = getAtkey(); try { - var result = await atClientManager - .atClient - .put(atKey, themeData.encoded()); + var result = + await atClientManager.atClient.put(atKey, themeData.encoded()); return result; } catch (e) { _logger.severe('error in updating theme data: ${e.toString()}'); diff --git a/packages/at_theme_flutter/test/widget_tests/color_card_test.dart b/packages/at_theme_flutter/test/widget_tests/color_card_test.dart index 79625a9b4..d98cd2e6f 100644 --- a/packages/at_theme_flutter/test/widget_tests/color_card_test.dart +++ b/packages/at_theme_flutter/test/widget_tests/color_card_test.dart @@ -19,8 +19,7 @@ void main() { // Test Case to Check Color Card is displayed const colorCard = ColorCard(color: Colors.orange, isSelected: true); testWidgets("Color Card is displayed", (WidgetTester tester) async { - await tester.pumpWidget( - _wrapWidgetWithMaterialApp(colorCard: colorCard)); + await tester.pumpWidget(_wrapWidgetWithMaterialApp(colorCard: colorCard)); expect(find.byType(ColorCard), findsOneWidget); }); }); diff --git a/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart b/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart index b6e731c32..3939391e7 100644 --- a/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart +++ b/packages/at_theme_flutter/test/widget_tests/theme_mode_card_test.dart @@ -22,7 +22,8 @@ void main() { brightness: Brightness.light, isSelected: true); testWidgets("Theme Mode Card is displayed", (WidgetTester tester) async { - await tester.pumpWidget(_wrapWidgetWithMaterialApp(themeModeCard: themeModeCard)); + await tester + .pumpWidget(_wrapWidgetWithMaterialApp(themeModeCard: themeModeCard)); expect(find.byType(ThemeModeCard), findsOneWidget); }); }); diff --git a/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart b/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart index 5f864784d..c0cc75562 100644 --- a/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart +++ b/packages/at_theme_flutter/test/widget_tests/theme_setting_page_test.dart @@ -20,10 +20,11 @@ void main() { group('Theme Setting Page Tests:', () { // Test Case to Check Theme Mode Card is displayed final themeSettingPage = ThemeSettingPage( - currentAppTheme: appTheme.AppTheme.from(), primaryColors: const [Colors.blue,Colors.pink]); + currentAppTheme: appTheme.AppTheme.from(), + primaryColors: const [Colors.blue, Colors.pink]); testWidgets("Theme Setting Page is displayed", (WidgetTester tester) async { - await tester - .pumpWidget(_wrapWidgetWithMaterialApp(themeSettingPage: themeSettingPage)); + await tester.pumpWidget( + _wrapWidgetWithMaterialApp(themeSettingPage: themeSettingPage)); expect(find.byType(ThemeSettingPage), findsOneWidget); }); }); From 9af64577c00dbb6c9989705fc00380443177c343 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 15:04:59 +0530 Subject: [PATCH 153/176] feat: at_contacts_group_flutter release changes --- .../at_contacts_group_flutter/example/ios/Podfile | 2 +- .../example/ios/Podfile.lock | 6 +++--- .../example/ios/Runner.xcodeproj/project.pbxproj | 12 +++++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/at_contacts_group_flutter/example/ios/Podfile b/packages/at_contacts_group_flutter/example/ios/Podfile index 7c069cc7c..c1889959b 100644 --- a/packages/at_contacts_group_flutter/example/ios/Podfile +++ b/packages/at_contacts_group_flutter/example/ios/Podfile @@ -41,7 +41,7 @@ post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' end end end diff --git a/packages/at_contacts_group_flutter/example/ios/Podfile.lock b/packages/at_contacts_group_flutter/example/ios/Podfile.lock index bc518c702..96020b272 100644 --- a/packages/at_contacts_group_flutter/example/ios/Podfile.lock +++ b/packages/at_contacts_group_flutter/example/ios/Podfile.lock @@ -100,7 +100,7 @@ PODS: - Flutter - FlutterMacOS - SwiftyGif (5.4.4) - - Toast (4.0.0) + - Toast (4.1.0) - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): @@ -217,10 +217,10 @@ SPEC CHECKSUMS: share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 + Toast: ec33c32b8688982cecc6348adeae667c1b9938da url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a -PODFILE CHECKSUM: 00aeb49562056f541ea701239573568e7adc5deb +PODFILE CHECKSUM: 3ca1a87bdfd8c79771043aeca4123b2a0ba37c8d COCOAPODS: 1.12.1 diff --git a/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/project.pbxproj index 1857f7f3a..64bb49330 100644 --- a/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -68,7 +68,6 @@ C7FD1BCA6F998AE22B2B996D /* Pods-Runner.release.xcconfig */, E04491F8F2426CF19FD45121 /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -156,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -343,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -361,6 +360,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -420,7 +420,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -469,7 +469,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -489,6 +489,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -511,6 +512,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a33..a6b826db2 100644 --- a/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_contacts_group_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 12 Feb 2024 15:06:32 +0530 Subject: [PATCH 154/176] feat: at_contacts_group_flutter release changes --- packages/at_contacts_group_flutter/CHANGELOG.md | 3 +++ packages/at_contacts_group_flutter/pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/at_contacts_group_flutter/CHANGELOG.md b/packages/at_contacts_group_flutter/CHANGELOG.md index 23756f0c0..5c5ef3586 100644 --- a/packages/at_contacts_group_flutter/CHANGELOG.md +++ b/packages/at_contacts_group_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.0.15 + +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 ## 4.0.14 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_contacts_group_flutter/pubspec.yaml b/packages/at_contacts_group_flutter/pubspec.yaml index fdcec9448..c9872a641 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.14 +version: 4.0.15 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_contacts_group_flutter From ae88f2a09bd38e81d16236928ed23a54df1eb0db Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 16:45:51 +0530 Subject: [PATCH 155/176] feat/release_chages_all_packages --- packages/at_backupkey_flutter/CHANGELOG.md | 4 ++++ packages/at_backupkey_flutter/pubspec.yaml | 2 +- packages/at_chat_flutter/CHANGELOG.md | 3 +++ packages/at_chat_flutter/pubspec.yaml | 2 +- packages/at_common_flutter/CHANGELOG.md | 3 +++ packages/at_common_flutter/pubspec.yaml | 2 +- packages/at_follows_flutter/CHANGELOG.md | 3 +++ packages/at_follows_flutter/pubspec.yaml | 2 +- packages/at_invitation_flutter/CHANGELOG.md | 3 +++ packages/at_invitation_flutter/pubspec.yaml | 2 +- packages/at_location_flutter/CHANGELOG.md | 3 +++ packages/at_location_flutter/pubspec.yaml | 2 +- packages/at_login_flutter/CHANGELOG.md | 3 +++ packages/at_login_flutter/pubspec.yaml | 2 +- packages/at_notify_flutter/CHANGELOG.md | 3 +++ packages/at_notify_flutter/pubspec.yaml | 2 +- packages/at_sync_ui_flutter/CHANGELOG.md | 4 ++++ packages/at_sync_ui_flutter/pubspec.yaml | 2 +- packages/at_theme_flutter/CHANGELOG.md | 3 +++ packages/at_theme_flutter/pubspec.yaml | 2 +- 20 files changed, 42 insertions(+), 10 deletions(-) diff --git a/packages/at_backupkey_flutter/CHANGELOG.md b/packages/at_backupkey_flutter/CHANGELOG.md index 333b4e38e..e0f22dcf3 100644 --- a/packages/at_backupkey_flutter/CHANGELOG.md +++ b/packages/at_backupkey_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.13: +- **CHORE**: Bumped up dependency versions +- **CHORE**: Improved pub score + ## 4.0.12: - **CHORE**: Updated dependencies - **CHORE**: Lint fixes diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index 6c4035dda..c12f92d74 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.12 +version: 4.0.13 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 316e57903..5c65f12f2 100644 --- a/packages/at_chat_flutter/CHANGELOG.md +++ b/packages/at_chat_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.12: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 3.0.11 - **CHORE**: Updated dependencies diff --git a/packages/at_chat_flutter/pubspec.yaml b/packages/at_chat_flutter/pubspec.yaml index 000837f8b..e039d5322 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.11 +version: 3.0.12 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_common_flutter/CHANGELOG.md b/packages/at_common_flutter/CHANGELOG.md index 315a0f10a..679aebcc5 100644 --- a/packages/at_common_flutter/CHANGELOG.md +++ b/packages/at_common_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.13: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 2.0.12 - **CHORE**: Updated repository URL diff --git a/packages/at_common_flutter/pubspec.yaml b/packages/at_common_flutter/pubspec.yaml index 7e78ffbe7..332884260 100644 --- a/packages/at_common_flutter/pubspec.yaml +++ b/packages/at_common_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: at_common_flutter description: A Flutter package to provide common widgets used by other atPlatform Flutter packages. -version: 2.0.12 +version: 2.0.13 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/at_common_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 3a393d0c1..8e4b21c81 100644 --- a/packages/at_follows_flutter/CHANGELOG.md +++ b/packages/at_follows_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.12: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 3.0.11 - **CHORE**: Updated dependencies - **CHORE**: Lint fixes diff --git a/packages/at_follows_flutter/pubspec.yaml b/packages/at_follows_flutter/pubspec.yaml index 6188addd3..9739550b4 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.11 +version: 3.0.12 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 cd6d239b9..4361ccea6 100644 --- a/packages/at_invitation_flutter/CHANGELOG.md +++ b/packages/at_invitation_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.3: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 2.0.2 - **CHORE**: Updated dependencies diff --git a/packages/at_invitation_flutter/pubspec.yaml b/packages/at_invitation_flutter/pubspec.yaml index 8bdf58dbe..5040c44b7 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.2 +version: 2.0.3 homepage: https://docs.atsign.com/ repository: https://github.com/atsign-foundation/at_widgets/tree/trunk/packages/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 53a4ac7e2..598704ee1 100644 --- a/packages/at_location_flutter/CHANGELOG.md +++ b/packages/at_location_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.1.12: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + # 3.1.11 - **CHORE**: Lint fixes diff --git a/packages/at_location_flutter/pubspec.yaml b/packages/at_location_flutter/pubspec.yaml index 728fc182a..d87021546 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.11 +version: 3.1.12 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 30b81878e..4170f9904 100644 --- a/packages/at_login_flutter/CHANGELOG.md +++ b/packages/at_login_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.3: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 0.0.2 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_login_flutter/pubspec.yaml b/packages/at_login_flutter/pubspec.yaml index d2ad264d5..2de732cd3 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.2 +version: 0.0.3 homepage: https://docs.atsign.com/ environment: diff --git a/packages/at_notify_flutter/CHANGELOG.md b/packages/at_notify_flutter/CHANGELOG.md index eddcb3c71..1457ec173 100644 --- a/packages/at_notify_flutter/CHANGELOG.md +++ b/packages/at_notify_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.9: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 1.0.8 - **CHORE**: Bumped all dependency versions - Major version increase of flutter_local_notifications from ^14.1.1 to ^15.1.1 diff --git a/packages/at_notify_flutter/pubspec.yaml b/packages/at_notify_flutter/pubspec.yaml index eb2f47011..d2b3a8b35 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.8 +version: 1.0.9 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_sync_ui_flutter/CHANGELOG.md b/packages/at_sync_ui_flutter/CHANGELOG.md index 5849606a9..d1783234d 100644 --- a/packages/at_sync_ui_flutter/CHANGELOG.md +++ b/packages/at_sync_ui_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.11: +- **CHORE**: Bumped up dependecy versions +- **CHORE**: Improved pub score + ## 1.0.10 - **CHORE**: Updated dependencies - **CHORE**: Lint fixes diff --git a/packages/at_sync_ui_flutter/pubspec.yaml b/packages/at_sync_ui_flutter/pubspec.yaml index 89563657a..f71f06e00 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.11 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 5cdda1e1d..5cb5da34d 100644 --- a/packages/at_theme_flutter/CHANGELOG.md +++ b/packages/at_theme_flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.7: +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 1.0.6 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_theme_flutter/pubspec.yaml b/packages/at_theme_flutter/pubspec.yaml index 79b063dd4..e3c39f15a 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.6 +version: 1.0.7 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 e5a389a0de62d6166e083a87c3c6d9ad58b99945 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 17:15:24 +0530 Subject: [PATCH 156/176] chore: updated changelogs --- packages/at_contacts_group_flutter/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/at_contacts_group_flutter/CHANGELOG.md b/packages/at_contacts_group_flutter/CHANGELOG.md index 5c5ef3586..bd7832810 100644 --- a/packages/at_contacts_group_flutter/CHANGELOG.md +++ b/packages/at_contacts_group_flutter/CHANGELOG.md @@ -1,6 +1,7 @@ ## 4.0.15 - **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 +- **FEAT**: Changed IPHONEOS_DEPLOYMENT_TARGET from 9.0 to 12.0 ## 4.0.14 - **CHORE**: Bumped all dependency versions From 17e317961a5d553e168f6cd8d23a6ff7cb2f4e48 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 17:20:13 +0530 Subject: [PATCH 157/176] chore: updated changelogs --- packages/at_contacts_group_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_contacts_group_flutter/CHANGELOG.md b/packages/at_contacts_group_flutter/CHANGELOG.md index bd7832810..fc4a5e134 100644 --- a/packages/at_contacts_group_flutter/CHANGELOG.md +++ b/packages/at_contacts_group_flutter/CHANGELOG.md @@ -1,7 +1,7 @@ ## 4.0.15 - **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 -- **FEAT**: Changed IPHONEOS_DEPLOYMENT_TARGET from 9.0 to 12.0 +- **CHORE**: Changed IPHONEOS_DEPLOYMENT_TARGET from 9.0 to 12.0 ## 4.0.14 - **CHORE**: Bumped all dependency versions From ca953643763dd764a271e1dea7e0fb819e4f26d0 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 18:01:24 +0530 Subject: [PATCH 158/176] chore: changelog reverted for at_login_flutter --- packages/at_login_flutter/CHANGELOG.md | 3 --- packages/at_login_flutter/pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/at_login_flutter/CHANGELOG.md b/packages/at_login_flutter/CHANGELOG.md index 4170f9904..30b81878e 100644 --- a/packages/at_login_flutter/CHANGELOG.md +++ b/packages/at_login_flutter/CHANGELOG.md @@ -1,6 +1,3 @@ -## 0.0.3: -- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 - ## 0.0.2 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_login_flutter/pubspec.yaml b/packages/at_login_flutter/pubspec.yaml index 2de732cd3..d2ad264d5 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.3 +version: 0.0.2 homepage: https://docs.atsign.com/ environment: From 5a3804259020ac4176680c4216c828084c4ae09a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 18:40:47 +0530 Subject: [PATCH 159/176] feat: release changes v3.1.13 --- packages/at_events_flutter/CHANGELOG.md | 4 ++ .../example/ios/Podfile.lock | 59 ++++++++++++------- .../at_events_flutter/example/pubspec.yaml | 4 -- packages/at_events_flutter/pubspec.yaml | 16 ++--- 4 files changed, 47 insertions(+), 36 deletions(-) diff --git a/packages/at_events_flutter/CHANGELOG.md b/packages/at_events_flutter/CHANGELOG.md index 08724698c..5778e1706 100644 --- a/packages/at_events_flutter/CHANGELOG.md +++ b/packages/at_events_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.1.13: +- **CHORE**: Bumped up all dependency versions +- **CHORE**: Major version increase of at_commons from ^3.0.55 to ^4.0.1 + ## 3.1.12 - **CHORE**: Bumped all dependency versions diff --git a/packages/at_events_flutter/example/ios/Podfile.lock b/packages/at_events_flutter/example/ios/Podfile.lock index 5b531b5c5..d11017c06 100644 --- a/packages/at_events_flutter/example/ios/Podfile.lock +++ b/packages/at_events_flutter/example/ios/Podfile.lock @@ -15,6 +15,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 @@ -51,8 +53,10 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - file_selector_ios (0.0.1): + - Flutter - Flutter (1.0.0) - - flutter_image_compress (1.0.0): + - flutter_image_compress_common (1.0.0): - Flutter - Mantle - SDWebImage @@ -67,15 +71,18 @@ PODS: - FMDB/standard (2.7.5) - geolocator_apple (1.2.0): - Flutter - - libwebp (1.2.4): - - libwebp/demux (= 1.2.4) - - libwebp/mux (= 1.2.4) - - libwebp/webp (= 1.2.4) - - libwebp/demux (1.2.4): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.2.4): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/webp (1.2.4) + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv - Mantle (2.2.0): - Mantle/extobjc (= 2.2.0) - Mantle/extobjc (2.2.0) @@ -85,7 +92,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 @@ -120,10 +127,12 @@ DEPENDENCIES: - at_location_flutter (from `.symlinks/plugins/at_location_flutter/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`) - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`) - Flutter (from `Flutter`) - - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`) + - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) @@ -167,14 +176,18 @@ 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" emoji_picker_flutter: :path: ".symlinks/plugins/emoji_picker_flutter/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + file_selector_ios: + :path: ".symlinks/plugins/file_selector_ios/ios" Flutter: :path: Flutter - flutter_image_compress: - :path: ".symlinks/plugins/flutter_image_compress/ios" + flutter_image_compress_common: + :path: ".symlinks/plugins/flutter_image_compress_common/ios" flutter_keychain: :path: ".symlinks/plugins/flutter_keychain/ios" fluttertoast: @@ -209,31 +222,33 @@ SPEC CHECKSUMS: at_location_flutter: 11cdb9f57b41159f51d1ce151f78c31b9b292607 at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + emoji_picker_flutter: fe2e6151c5b548e975d546e6eeb567daf0962a58 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de + file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433 + flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 - libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - 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 SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499 - share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 diff --git a/packages/at_events_flutter/example/pubspec.yaml b/packages/at_events_flutter/example/pubspec.yaml index 3a99587bb..c6e28f9df 100644 --- a/packages/at_events_flutter/example/pubspec.yaml +++ b/packages/at_events_flutter/example/pubspec.yaml @@ -43,10 +43,6 @@ 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/pubspec.yaml b/packages/at_events_flutter/pubspec.yaml index 19ada3a88..93bcb002f 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.12 +version: 3.1.13 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 @@ -14,12 +14,12 @@ environment: dependencies: at_client: ^3.0.72 at_client_mobile: ^3.2.12 - at_common_flutter: ^2.0.12 - at_commons: ^3.0.55 + at_common_flutter: ^2.0.13 + at_commons: ^4.0.1 at_contact: ^3.0.8 - at_contacts_flutter: ^4.0.11 - at_contacts_group_flutter: ^4.0.13 - at_location_flutter: ^3.1.9 + at_contacts_flutter: ^4.0.14 + at_contacts_group_flutter: ^4.0.15 + at_location_flutter: ^3.1.12 at_lookup: ^3.0.40 at_utils: ^3.0.15 flutter: @@ -29,10 +29,6 @@ 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: From df33225a786d911b46d9099e402778c36211639f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:33:26 +0000 Subject: [PATCH 160/176] build(deps): bump actions/dependency-review-action from 4.0.0 to 4.1.0 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/4901385134134e04cec5fbe5ddfe3b2c5bd5d976...80f10bf419f34980065523f5efca7ebed17576aa) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index fc3a42dfa..e7ed2c2ca 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976 # v4.0.0 + uses: actions/dependency-review-action@80f10bf419f34980065523f5efca7ebed17576aa # v4.1.0 From 5df10d438869852b88eae6f4f17710ec2875e64e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:02:56 +0000 Subject: [PATCH 161/176] build(deps): bump actions/dependency-review-action from 4.1.0 to 4.1.1 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/80f10bf419f34980065523f5efca7ebed17576aa...fd07d42ce87ab09f10c61a2d1a5e59e6c655620a) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index e7ed2c2ca..57b103c47 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@80f10bf419f34980065523f5efca7ebed17576aa # v4.1.0 + uses: actions/dependency-review-action@fd07d42ce87ab09f10c61a2d1a5e59e6c655620a # v4.1.1 From 69e1a3b0cc8925be1a5a00bd813e9f8324d47e00 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 20 Feb 2024 08:45:55 +0530 Subject: [PATCH 162/176] feat: removed the qr code upload options from onboaridng --- .../example/macos/Podfile.lock | 4 +- .../lib/screen/at_onboarding_home_screen.dart | 55 ------------------- 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/packages/at_onboarding_flutter/example/macos/Podfile.lock b/packages/at_onboarding_flutter/example/macos/Podfile.lock index bc434a2a8..9964a957a 100644 --- a/packages/at_onboarding_flutter/example/macos/Podfile.lock +++ b/packages/at_onboarding_flutter/example/macos/Podfile.lock @@ -65,8 +65,8 @@ SPEC CHECKSUMS: path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 + url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index dd8130317..e53fd5dc0 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -721,61 +721,6 @@ class _AtOnboardingHomeScreenState extends State { ), ), const SizedBox(height: 20), - if (!widget.hideQrScan) const SizedBox(height: 5), - if (!widget.hideQrScan) - Text( - AtOnboardingLocalizations.current.have_QRCode, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.bold, - ), - ), - if (!widget.hideQrScan) const SizedBox(height: 5), - if (!widget.hideQrScan) - (Platform.isAndroid || Platform.isIOS) - ? AtOnboardingSecondaryButton( - key: keyUploadQRCode, - height: 48, - borderRadius: 24, - onPressed: () async { - _showQRCodeScreen(context: context); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - AtOnboardingLocalizations - .current.btn_scan_QRCode, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - ), - ), - const Icon(Icons.arrow_right_alt_rounded) - ], - ), - ) - : AtOnboardingSecondaryButton( - key: keyUploadQRCode, - height: 48, - borderRadius: 24, - isLoading: _uploadingQRCode, - onPressed: () async { - _uploadQRFileForDesktop(); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - AtOnboardingLocalizations - .current.btn_upload_QRCode, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge), - ), - const Icon(Icons.arrow_right_alt_rounded) - ], - ), - ), - const SizedBox(height: 20), if (!widget.hideQrScan) Text( AtOnboardingLocalizations From 344a2e34934535ae4497511998a22184b251d52d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:21:51 +0000 Subject: [PATCH 163/176] build(deps): bump actions/dependency-review-action from 4.1.1 to 4.1.2 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/fd07d42ce87ab09f10c61a2d1a5e59e6c655620a...be8bc500ee15e96754d2a6f2d34be14e945a46f3) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 57b103c47..af2d9a4ea 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@fd07d42ce87ab09f10c61a2d1a5e59e6c655620a # v4.1.1 + uses: actions/dependency-review-action@be8bc500ee15e96754d2a6f2d34be14e945a46f3 # v4.1.2 From a767dd05125862d27e844931da6c6dd8f6655e2a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 20 Feb 2024 16:27:32 +0530 Subject: [PATCH 164/176] feat: fixed static analysis issues --- .../lib/location_modal/location_data_model.dart | 4 ++-- .../lib/map_content/flutter_map/src/layer/tile_layer.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/at_location_flutter/lib/location_modal/location_data_model.dart b/packages/at_location_flutter/lib/location_modal/location_data_model.dart index 30732ab75..8706d05cb 100644 --- a/packages/at_location_flutter/lib/location_modal/location_data_model.dart +++ b/packages/at_location_flutter/lib/location_modal/location_data_model.dart @@ -90,8 +90,8 @@ class LocationSharingFor { Map toJson() { return { - 'from': from != null ? from!.toUtc().toString() : null, - 'to': to != null ? to!.toUtc().toString() : null, + 'from': from?.toUtc().toString(), + 'to': to?.toUtc().toString(), 'locationSharingType': locationSharingType.toString(), 'isAccepted': isAccepted.toString(), 'isExited': isExited.toString(), diff --git a/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart b/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart index db34bfcdd..c81e3a994 100644 --- a/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart +++ b/packages/at_location_flutter/lib/map_content/flutter_map/src/layer/tile_layer.dart @@ -1279,7 +1279,7 @@ class Coords extends CustomPoint { String toString() => 'Coords($x, $y, $z)'; @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { if (other is Coords) { return x == other.x && y == other.y && z == other.z; } From 2c8b54175910224db7f095c60bf7117945313ac4 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 20 Feb 2024 16:29:50 +0530 Subject: [PATCH 165/176] chore: fixed warnings in at_onboarding flutter --- .../lib/screen/at_onboarding_home_screen.dart | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index e53fd5dc0..51083c983 100644 --- a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart +++ b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart @@ -81,7 +81,6 @@ class _AtOnboardingHomeScreenState extends State { bool permissionGrated = false; bool _isContinue = true; - bool _uploadingQRCode = false; String? _pairingAtsign; ServerStatus? atSignStatus; @@ -957,12 +956,10 @@ class _AtOnboardingHomeScreenState extends State { try { String? aesKey, atsign; setState(() { - _uploadingQRCode = true; }); String? path = await _desktopQRFilePicker(); if (path == null) { setState(() { - _uploadingQRCode = false; }); return; } @@ -994,19 +991,16 @@ class _AtOnboardingHomeScreenState extends State { AtOnboardingLocalizations.current.error_incorrect_QRFile, ); setState(() { - _uploadingQRCode = false; }); return; } _processSharedSecret(atsign, aesKey); // await processAESKey(atsign, aesKey, false); setState(() { - _uploadingQRCode = false; }); } catch (error) { _logger.warning(error); setState(() { - _uploadingQRCode = false; }); await showErrorDialog( AtOnboardingLocalizations.current.error_process_file, From fb717dc2b730cdb8a94fe86607846c10bbb1a200 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:10:05 +0000 Subject: [PATCH 166/176] build(deps): bump actions/dependency-review-action from 4.1.2 to 4.1.3 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/be8bc500ee15e96754d2a6f2d34be14e945a46f3...9129d7d40b8c12c1ed0f60400d00c92d437adcce) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index af2d9a4ea..d057728b3 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: 'Dependency Review' - uses: actions/dependency-review-action@be8bc500ee15e96754d2a6f2d34be14e945a46f3 # v4.1.2 + uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3 From 94963b2589e55503027fc9cd952f7971cda19d99 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Mon, 26 Feb 2024 16:49:02 -0500 Subject: [PATCH 167/176] docs: Update README.md logo --- CONTRIBUTING.md | 2 +- SECURITY.md | 2 +- code_of_conduct.md | 2 +- packages/at_backupkey_flutter/example/example.md | 2 +- packages/at_chat_flutter/example/example.md | 2 +- packages/at_common_flutter/example/example.md | 2 +- packages/at_contacts_flutter/example/example.md | 2 +- packages/at_contacts_group_flutter/example/example.md | 2 +- packages/at_events_flutter/example/EXAMPLE.md | 2 +- packages/at_invitation_flutter/example/example.md | 2 +- packages/at_location_flutter/example/EXAMPLE.md | 2 +- packages/at_notify_flutter/example/EXAMPLE.md | 2 +- packages/at_onboarding_flutter/example/example.md | 2 +- packages/at_sync_ui_flutter/example/EXAMPLE.md | 2 +- packages/at_theme_flutter/example/example.md | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df84c86e7..a757e97e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # Contributing guidelines diff --git a/SECURITY.md b/SECURITY.md index 6f56d8a89..f4d0ce331 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # Atsign Foundation Open Source Security Policies and Procedures diff --git a/code_of_conduct.md b/code_of_conduct.md index 072d50a0a..84302c525 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # The Atsign Foundation Code of Conduct diff --git a/packages/at_backupkey_flutter/example/example.md b/packages/at_backupkey_flutter/example/example.md index 60423c279..1863d079c 100644 --- a/packages/at_backupkey_flutter/example/example.md +++ b/packages/at_backupkey_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_backupkey_flutter example The at_backupkey_flutter package is designed to make it easy to take backup of secret keys in any Flutter app on the atPlatform. diff --git a/packages/at_chat_flutter/example/example.md b/packages/at_chat_flutter/example/example.md index 1a0e51054..543a5a3f2 100644 --- a/packages/at_chat_flutter/example/example.md +++ b/packages/at_chat_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # at_chat_flutter example diff --git a/packages/at_common_flutter/example/example.md b/packages/at_common_flutter/example/example.md index 9122785d6..d816cdeb3 100644 --- a/packages/at_common_flutter/example/example.md +++ b/packages/at_common_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation # at_common_flutter example diff --git a/packages/at_contacts_flutter/example/example.md b/packages/at_contacts_flutter/example/example.md index 6ddb51882..b5fde802d 100644 --- a/packages/at_contacts_flutter/example/example.md +++ b/packages/at_contacts_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_contacts_flutter example The at_contacts_flutter package is designed to make it easy to manage contacts in a flutter app with the following features: diff --git a/packages/at_contacts_group_flutter/example/example.md b/packages/at_contacts_group_flutter/example/example.md index eb7a5b9a9..19e1c2f44 100644 --- a/packages/at_contacts_group_flutter/example/example.md +++ b/packages/at_contacts_group_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_contacts_group_flutter example diff --git a/packages/at_events_flutter/example/EXAMPLE.md b/packages/at_events_flutter/example/EXAMPLE.md index fe187ba36..6c45d18b4 100644 --- a/packages/at_events_flutter/example/EXAMPLE.md +++ b/packages/at_events_flutter/example/EXAMPLE.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_events_flutter example The [at_events_flutter] package is designed to make it easy to manage events between atsigns. diff --git a/packages/at_invitation_flutter/example/example.md b/packages/at_invitation_flutter/example/example.md index 8f9cffb76..3271ef30c 100644 --- a/packages/at_invitation_flutter/example/example.md +++ b/packages/at_invitation_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_invitation_flutter example diff --git a/packages/at_location_flutter/example/EXAMPLE.md b/packages/at_location_flutter/example/EXAMPLE.md index 2ab2c1236..2e695b558 100644 --- a/packages/at_location_flutter/example/EXAMPLE.md +++ b/packages/at_location_flutter/example/EXAMPLE.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_location_flutter example The [at_location_flutter] package is designed to make it easy to share/receive locations between two atsigns and also see it on a map. diff --git a/packages/at_notify_flutter/example/EXAMPLE.md b/packages/at_notify_flutter/example/EXAMPLE.md index 1be301d84..7cf5ee661 100644 --- a/packages/at_notify_flutter/example/EXAMPLE.md +++ b/packages/at_notify_flutter/example/EXAMPLE.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_notify_flutter example The at_notify_flutter package is designed to make it easy to add notifications in atProtocol apps. diff --git a/packages/at_onboarding_flutter/example/example.md b/packages/at_onboarding_flutter/example/example.md index 7d8236db7..761d98c8c 100644 --- a/packages/at_onboarding_flutter/example/example.md +++ b/packages/at_onboarding_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_onboarding_flutter example The at_onboarding_flutter package is designed to make it easy to add onboarding flow to a flutter app on atPlatform with the following features: diff --git a/packages/at_sync_ui_flutter/example/EXAMPLE.md b/packages/at_sync_ui_flutter/example/EXAMPLE.md index 531380c43..d7b00b5e9 100644 --- a/packages/at_sync_ui_flutter/example/EXAMPLE.md +++ b/packages/at_sync_ui_flutter/example/EXAMPLE.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_sync_ui_flutter example The [at_sync_ui_flutter] package is designed to make it easy for displaying status of sync process in atProtocol apps. diff --git a/packages/at_theme_flutter/example/example.md b/packages/at_theme_flutter/example/example.md index 841ab9768..2227e3716 100644 --- a/packages/at_theme_flutter/example/example.md +++ b/packages/at_theme_flutter/example/example.md @@ -1,4 +1,4 @@ - +The Atsign FoundationThe Atsign Foundation ## at_theme_flutter example From d5880c74383898060e24b54531bd14757a3585b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 10:50:26 +0000 Subject: [PATCH 168/176] build(deps): bump subosito/flutter-action from 2.12.0 to 2.13.0 Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.12.0 to 2.13.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/2783a3f08e1baf891508463f8c6653c258246225...62f096cacda5168a3bd7b95793373be14fa4fbaf) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/static_analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index 8ce44dab4..0a58fb28a 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # v2.12.0 + - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf # v2.13.0 with: channel: "stable" - name: flutter pub get diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index bfa162efd..bc34fa0e4 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 # v2.12.0 + - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf # v2.13.0 with: channel: "stable" - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 From 7d1a26296ccd2f0e22aa56034667fe8812a444c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:45:56 +0000 Subject: [PATCH 169/176] build(deps): bump actions/checkout from 4.1.1 to 4.1.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/static_analysis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d057728b3..671cb4787 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: 'Dependency Review' uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3 diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index 0a58fb28a..99514ec8e 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -8,7 +8,7 @@ jobs: melos-bootstrap: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf # v2.13.0 with: channel: "stable" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 55bc57aea..f303bb019 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index bc34fa0e4..724962010 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -36,7 +36,7 @@ jobs: - at_theme_flutter steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf # v2.13.0 with: channel: "stable" From 318ea9c7d0496096084814ac3bec578b2a956897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:09:45 +0000 Subject: [PATCH 170/176] build(deps): bump subosito/flutter-action from 2.13.0 to 2.14.0 Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.13.0 to 2.14.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/62f096cacda5168a3bd7b95793373be14fa4fbaf...1c5eb12d812966ca84680edc38353a0851c8fd56) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/static_analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index 99514ec8e..cdf216e47 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf # v2.13.0 + - uses: subosito/flutter-action@1c5eb12d812966ca84680edc38353a0851c8fd56 # v2.14.0 with: channel: "stable" - name: flutter pub get diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 724962010..49115b784 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf # v2.13.0 + - uses: subosito/flutter-action@1c5eb12d812966ca84680edc38353a0851c8fd56 # v2.14.0 with: channel: "stable" - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 From 62f9943a1ccdf080aef4fd5b41c68fe8be3333b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:30:58 +0000 Subject: [PATCH 171/176] build(deps): bump actions/dependency-review-action from 4.1.3 to 4.2.3 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.1.3 to 4.2.3. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/9129d7d40b8c12c1ed0f60400d00c92d437adcce...0fa40c3c10055986a88de3baa0d6ec17c5a894b3) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 671cb4787..86ed11ea7 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: 'Dependency Review' - uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3 + uses: actions/dependency-review-action@0fa40c3c10055986a88de3baa0d6ec17c5a894b3 # v4.2.3 From 3f772464df248b367d2133fe1570e7693351364f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 10:23:59 +0000 Subject: [PATCH 172/176] build(deps): bump actions/dependency-review-action from 4.2.3 to 4.2.4 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.2.3 to 4.2.4. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/0fa40c3c10055986a88de3baa0d6ec17c5a894b3...733dd5d4a5203f238c33806593ec0f5fc5343d8c) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 86ed11ea7..75cf7d3e8 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: 'Dependency Review' - uses: actions/dependency-review-action@0fa40c3c10055986a88de3baa0d6ec17c5a894b3 # v4.2.3 + uses: actions/dependency-review-action@733dd5d4a5203f238c33806593ec0f5fc5343d8c # v4.2.4 From 7cb9209a92da9080baca3f01e220b8c59995678d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:12:15 +0000 Subject: [PATCH 173/176] build(deps): bump actions/dependency-review-action from 4.2.4 to 4.2.5 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.2.4 to 4.2.5. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/733dd5d4a5203f238c33806593ec0f5fc5343d8c...5bbc3ba658137598168acb2ab73b21c432dd411b) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 75cf7d3e8..97323a313 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: 'Dependency Review' - uses: actions/dependency-review-action@733dd5d4a5203f238c33806593ec0f5fc5343d8c # v4.2.4 + uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5 From 3e1601e599caac57c6b213d6e98dc88f6d66f36b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 10:25:16 +0000 Subject: [PATCH 174/176] build(deps): bump subosito/flutter-action from 2.14.0 to 2.15.0 Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.14.0 to 2.15.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/1c5eb12d812966ca84680edc38353a0851c8fd56...3d804929922b667a63a229bc59037807f969e885) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/static_analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index cdf216e47..bf61ac156 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: subosito/flutter-action@1c5eb12d812966ca84680edc38353a0851c8fd56 # v2.14.0 + - uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 # v2.15.0 with: channel: "stable" - name: flutter pub get diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 49115b784..6fabb132b 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: subosito/flutter-action@1c5eb12d812966ca84680edc38353a0851c8fd56 # v2.14.0 + - uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 # v2.15.0 with: channel: "stable" - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 From 593dadb4b697c166cd7f7c07b3412f0929497649 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:13:44 +0000 Subject: [PATCH 175/176] build(deps): bump subosito/flutter-action from 2.15.0 to 2.16.0 Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/3d804929922b667a63a229bc59037807f969e885...44ac965b96f18d999802d4b807e3256d5a3f9fa1) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/melos_bootstrap.yaml | 2 +- .github/workflows/static_analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml index bf61ac156..f062627d1 100644 --- a/.github/workflows/melos_bootstrap.yaml +++ b/.github/workflows/melos_bootstrap.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 # v2.15.0 + - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 with: channel: "stable" - name: flutter pub get diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 6fabb132b..2d1070856 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 # v2.15.0 + - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 with: channel: "stable" - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 From 16d5441983c3c0d8d563d70e309dcba566ffe8fb Mon Sep 17 00:00:00 2001 From: Chris Swan <478926+cpswan@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:57:38 +0100 Subject: [PATCH 176/176] docs: Link scorecard badge to viewer --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17cecf351..560288907 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ The Atsign FoundationThe Atsign Foundation [![GitHub License](https://img.shields.io/badge/license-BSD3-blue.svg)](./LICENSE) -[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets/badge)](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/atsign-foundation/at_widgets/badge)](https://securityscorecards.dev/viewer/?uri=github.com/atsign-foundation/at_widgets&sort_by=check-score&sort_direction=desc) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8129/badge)](https://www.bestpractices.dev/projects/8129) # at_widgets