From 87b33bf89e5b716269ce49488bb87da732b21212 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 18 Dec 2023 15:10:20 +0530 Subject: [PATCH 01/59] fix: fixed overflow and theme issues --- .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../example/lib/main.dart | 18 +++++++++++++++++- .../example/macos/Podfile.lock | 6 +++--- .../at_onboarding_flutter/example/pubspec.yaml | 1 + 5 files changed, 23 insertions(+), 6 deletions(-) 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 @@ { rootEnvironment: AtEnv.rootEnvironment, appAPIKey: AtEnv.appApiKey, theme: AtOnboardingTheme( - primaryColor: null, + primaryColor: Colors.blue, + textTheme: const TextTheme( + titleMedium: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + ), + ), ), showPopupSharedStorage: true, ), @@ -148,11 +154,21 @@ class _MyAppState extends State { onPressed: () async { var preference = await futurePreference; atClientPreference = preference; + // ignore: use_build_context_synchronously AtOnboarding.reset( context: context, config: AtOnboardingConfig( atClientPreference: atClientPreference!, domain: AtEnv.rootDomain, + theme: AtOnboardingTheme( + primaryColor: Colors.blue, + textTheme: const TextTheme( + titleMedium: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + ), + ), + ), rootEnvironment: AtEnv.rootEnvironment, appAPIKey: AtEnv.appApiKey, ), diff --git a/packages/at_onboarding_flutter/example/macos/Podfile.lock b/packages/at_onboarding_flutter/example/macos/Podfile.lock index bc434a2a8..484486a43 100644 --- a/packages/at_onboarding_flutter/example/macos/Podfile.lock +++ b/packages/at_onboarding_flutter/example/macos/Podfile.lock @@ -64,9 +64,9 @@ SPEC CHECKSUMS: package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 + shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index 781d137f1..b2871764c 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -45,6 +45,7 @@ dependency_overrides: intl: ^0.17.0 at_onboarding_flutter: path: ../ + # at_onboarding_flutter: ^6.1.5 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 6c672c6f01a90d7460fd5d2e3fbaf925eb979089 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 18 Dec 2023 15:12:45 +0530 Subject: [PATCH 02/59] fix: fixed overflow and theme issues --- .../screen/at_onboarding_accounts_screen.dart | 1 + .../screen/at_onboarding_activate_screen.dart | 41 ++- .../screen/at_onboarding_backup_screen.dart | 1 + .../screen/at_onboarding_generate_screen.dart | 273 +++++++------- .../lib/screen/at_onboarding_home_screen.dart | 335 +++++++++--------- .../at_onboarding_input_atsign_screen.dart | 129 +++---- .../screen/at_onboarding_intro_screen.dart | 111 +++--- .../lib/screen/at_onboarding_otp_screen.dart | 1 + .../lib/screen/at_onboarding_pair_screen.dart | 175 ++++----- .../screen/at_onboarding_qrcode_screen.dart | 1 + .../at_onboarding_reference_screen.dart | 1 + .../screen/at_onboarding_reset_screen.dart | 1 + .../screen/at_onboarding_start_screen.dart | 35 +- .../lib/services/at_onboarding_theme.dart | 2 + 14 files changed, 569 insertions(+), 538 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 155ca324d..0391ac66b 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 @@ -52,6 +52,7 @@ class _AtOnboardingAccountsScreenState Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), 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 7cc8575d3..c7cd46af2 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 @@ -63,6 +63,7 @@ class _AtOnboardingActivateScreenState Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -85,25 +86,27 @@ class _AtOnboardingActivateScreenState ], ), body: Center( - child: Container( - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - constraints: const BoxConstraints( - maxWidth: 400, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - AtSyncIndicator( - color: theme.primaryColor, - ), - const SizedBox(height: 10), - Text( - AtOnboardingLocalizations.current.msg_wait_fetching_atSign, - ), - ], + child: SingleChildScrollView( + child: Container( + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + constraints: const BoxConstraints( + maxWidth: 400, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + AtSyncIndicator( + color: theme.primaryColor, + ), + const SizedBox(height: 10), + Text( + AtOnboardingLocalizations.current.msg_wait_fetching_atSign, + ), + ], + ), ), ), ), 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 b72cf2ea2..3d17d0257 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 @@ -46,6 +46,7 @@ class _AtOnboardingBackupScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), 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 3dd2baa19..a3cf1a1f5 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 @@ -192,6 +192,7 @@ class _AtOnboardingGenerateScreenState Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -214,155 +215,159 @@ class _AtOnboardingGenerateScreenState ], ), body: Center( - child: Container( - decoration: BoxDecoration( - color: theme.primaryColor.withOpacity(0.1), - borderRadius: - BorderRadius.circular(AtOnboardingDimens.borderRadius)), - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - constraints: const BoxConstraints( - maxWidth: 400, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text( - AtOnboardingLocalizations.current.btn_generate_atSign, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 5), - TextFormField( - enabled: false, - validator: (String? value) { - if ((value ?? '').isEmpty) { - return AtOnboardingLocalizations - .current.msg_atSign_cannot_empty; - } - return null; - }, - controller: _atsignController, - decoration: InputDecoration( - hintText: AtOnboardingStrings.atsignHintText, - prefix: Text( - '@', - style: TextStyle(color: theme.primaryColor), + child: SingleChildScrollView( + child: Container( + decoration: BoxDecoration( + color: theme.primaryColor.withOpacity(0.1), + borderRadius: + BorderRadius.circular(AtOnboardingDimens.borderRadius)), + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + constraints: const BoxConstraints( + maxWidth: 400, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + AtOnboardingLocalizations.current.btn_generate_atSign, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + fontWeight: FontWeight.bold, ), - border: OutlineInputBorder( - borderSide: BorderSide( - color: theme.primaryColor, + ), + const SizedBox(height: 5), + TextFormField( + enabled: false, + validator: (String? value) { + if ((value ?? '').isEmpty) { + return AtOnboardingLocalizations + .current.msg_atSign_cannot_empty; + } + return null; + }, + controller: _atsignController, + decoration: InputDecoration( + hintText: AtOnboardingStrings.atsignHintText, + prefix: Text( + '@', + style: TextStyle(color: theme.primaryColor), ), + border: OutlineInputBorder( + borderSide: BorderSide( + color: theme.primaryColor, + ), + ), + contentPadding: const EdgeInsets.symmetric( + horizontal: AtOnboardingDimens.paddingSmall), ), - contentPadding: const EdgeInsets.symmetric( - horizontal: AtOnboardingDimens.paddingSmall), - ), - ), - const SizedBox(height: 20), - Text( - AtOnboardingLocalizations.current.msg_refresh_atSign, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontNormal, - // fontStyle: FontStyle.italic, ), - ), - const SizedBox(height: 6), - InkWell( - highlightColor: Colors.transparent, - splashColor: Colors.transparent, - onTap: _showReferenceWebview, - child: Text( - AtOnboardingLocalizations.current.learn_about_atSign, + const SizedBox(height: 20), + Text( + AtOnboardingLocalizations.current.msg_refresh_atSign, style: const TextStyle( fontSize: AtOnboardingDimens.fontNormal, - fontStyle: FontStyle.italic, - // fontWeight: FontWeight.w500, - decoration: TextDecoration.underline, + // fontStyle: FontStyle.italic, ), ), - ), - const SizedBox(height: 20), - AtOnboardingSecondaryButton( - key: keyGenerateAtSign, - height: 48, - borderRadius: 24, - onPressed: () async { - _getFreeAtsign(); - }, - isLoading: _isGenerating, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Center( - child: Text( - AtOnboardingLocalizations.current.btn_refresh, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge), - ), + const SizedBox(height: 6), + InkWell( + highlightColor: Colors.transparent, + splashColor: Colors.transparent, + onTap: _showReferenceWebview, + child: Text( + AtOnboardingLocalizations.current.learn_about_atSign, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontNormal, + fontStyle: FontStyle.italic, + // fontWeight: FontWeight.w500, + decoration: TextDecoration.underline, ), - const Icon( - Icons.refresh, - size: 20, - ) - ], + ), ), - ), - const SizedBox(height: 20), - AtOnboardingPrimaryButton( - height: 48, - borderRadius: 24, - onPressed: _showPairScreen, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - AtOnboardingLocalizations.current.btn_pair, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, + const SizedBox(height: 20), + AtOnboardingSecondaryButton( + key: keyGenerateAtSign, + height: 48, + borderRadius: 24, + onPressed: () async { + _getFreeAtsign(); + }, + isLoading: _isGenerating, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Center( + child: Text( + AtOnboardingLocalizations.current.btn_refresh, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + ), + ), ), - ), - const Icon( - Icons.arrow_right_alt_rounded, - ) - ], + const Icon( + Icons.refresh, + size: 20, + ) + ], + ), ), - ), - const SizedBox(height: 20), - InkWell( - onTap: () async { - if (widget.isFromIntroScreen) { - Navigator.push( - context, - MaterialPageRoute( - builder: (BuildContext context) { - return AtOnboardingHomeScreen( - config: widget.config, - ); - }, + const SizedBox(height: 20), + AtOnboardingPrimaryButton( + height: 48, + borderRadius: 24, + onPressed: _showPairScreen, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + AtOnboardingLocalizations.current.btn_pair, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + ), ), - ); - } else { - Navigator.of(context).pop(); - } - }, - highlightColor: Colors.transparent, - splashColor: Colors.transparent, - child: Text( - AtOnboardingLocalizations.current.btn_already_have_atSign, - key: keyHaveAnAtSign, - style: TextStyle( - fontSize: AtOnboardingDimens.fontNormal, - fontWeight: FontWeight.w500, - color: theme.primaryColor, - decoration: TextDecoration.underline, + const Icon( + Icons.arrow_right_alt_rounded, + ) + ], ), ), - ), - ], + const SizedBox(height: 20), + InkWell( + onTap: () async { + if (widget.isFromIntroScreen) { + Navigator.push( + context, + MaterialPageRoute( + builder: (BuildContext context) { + return AtOnboardingHomeScreen( + config: widget.config, + ); + }, + ), + ); + } else { + Navigator.of(context).pop(); + } + }, + highlightColor: Colors.transparent, + splashColor: Colors.transparent, + child: Text( + AtOnboardingLocalizations + .current.btn_already_have_atSign, + key: keyHaveAnAtSign, + style: TextStyle( + fontSize: AtOnboardingDimens.fontNormal, + fontWeight: FontWeight.w500, + color: theme.primaryColor, + decoration: TextDecoration.underline, + ), + ), + ), + ], + ), ), ), ), 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..5c7cd54d2 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 @@ -637,6 +637,7 @@ class _AtOnboardingHomeScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -660,194 +661,196 @@ class _AtOnboardingHomeScreenState extends State { ], ), body: Center( - child: Container( - // width: _dialogWidth, - decoration: BoxDecoration( - color: theme.primaryColor.withOpacity(0.1), - borderRadius: - BorderRadius.circular(AtOnboardingDimens.borderRadius)), - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - constraints: const BoxConstraints( - maxWidth: 400, - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - AtOnboardingLocalizations.current.pair_atSign, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 5), - AtOnboardingPrimaryButton( - key: keyUploadAtSign, - height: 48, - borderRadius: 24, - onPressed: (Platform.isMacOS || - Platform.isLinux || - Platform.isWindows) - ? _uploadKeyFileForDesktop - : _uploadKeyFile, - isLoading: loading, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - AtOnboardingLocalizations.current.upload_atKeys, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - ), - ), - const SizedBox(width: 10), - const Icon( - Icons.cloud_upload_rounded, - // size: 20, - ) - ], - ), - ), - const SizedBox(height: 5), - Text( - AtOnboardingLocalizations.current.sub_upload_atKeys, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontSmall, - ), - ), - 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) + child: SingleChildScrollView( + child: Container( + // width: _dialogWidth, + decoration: BoxDecoration( + color: theme.primaryColor.withOpacity(0.1), + borderRadius: + BorderRadius.circular(AtOnboardingDimens.borderRadius)), + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + constraints: const BoxConstraints( + maxWidth: 400, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ Text( - AtOnboardingLocalizations - .current.title_activate_an_atSign, + AtOnboardingLocalizations.current.pair_atSign, style: const TextStyle( fontSize: AtOnboardingDimens.fontLarge, fontWeight: FontWeight.bold, ), ), - if (!widget.hideQrScan) const SizedBox(height: 5), - if (!widget.hideQrScan) - AtOnboardingSecondaryButton( - key: keyActivateAtSign, + const SizedBox(height: 5), + AtOnboardingPrimaryButton( + key: keyUploadAtSign, height: 48, borderRadius: 24, - onPressed: () async { - _showActiveScreen(context: context); - }, + onPressed: (Platform.isMacOS || + Platform.isLinux || + Platform.isWindows) + ? _uploadKeyFileForDesktop + : _uploadKeyFile, + isLoading: loading, child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - AtOnboardingLocalizations - .current.btn_activate_atSign, + AtOnboardingLocalizations.current.upload_atKeys, style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge), + fontSize: AtOnboardingDimens.fontLarge, + ), ), - const Icon(Icons.arrow_right_alt_rounded) + const SizedBox(width: 10), + const Icon( + Icons.cloud_upload_rounded, + // size: 20, + ) ], ), ), - const SizedBox(height: 20), - Align( - alignment: Alignment.centerLeft, - child: InkWell( - onTap: () { - if (widget.isFromIntroScreen) { - Navigator.push( - context, - MaterialPageRoute( - builder: (_) => AtOnboardingGenerateScreen( - onGenerateSuccess: ({ - required String atSign, - required String secret, - }) { - String cramSecret = secret.split(':').last; - String atsign = atSign.startsWith('@') - ? atSign - : '@$atSign'; - _processSharedSecret(atsign, cramSecret); - }, - config: widget.config, + const SizedBox(height: 5), + Text( + AtOnboardingLocalizations.current.sub_upload_atKeys, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontSmall, + ), + ), + 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) + ], ), ), - ); - } else { - Navigator.of(context).pop(); - } - }, - highlightColor: Colors.transparent, - splashColor: Colors.transparent, - child: Text( - AtOnboardingLocalizations.current.get_free_atSign, - key: keyCreateAnAtSign, - style: TextStyle( - fontSize: AtOnboardingDimens.fontNormal, - fontWeight: FontWeight.w500, - color: theme.primaryColor, - decoration: TextDecoration.underline, + const SizedBox(height: 20), + if (!widget.hideQrScan) + Text( + AtOnboardingLocalizations + .current.title_activate_an_atSign, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + fontWeight: FontWeight.bold, + ), + ), + if (!widget.hideQrScan) const SizedBox(height: 5), + if (!widget.hideQrScan) + AtOnboardingSecondaryButton( + key: keyActivateAtSign, + height: 48, + borderRadius: 24, + onPressed: () async { + _showActiveScreen(context: context); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + AtOnboardingLocalizations + .current.btn_activate_atSign, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge), + ), + const Icon(Icons.arrow_right_alt_rounded) + ], + ), + ), + const SizedBox(height: 20), + Align( + alignment: Alignment.centerLeft, + child: InkWell( + onTap: () { + if (widget.isFromIntroScreen) { + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => AtOnboardingGenerateScreen( + onGenerateSuccess: ({ + required String atSign, + required String secret, + }) { + String cramSecret = secret.split(':').last; + String atsign = atSign.startsWith('@') + ? atSign + : '@$atSign'; + _processSharedSecret(atsign, cramSecret); + }, + config: widget.config, + ), + ), + ); + } else { + Navigator.of(context).pop(); + } + }, + highlightColor: Colors.transparent, + splashColor: Colors.transparent, + child: Text( + AtOnboardingLocalizations.current.get_free_atSign, + key: keyCreateAnAtSign, + style: TextStyle( + fontSize: AtOnboardingDimens.fontNormal, + fontWeight: FontWeight.w500, + color: theme.primaryColor, + decoration: TextDecoration.underline, + ), ), ), ), - ), - ], + ], + ), ), ), ), 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 2f7e6c6a4..e31c9409b 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 @@ -31,6 +31,7 @@ class _AtOnboardingInputAtSignScreenState Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -51,77 +52,79 @@ class _AtOnboardingInputAtSignScreenState ], ), body: Center( - child: Container( - decoration: BoxDecoration( - color: theme.primaryColor.withOpacity(0.1), - borderRadius: - BorderRadius.circular(AtOnboardingDimens.borderRadius)), - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - constraints: const BoxConstraints( - maxWidth: 400, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text( - AtOnboardingLocalizations.current.activate_an_atSign, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 2), - Text( - AtOnboardingLocalizations - .current.enter_atSign_need_to_activate, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontSmall, + child: SingleChildScrollView( + child: Container( + decoration: BoxDecoration( + color: theme.primaryColor.withOpacity(0.1), + borderRadius: + BorderRadius.circular(AtOnboardingDimens.borderRadius)), + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + constraints: const BoxConstraints( + maxWidth: 400, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + AtOnboardingLocalizations.current.activate_an_atSign, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + fontWeight: FontWeight.bold, + ), ), - ), - const SizedBox(height: 8), - TextFormField( - enabled: true, - validator: (String? value) { - if ((value ?? '').isEmpty) { - return AtOnboardingLocalizations - .current.msg_atSign_cannot_empty; - } - return null; - }, - controller: _atsignController, - decoration: InputDecoration( - hintText: AtOnboardingStrings.atsignHintText, - prefix: Text( - '@', - style: TextStyle(color: theme.primaryColor), + const SizedBox(height: 2), + Text( + AtOnboardingLocalizations + .current.enter_atSign_need_to_activate, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontSmall, ), - border: OutlineInputBorder( - borderSide: BorderSide( - color: theme.primaryColor, + ), + const SizedBox(height: 8), + TextFormField( + enabled: true, + validator: (String? value) { + if ((value ?? '').isEmpty) { + return AtOnboardingLocalizations + .current.msg_atSign_cannot_empty; + } + return null; + }, + controller: _atsignController, + decoration: InputDecoration( + hintText: AtOnboardingStrings.atsignHintText, + prefix: Text( + '@', + style: TextStyle(color: theme.primaryColor), + ), + border: OutlineInputBorder( + borderSide: BorderSide( + color: theme.primaryColor, + ), ), + contentPadding: const EdgeInsets.symmetric( + horizontal: AtOnboardingDimens.paddingSmall), ), - contentPadding: const EdgeInsets.symmetric( - horizontal: AtOnboardingDimens.paddingSmall), ), - ), - const SizedBox(height: 20), - AtOnboardingPrimaryButton( - height: 48, - borderRadius: 24, - onPressed: _activateAtSign, - child: Center( - child: Text( - AtOnboardingLocalizations.current.activate, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, + const SizedBox(height: 20), + AtOnboardingPrimaryButton( + height: 48, + borderRadius: 24, + onPressed: _activateAtSign, + child: Center( + child: Text( + AtOnboardingLocalizations.current.activate, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + ), ), ), ), - ), - ], + ], + ), ), ), ), 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 ce36e5853..b51ac35a1 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 @@ -34,6 +34,7 @@ class _AtOnboardingIntroScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -55,64 +56,66 @@ class _AtOnboardingIntroScreenState extends State { centerTitle: true, ), body: Center( - child: Container( - decoration: BoxDecoration( - color: theme.primaryColor.withOpacity(0.1), - borderRadius: - BorderRadius.circular(AtOnboardingDimens.borderRadius)), - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - constraints: const BoxConstraints( - maxWidth: 400, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - RichText( - text: TextSpan( - text: AtOnboardingLocalizations.current.title_intro, - style: theme.textTheme.titleMedium, - children: [ - TextSpan( - text: AtOnboardingLocalizations.current.learn_more, - style: TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.w500, - color: theme.primaryColor, - decoration: TextDecoration.underline, + child: SingleChildScrollView( + child: Container( + decoration: BoxDecoration( + color: theme.primaryColor.withOpacity(0.1), + borderRadius: + BorderRadius.circular(AtOnboardingDimens.borderRadius)), + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + constraints: const BoxConstraints( + maxWidth: 400, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + RichText( + text: TextSpan( + text: AtOnboardingLocalizations.current.title_intro, + style: theme.textTheme.titleMedium, + children: [ + TextSpan( + text: AtOnboardingLocalizations.current.learn_more, + style: TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + fontWeight: FontWeight.w500, + color: theme.primaryColor, + decoration: TextDecoration.underline, + ), + recognizer: TapGestureRecognizer() + ..onTap = _showReferenceWebview, ), - recognizer: TapGestureRecognizer() - ..onTap = _showReferenceWebview, - ), - ], + ], + ), + textAlign: TextAlign.center, ), - textAlign: TextAlign.center, - ), - const SizedBox(height: 16), - AtOnboardingPrimaryButton( - height: 48, - borderRadius: 24, - child: Text( - AtOnboardingLocalizations.current.already_have_an_atSign, + const SizedBox(height: 16), + AtOnboardingPrimaryButton( + height: 48, + borderRadius: 24, + child: Text( + AtOnboardingLocalizations.current.already_have_an_atSign, + ), + onPressed: () { + _navigateToHomePage(true); + }, ), - onPressed: () { - _navigateToHomePage(true); - }, - ), - const SizedBox(height: 16), - AtOnboardingSecondaryButton( - height: 48, - borderRadius: 24, - child: Text( - AtOnboardingLocalizations.current.get_free_atSign, + const SizedBox(height: 16), + AtOnboardingSecondaryButton( + height: 48, + borderRadius: 24, + child: Text( + AtOnboardingLocalizations.current.get_free_atSign, + ), + onPressed: () { + _navigateToHomePage(false); + }, ), - onPressed: () { - _navigateToHomePage(false); - }, - ), - ], + ], + ), ), ), ), 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 7a37978c5..d00c66a9b 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 @@ -91,6 +91,7 @@ class _AtOnboardingOTPScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), 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 3cf44f6e7..7bb562de2 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 @@ -61,6 +61,7 @@ class _AtOnboardingPairScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -84,100 +85,102 @@ class _AtOnboardingPairScreenState extends State { ], ), body: Center( - child: Container( - decoration: BoxDecoration( - color: theme.primaryColor.withOpacity(0.1), - borderRadius: - BorderRadius.circular(AtOnboardingDimens.borderRadius)), - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - constraints: const BoxConstraints( - maxWidth: 400, - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - AtOnboardingLocalizations.current.enter_your_email_address, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.bold, + child: SingleChildScrollView( + child: Container( + decoration: BoxDecoration( + color: theme.primaryColor.withOpacity(0.1), + borderRadius: + BorderRadius.circular(AtOnboardingDimens.borderRadius)), + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + margin: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + constraints: const BoxConstraints( + maxWidth: 400, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + AtOnboardingLocalizations.current.enter_your_email_address, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + fontWeight: FontWeight.bold, + ), ), - ), - const SizedBox(height: 5), - TextFormField( - enabled: true, - focusNode: _focusNode, - validator: (String? value) { - if ((value ?? '').isEmpty) { - return AtOnboardingLocalizations - .current.msg_atSign_cannot_empty; - } - return null; - }, - controller: _emailController, - inputFormatters: [ - LengthLimitingTextInputFormatter(80), - // This inputFormatter function will convert all the input to lowercase. - TextInputFormatter.withFunction( - (TextEditingValue oldValue, - TextEditingValue newValue) { - return newValue.copyWith( - text: newValue.text.toLowerCase(), - selection: newValue.selection, - ); - }) - ], - textCapitalization: TextCapitalization.none, - decoration: InputDecoration( - fillColor: Colors.blueAccent, - errorStyle: const TextStyle(fontSize: 12), - prefixStyle: - TextStyle(color: theme.primaryColor, fontSize: 15), - border: OutlineInputBorder( - borderSide: BorderSide( - color: theme.primaryColor, + const SizedBox(height: 5), + TextFormField( + enabled: true, + focusNode: _focusNode, + validator: (String? value) { + if ((value ?? '').isEmpty) { + return AtOnboardingLocalizations + .current.msg_atSign_cannot_empty; + } + return null; + }, + controller: _emailController, + inputFormatters: [ + LengthLimitingTextInputFormatter(80), + // This inputFormatter function will convert all the input to lowercase. + TextInputFormatter.withFunction( + (TextEditingValue oldValue, + TextEditingValue newValue) { + return newValue.copyWith( + text: newValue.text.toLowerCase(), + selection: newValue.selection, + ); + }) + ], + textCapitalization: TextCapitalization.none, + decoration: InputDecoration( + fillColor: Colors.blueAccent, + errorStyle: const TextStyle(fontSize: 12), + prefixStyle: + TextStyle(color: theme.primaryColor, fontSize: 15), + border: OutlineInputBorder( + borderSide: BorderSide( + color: theme.primaryColor, + ), ), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide( - color: Colors.grey[500]!, + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Colors.grey[500]!, + ), ), + contentPadding: const EdgeInsets.symmetric( + horizontal: AtOnboardingDimens.paddingSmall), ), - contentPadding: const EdgeInsets.symmetric( - horizontal: AtOnboardingDimens.paddingSmall), ), - ), - const SizedBox(height: 10), - Text( - AtOnboardingLocalizations.current.note_pair_content, - style: const TextStyle( - fontWeight: FontWeight.w600, - fontSize: AtOnboardingDimens.fontNormal, + const SizedBox(height: 10), + Text( + AtOnboardingLocalizations.current.note_pair_content, + style: const TextStyle( + fontWeight: FontWeight.w600, + fontSize: AtOnboardingDimens.fontNormal, + ), ), - ), - const SizedBox(height: 20), - AtOnboardingPrimaryButton( - height: 48, - borderRadius: 24, - isLoading: isParing, - onPressed: _onSendCodePressed, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - AtOnboardingLocalizations.current.send_code, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, + const SizedBox(height: 20), + AtOnboardingPrimaryButton( + height: 48, + borderRadius: 24, + isLoading: isParing, + onPressed: _onSendCodePressed, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + AtOnboardingLocalizations.current.send_code, + style: const TextStyle( + fontSize: AtOnboardingDimens.fontLarge, + ), ), - ), - const Icon(Icons.arrow_right_alt_rounded) - ], + const Icon(Icons.arrow_right_alt_rounded) + ], + ), ), - ), - ], + ], + ), ), ), ), 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 cb7b0f92f..a3361e720 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 @@ -100,6 +100,7 @@ class _AtOnboardingQRCodeScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), 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 718f575c3..9df1872e3 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 @@ -83,6 +83,7 @@ class _AtOnboardingReferenceScreenState Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), 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 c6c6b7d49..9a70f0685 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 @@ -48,6 +48,7 @@ class _AtOnboardingResetScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), 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..4293786a5 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 @@ -107,6 +107,7 @@ class _AtOnboardingStartScreenState extends State { Widget build(BuildContext context) { final theme = Theme.of(context).copyWith( primaryColor: widget.config.theme?.primaryColor, + textTheme: widget.config.theme?.textTheme, colorScheme: Theme.of(context).colorScheme.copyWith( primary: widget.config.theme?.primaryColor, ), @@ -117,22 +118,24 @@ class _AtOnboardingStartScreenState extends State { child: Scaffold( backgroundColor: Colors.transparent, body: Center( - child: Container( - padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), - decoration: BoxDecoration( - color: theme.scaffoldBackgroundColor, - borderRadius: - BorderRadius.circular(AtOnboardingDimens.dialogBorderRadius), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - AtSyncIndicator(color: theme.primaryColor), - const SizedBox(width: AtOnboardingDimens.paddingSmall), - Text( - AtOnboardingLocalizations.current.onboarding, - ), - ], + child: SingleChildScrollView( + child: Container( + padding: const EdgeInsets.all(AtOnboardingDimens.paddingNormal), + decoration: BoxDecoration( + color: theme.scaffoldBackgroundColor, + borderRadius: + BorderRadius.circular(AtOnboardingDimens.dialogBorderRadius), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + AtSyncIndicator(color: theme.primaryColor), + const SizedBox(width: AtOnboardingDimens.paddingSmall), + Text( + AtOnboardingLocalizations.current.onboarding, + ), + ], + ), ), ), ), diff --git a/packages/at_onboarding_flutter/lib/services/at_onboarding_theme.dart b/packages/at_onboarding_flutter/lib/services/at_onboarding_theme.dart index 4d2f2a2ac..814349998 100644 --- a/packages/at_onboarding_flutter/lib/services/at_onboarding_theme.dart +++ b/packages/at_onboarding_flutter/lib/services/at_onboarding_theme.dart @@ -3,8 +3,10 @@ import 'package:flutter/material.dart'; class AtOnboardingTheme { ///set primary color for Onboarding final Color? primaryColor; + final TextTheme? textTheme; AtOnboardingTheme({ this.primaryColor, + this.textTheme, }); } From d2e801e1e3faa06e581c4f0583f0b69d3ffc095c Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 31 Jan 2024 20:01:08 +0530 Subject: [PATCH 03/59] 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 16c306a839d141895e8735c458bbca378756bb5c Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 6 Feb 2024 15:28:24 +0530 Subject: [PATCH 04/59] fix: updated dependencies and fixed formatting --- .../example/ios/Podfile.lock | 6 +-- .../lib/screen/at_onboarding_home_screen.dart | 4 +- packages/at_onboarding_flutter/pubspec.yaml | 38 +++++++++---------- 3 files changed, 25 insertions(+), 23 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/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart index b2c9ba27e..1aa600307 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 @@ -541,7 +541,9 @@ class _AtOnboardingHomeScreenState extends State { // 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 880c1525dd964a9df4d3695a503b436251ea357d Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 7 Feb 2024 14:28:34 +0530 Subject: [PATCH 05/59] 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 8f15cb286ae54db07f1901b49fda1d0a5fc7c3ca Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 11:31:27 +0530 Subject: [PATCH 06/59] 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 891592de93658d57954aec74ca7ce409c003a385 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 13:12:42 +0530 Subject: [PATCH 07/59] 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 e49f1b015de8a4b954f93167ad3d3a2ac9b1c20b Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 13:27:55 +0530 Subject: [PATCH 08/59] 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 890165635b4f6df369ceef045fe087ad85e961f2 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 13:42:32 +0530 Subject: [PATCH 09/59] 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 78f57b6f197c2dd56761dd49c457366f7e26d85a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:33:01 +0530 Subject: [PATCH 10/59] 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 0bcc4b963262714aa82896f9082b2c12b0c06917 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:39:22 +0530 Subject: [PATCH 11/59] 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 d6e9d2e1e1b5a181fc0ea8c91817f38e6cc85951 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:44:55 +0530 Subject: [PATCH 12/59] 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 659b98363d3717105c55180095fca33cdff7332c Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:48:40 +0530 Subject: [PATCH 13/59] 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 f3a65d252c166dbe263fb5e26d6cf7d4481e2ea0 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:50:40 +0530 Subject: [PATCH 14/59] 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 ddc4450e44e48ba2659841be48b3a0dea2c89832 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:54:41 +0530 Subject: [PATCH 15/59] 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 4beabae7fa1ded15e0c37799d25a075750f65a8e Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:56:10 +0530 Subject: [PATCH 16/59] 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 5071a707f46bf43b5165debaa06847cecfe938d5 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 14:57:12 +0530 Subject: [PATCH 17/59] 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 28841ff0f68aaac2f483b3448c622b86c8e2600a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Thu, 8 Feb 2024 15:23:38 +0530 Subject: [PATCH 18/59] 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 0b309d86b55ac455c6a1976431ef0b01ecfb862a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 12:10:06 +0530 Subject: [PATCH 19/59] 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 61886c47572a22305e92e2b8bcc5e197d98e4612 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 12:25:04 +0530 Subject: [PATCH 20/59] 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 5f3bd430bb032e6120a96606536dda2640b0bf40 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 13:12:21 +0530 Subject: [PATCH 21/59] 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 b83fbab6f21ca4cee69b40ab96cd72fa197d8466 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Fri, 9 Feb 2024 14:00:35 +0530 Subject: [PATCH 22/59] 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 88cacd662f303e842b6363ee2183ddd1dbe2b839 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:14:45 +0530 Subject: [PATCH 23/59] 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 d9d236df89d457e1e9aa684c2c3906f025c177be Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:17:54 +0530 Subject: [PATCH 24/59] 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 5922ec0e9b7d3532c90b76cf13ecee175e3e4cc6 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:50:19 +0530 Subject: [PATCH 25/59] 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 6a009f0cf8dbbcfa87cef6519fe51e6226cc79e9 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:56:49 +0530 Subject: [PATCH 26/59] 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 a87f2b09e681472714b59c3cceb8cac1ce75f7e5 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 09:58:01 +0530 Subject: [PATCH 27/59] 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 10b5a9c795314df5c8c62e7302128d578103af80 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 10:04:50 +0530 Subject: [PATCH 28/59] 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 5594bbc4e5daa4499bccd62598fb81a2151135d9 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 10:27:35 +0530 Subject: [PATCH 29/59] 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 3019dc0401090bc159980c7b6d4f7517c9e91b49 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:01:31 +0530 Subject: [PATCH 30/59] 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 d57b77f78ebe544840840ecaac208ff7fb3bd770 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:14:42 +0530 Subject: [PATCH 31/59] 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 0c16fd012d34f71995534b9c6cf1a84391ad0117 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:24:26 +0530 Subject: [PATCH 32/59] 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 93871f0a95b109ff4da4ae000db37d0ac6e558f9 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:38:57 +0530 Subject: [PATCH 33/59] 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 83507a8e4b9c1f8f18ef230f9aa23e51b4a26ed6 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 11:48:02 +0530 Subject: [PATCH 34/59] 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 5265908df9eccba09394052554dfe8a0103e2bac Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 16:45:51 +0530 Subject: [PATCH 35/59] 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 cc610a667b9328241b739d0b0ec4e5263e5faa62 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 15:04:59 +0530 Subject: [PATCH 36/59] 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 37/59] 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 25ede853e92a0770b3238489ae14eddbe4fc0741 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 17:15:24 +0530 Subject: [PATCH 38/59] 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 b93e701fb83ab521af9e8498d012b836999dea28 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 17:20:13 +0530 Subject: [PATCH 39/59] 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 d744d876769d10d54f8e410246dd740e70bddea5 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 18:01:24 +0530 Subject: [PATCH 40/59] 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 1902128377a7a71228e3ba8cccf7005fc79c018f Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Mon, 12 Feb 2024 18:40:47 +0530 Subject: [PATCH 41/59] 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 8596ce24b4b8127704217664848adf07d53d592c 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 42/59] 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 9e9801581a264370e301b5a2e190fe025e8b292a Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Wed, 10 Apr 2024 11:44:41 +0530 Subject: [PATCH 43/59] feat: merge into trunk --- .../example/macos/Podfile.lock | 4 +- .../lib/screen/at_onboarding_home_screen.dart | 65 ------------------- 2 files changed, 2 insertions(+), 67 deletions(-) diff --git a/packages/at_onboarding_flutter/example/macos/Podfile.lock b/packages/at_onboarding_flutter/example/macos/Podfile.lock index 484486a43..9964a957a 100644 --- a/packages/at_onboarding_flutter/example/macos/Podfile.lock +++ b/packages/at_onboarding_flutter/example/macos/Podfile.lock @@ -64,8 +64,8 @@ SPEC CHECKSUMS: package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c - url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 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 1aa600307..4d3a5acd9 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 @@ -723,71 +723,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 - .current.title_activate_an_atSign, - style: const TextStyle( - fontSize: AtOnboardingDimens.fontLarge, - fontWeight: FontWeight.bold, - ), - ), - if (!widget.hideQrScan) const SizedBox(height: 5), if (!widget.hideQrScan) AtOnboardingSecondaryButton( key: keyActivateAtSign, From fcbb54ce4744e2ef4aed456cc5a8787d5395a132 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 20 Feb 2024 16:27:32 +0530 Subject: [PATCH 44/59] 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 7e5aaa317d0508e54d5bfcf4aa0dfc1380b07147 Mon Sep 17 00:00:00 2001 From: Sardar1208 Date: Tue, 20 Feb 2024 16:29:50 +0530 Subject: [PATCH 45/59] 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 4d3a5acd9..d7ca2c063 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; @@ -950,12 +949,10 @@ class _AtOnboardingHomeScreenState extends State { try { String? aesKey, atsign; setState(() { - _uploadingQRCode = true; }); String? path = await _desktopQRFilePicker(); if (path == null) { setState(() { - _uploadingQRCode = false; }); return; } @@ -987,19 +984,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 3b52f1be95df0ea0121074bc753d7071e9ece350 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 46/59] 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 43d3f84e2d0e7493c8852e10a817d6bdcb75d574 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 47/59] 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 c1325e1368e07b91ec9cbc193d3873a08878485c 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 48/59] 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 2a9d82d0ecde61beff505a2e447c95a967c3c104 Mon Sep 17 00:00:00 2001 From: xavierchanth Date: Mon, 26 Feb 2024 16:49:02 -0500 Subject: [PATCH 49/59] 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 e3432dea9e67f920b4d36d99b915baef19ff62f6 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 50/59] 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 c29922a8b3e3ac06ee3f7e8e30629605a83379c5 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 51/59] 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 042bbcdd73daba00e6712273cd062e2d6949705d 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 52/59] 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 c6f9bc718c05c32641c8a6e07f7a1a0915dd5b85 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 53/59] 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 7995744306019affe31ddfa4e5d4a97dd185b153 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 54/59] 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 c10c45395daee7c144eb1f5206f593fa14605314 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 55/59] 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 0dc6bb8e89b5601c906dce3d7434d57960bd00d5 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 56/59] 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 6007d339025d2aadd90013f70cfca0729adaed5f 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 57/59] 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 3960aaec4181ebf9622c6a83794163693c5861f7 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 58/59] 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 From fa118519928313ffab1a7032b90df77acb3c1c3b Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 6 Jun 2024 09:34:42 -0400 Subject: [PATCH 59/59] fix: example app updated to show the use of AtOnboardingTheme TextTheme. --- .../example/lib/main.dart | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart index 41bb22016..2da782d8a 100644 --- a/packages/at_onboarding_flutter/example/lib/main.dart +++ b/packages/at_onboarding_flutter/example/lib/main.dart @@ -1,11 +1,11 @@ import 'dart:async'; + +import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv; +import 'package:at_onboarding_flutter/at_onboarding_flutter.dart'; import 'package:at_onboarding_flutter_example/switch_atsign.dart'; import 'package:flutter/material.dart'; -import 'package:at_onboarding_flutter/at_onboarding_flutter.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:path_provider/path_provider.dart' - show getApplicationSupportDirectory; -import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv; +import 'package:path_provider/path_provider.dart' show getApplicationSupportDirectory; Future main() async { await AtEnv.load(); @@ -22,8 +22,7 @@ Future loadAtClientPreference() async { ..isLocalStoreRequired = true; } -final StreamController updateThemeMode = - StreamController.broadcast(); +final StreamController updateThemeMode = StreamController.broadcast(); class MyApp extends StatefulWidget { const MyApp({Key? key}) : super(key: key); @@ -52,16 +51,14 @@ class MyAppState extends State { brightness: Brightness.light, primaryColor: const Color(0xFFf4533d), scaffoldBackgroundColor: Colors.white, - colorScheme: ThemeData.light().colorScheme.copyWith( - primary: const Color(0xFFf4533d), surface: Colors.white), + colorScheme: + ThemeData.light().colorScheme.copyWith(primary: const Color(0xFFf4533d), surface: Colors.white), ), darkTheme: ThemeData().copyWith( brightness: Brightness.dark, primaryColor: Colors.blue, scaffoldBackgroundColor: Colors.grey[850], - colorScheme: ThemeData.dark() - .colorScheme - .copyWith(primary: Colors.blue, surface: Colors.grey[850]), + colorScheme: ThemeData.dark().colorScheme.copyWith(primary: Colors.blue, surface: Colors.grey[850]), ), locale: _currentLocale, localizationsDelegates: const [ @@ -81,9 +78,7 @@ class MyAppState extends State { actions: [ IconButton( onPressed: () { - updateThemeMode.sink.add(themeMode == ThemeMode.light - ? ThemeMode.dark - : ThemeMode.light); + updateThemeMode.sink.add(themeMode == ThemeMode.light ? ThemeMode.dark : ThemeMode.light); }, icon: Icon( Theme.of(context).brightness == Brightness.light @@ -114,8 +109,15 @@ class MyAppState extends State { rootEnvironment: AtEnv.rootEnvironment, appAPIKey: AtEnv.appApiKey, theme: AtOnboardingTheme( - primaryColor: null, - + primaryColor: Colors.blue, + textTheme: const TextTheme( + titleMedium: TextStyle( + fontSize: 16, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + // ), + ), ), showPopupSharedStorage: true, ), @@ -124,10 +126,7 @@ class MyAppState extends State { switch (result?.status) { case AtOnboardingResultStatus.success: - Navigator.push( - context, - MaterialPageRoute( - builder: (_) => const HomeScreen())); + Navigator.push(context, MaterialPageRoute(builder: (_) => const HomeScreen())); break; case null: case AtOnboardingResultStatus.error: @@ -157,6 +156,15 @@ class MyAppState extends State { domain: AtEnv.rootDomain, rootEnvironment: AtEnv.rootEnvironment, appAPIKey: AtEnv.appApiKey, + theme: AtOnboardingTheme( + primaryColor: Colors.blue, + textTheme: const TextTheme( + titleMedium: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + ), + ), + ), ), ); } @@ -172,17 +180,13 @@ class MyAppState extends State { DropdownButton( onChanged: (value) { setState(() { - value == 'en' - ? _currentLocale = const Locale('en') - : _currentLocale = const Locale('fr'); + value == 'en' ? _currentLocale = const Locale('en') : _currentLocale = const Locale('fr'); }); }, value: _currentLocale.languageCode, items: const [ - DropdownMenuItem( - value: 'en', child: Text('English')), - DropdownMenuItem( - value: 'fr', child: Text('French')), + DropdownMenuItem(value: 'en', child: Text('English')), + DropdownMenuItem(value: 'fr', child: Text('French')), ], ) ], @@ -227,8 +231,7 @@ class _HomeScreenState extends State { await showModalBottomSheet( context: context, backgroundColor: Colors.transparent, - builder: (context) => - AtSignBottomSheet(atSignList: atSignList ?? []), + builder: (context) => AtSignBottomSheet(atSignList: atSignList ?? []), ); } setState(() {});