From eadcbef91b18c780cfb0921581fe9d3bfc20e9fa Mon Sep 17 00:00:00 2001 From: Srie Teja Date: Mon, 27 May 2024 15:57:08 +0530 Subject: [PATCH 01/13] fix: resolve flutter static analysis issues (beta) --- .../example/lib/main.dart | 5 +- .../at_chat_flutter/example/lib/main.dart | 4 +- .../example/lib/second_screen.dart | 2 +- .../example/lib/third_screen.dart | 2 +- .../lib/screens/chat_screen.dart | 4 +- .../at_contacts_flutter/example/lib/main.dart | 53 ++++++----- .../example/lib/second_screen.dart | 10 +- .../at_contacts_flutter/example/pubspec.yaml | 3 + .../lib/widgets/add_contacts_dialog.dart | 2 +- packages/at_contacts_flutter/pubspec.yaml | 4 +- .../example/lib/main.dart | 4 +- .../desktop_screens/desktop_bottom_sheet.dart | 8 +- .../desktop_screens/desktop_empty_group.dart | 8 +- .../desktop_screens/desktop_group_detail.dart | 4 - .../desktop_screens/desktop_group_list.dart | 10 +- .../widgets/add_contacts_group_dialog.dart | 10 +- .../remove_trusted_contact_dialog.dart | 2 +- .../at_events_flutter/example/lib/main.dart | 6 +- .../lib/models/event_member_location.dart | 8 +- .../lib/models/event_notification.dart | 10 +- .../at_follows_flutter/example/lib/main.dart | 2 +- .../example/lib/main.dart | 2 +- .../example/lib/second_screen.dart | 4 +- .../lib/widgets/share_dialog.dart | 2 +- .../at_notify_flutter/example/lib/main.dart | 2 +- .../example/lib/contact_initial.dart | 2 +- .../example/lib/main.dart | 73 ++++++++------- .../example/lib/switch_atsign.dart | 9 +- .../example/pubspec.yaml | 4 +- .../lib/at_onboarding.dart | 17 ++-- .../screen/at_onboarding_activate_screen.dart | 18 ++-- .../lib/screen/at_onboarding_home_screen.dart | 93 +------------------ .../lib/screen/at_onboarding_otp_screen.dart | 4 +- .../lib/screen/at_onboarding_pair_screen.dart | 2 +- .../lib/widgets/at_onboarding_button.dart | 12 +-- packages/at_onboarding_flutter/pubspec.yaml | 2 +- .../at_sync_ui_flutter/example/lib/main.dart | 4 +- .../at_theme_flutter/lib/src/app_theme.dart | 2 +- .../lib/src/widgets/color_card.dart | 4 +- .../lib/src/widgets/theme_mode_card.dart | 12 +-- .../lib/src/widgets/theme_setting_page.dart | 4 +- 41 files changed, 176 insertions(+), 257 deletions(-) diff --git a/packages/at_backupkey_flutter/example/lib/main.dart b/packages/at_backupkey_flutter/example/lib/main.dart index f7d61f6e4..ebef4fdb2 100644 --- a/packages/at_backupkey_flutter/example/lib/main.dart +++ b/packages/at_backupkey_flutter/example/lib/main.dart @@ -4,7 +4,6 @@ import 'package:at_client_mobile/at_client_mobile.dart'; import 'package:at_onboarding_flutter/at_onboarding_flutter.dart' show AtOnboardingConfig, AtOnboardingResultStatus, BackupKeyWidget; -// import 'package:at_utils/at_logger.dart' show AtSignLogger; import 'package:path_provider/path_provider.dart' show getApplicationSupportDirectory; import 'package:at_app_flutter/at_app_flutter.dart' show AtEnv; @@ -54,7 +53,7 @@ class _MyAppState extends State { primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), - background: Colors.white, + surface: Colors.white, ), scaffoldBackgroundColor: Colors.white, ), @@ -63,7 +62,7 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark().colorScheme.copyWith( primary: Colors.blue, - background: Colors.grey[850], + surface: Colors.grey[850], ), scaffoldBackgroundColor: Colors.grey[850], ), diff --git a/packages/at_chat_flutter/example/lib/main.dart b/packages/at_chat_flutter/example/lib/main.dart index f9567ba3c..d55d8795a 100644 --- a/packages/at_chat_flutter/example/lib/main.dart +++ b/packages/at_chat_flutter/example/lib/main.dart @@ -70,7 +70,7 @@ class _MyAppState extends State { setState(() { atClientPreference = preference; }); - if (mounted) { + if (context.mounted) { final result = await AtOnboarding.onboard( context: context, config: AtOnboardingConfig( @@ -127,7 +127,7 @@ class _MyAppState extends State { child: TextButton( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.black12), + WidgetStateProperty.all(Colors.black12), ), onPressed: () { FlutterKeychain.remove(key: '@atsign'); diff --git a/packages/at_chat_flutter/example/lib/second_screen.dart b/packages/at_chat_flutter/example/lib/second_screen.dart index 3476af9e4..0722ca552 100644 --- a/packages/at_chat_flutter/example/lib/second_screen.dart +++ b/packages/at_chat_flutter/example/lib/second_screen.dart @@ -190,7 +190,7 @@ class _SecondScreenState extends State { const SizedBox(height: 10), TextButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.black), + backgroundColor: WidgetStateProperty.all(Colors.black), ), onPressed: () { setGroupToChatWith(context); diff --git a/packages/at_chat_flutter/example/lib/third_screen.dart b/packages/at_chat_flutter/example/lib/third_screen.dart index 1e63afefc..b5b222283 100644 --- a/packages/at_chat_flutter/example/lib/third_screen.dart +++ b/packages/at_chat_flutter/example/lib/third_screen.dart @@ -28,7 +28,7 @@ class _ThirdScreenState extends State { var result = await deleteMessages(); var message = result ? 'Messages are deleted' : 'Failed to delete'; - if (mounted) { + if (context.mounted) { ScaffoldMessenger.of(context) .showSnackBar(SnackBar(content: Text(message))); } diff --git a/packages/at_chat_flutter/lib/screens/chat_screen.dart b/packages/at_chat_flutter/lib/screens/chat_screen.dart index 192aa3089..d356fc0b9 100644 --- a/packages/at_chat_flutter/lib/screens/chat_screen.dart +++ b/packages/at_chat_flutter/lib/screens/chat_screen.dart @@ -174,14 +174,14 @@ class _ChatScreenState extends State { (id) async { var result = await _chatService .deleteSelectedMessage(id); - if (mounted) { + if (context.mounted) { Navigator.of(context).pop(); } var message = result ? 'Message is deleted' : 'Failed to delete'; - if (mounted) { + if (context.mounted) { ScaffoldMessenger.of(context) .showSnackBar(SnackBar( content: diff --git a/packages/at_contacts_flutter/example/lib/main.dart b/packages/at_contacts_flutter/example/lib/main.dart index 69fc0143d..eb0e68215 100644 --- a/packages/at_contacts_flutter/example/lib/main.dart +++ b/packages/at_contacts_flutter/example/lib/main.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'package:at_contacts_flutter_example/second_screen.dart'; +import 'package:at_onboarding_flutter/at_onboarding_result.dart'; import 'package:flutter/material.dart'; import 'package:at_client_mobile/at_client_mobile.dart'; import 'package:at_onboarding_flutter/at_onboarding_flutter.dart' @@ -33,10 +34,10 @@ class MyApp extends StatefulWidget { const MyApp({Key? key}) : super(key: key); @override - _MyAppState createState() => _MyAppState(); + MyAppState createState() => MyAppState(); } -class _MyAppState extends State { +class MyAppState extends State { // * load the AtClientPreference in the background Future futurePreference = loadAtClientPreference(); AtClientPreference? atClientPreference; @@ -55,7 +56,7 @@ class _MyAppState extends State { primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), - background: Colors.white, + surface: Colors.white, ), scaffoldBackgroundColor: Colors.white, ), @@ -64,7 +65,7 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark().colorScheme.copyWith( primary: Colors.blue, - background: Colors.grey[850], + surface: Colors.grey[850], ), scaffoldBackgroundColor: Colors.grey[850], ), @@ -98,22 +99,26 @@ class _MyAppState extends State { setState(() { atClientPreference = preference; }); - final result = await AtOnboarding.onboard( - context: context, - config: AtOnboardingConfig( - atClientPreference: atClientPreference!, - domain: AtEnv.rootDomain, - rootEnvironment: AtEnv.rootEnvironment, - appAPIKey: AtEnv.appApiKey, - ), - ); - switch (result.status) { + AtOnboardingResult? result; + if (context.mounted) { + result = await AtOnboarding.onboard( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference!, + domain: AtEnv.rootDomain, + rootEnvironment: AtEnv.rootEnvironment, + appAPIKey: AtEnv.appApiKey, + ), + ); + } + switch (result?.status) { case AtOnboardingResultStatus.success: Navigator.push( context, MaterialPageRoute( builder: (_) => const SecondScreen())); break; + case null: case AtOnboardingResultStatus.error: ScaffoldMessenger.of(context).showSnackBar( const SnackBar( @@ -133,15 +138,17 @@ class _MyAppState extends State { onPressed: () async { var preference = await futurePreference; atClientPreference = preference; - AtOnboarding.reset( - context: context, - config: AtOnboardingConfig( - atClientPreference: atClientPreference!, - domain: AtEnv.rootDomain, - rootEnvironment: AtEnv.rootEnvironment, - appAPIKey: AtEnv.appApiKey, - ), - ); + if(context.mounted) { + AtOnboarding.reset( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference!, + domain: AtEnv.rootDomain, + rootEnvironment: AtEnv.rootEnvironment, + appAPIKey: AtEnv.appApiKey, + ), + ); + } }, child: const Text('Reset'), ), diff --git a/packages/at_contacts_flutter/example/lib/second_screen.dart b/packages/at_contacts_flutter/example/lib/second_screen.dart index fa815255b..cc6b412a9 100644 --- a/packages/at_contacts_flutter/example/lib/second_screen.dart +++ b/packages/at_contacts_flutter/example/lib/second_screen.dart @@ -8,10 +8,10 @@ class SecondScreen extends StatefulWidget { const SecondScreen({Key? key}) : super(key: key); @override - _SecondScreenState createState() => _SecondScreenState(); + SecondScreenState createState() => SecondScreenState(); } -class _SecondScreenState extends State { +class SecondScreenState extends State { String? activeAtSign, pickedAtSign; @override void initState() { @@ -29,7 +29,7 @@ class _SecondScreenState extends State { if (atsign[0] == '@') { return atsign; } else { - return '@' + atsign; + return '@$atsign'; } } @@ -83,7 +83,9 @@ class _SecondScreenState extends State { } pickedAtSign = ''; - Navigator.pop(context); + if(context.mounted) { + Navigator.pop(context); + } }, child: Text( 'Delete', diff --git a/packages/at_contacts_flutter/example/pubspec.yaml b/packages/at_contacts_flutter/example/pubspec.yaml index f6f98c880..7e269abca 100644 --- a/packages/at_contacts_flutter/example/pubspec.yaml +++ b/packages/at_contacts_flutter/example/pubspec.yaml @@ -32,6 +32,9 @@ dependencies: at_contacts_flutter: path: ../ at_onboarding_flutter: ^6.1.7 + at_client: ^3.0.75 + at_client_mobile: ^3.2.15 + path_provider: ^2.1.3 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. 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 e68d96f84..a1e7d356e 100644 --- a/packages/at_contacts_flutter/lib/widgets/add_contacts_dialog.dart +++ b/packages/at_contacts_flutter/lib/widgets/add_contacts_dialog.dart @@ -163,7 +163,7 @@ class _AddContactDialogState extends State { if (contactService.checkAtSign != null && contactService.checkAtSign! && response) { - if (!mounted) return; + if (!context.mounted) return; Navigator.pop(context); } }, diff --git a/packages/at_contacts_flutter/pubspec.yaml b/packages/at_contacts_flutter/pubspec.yaml index f8a5e42fe..04f822bc6 100644 --- a/packages/at_contacts_flutter/pubspec.yaml +++ b/packages/at_contacts_flutter/pubspec.yaml @@ -12,8 +12,8 @@ environment: flutter: ">=1.20.0" dependencies: - at_client: ^3.0.72 - at_client_mobile: ^3.2.12 + at_client: ^3.0.75 + at_client_mobile: ^3.2.15 at_common_flutter: ^2.0.12 at_commons: ^4.0.1 at_contact: ^3.0.8 diff --git a/packages/at_contacts_group_flutter/example/lib/main.dart b/packages/at_contacts_group_flutter/example/lib/main.dart index 6cd2c390f..a565a4c7a 100644 --- a/packages/at_contacts_group_flutter/example/lib/main.dart +++ b/packages/at_contacts_group_flutter/example/lib/main.dart @@ -52,7 +52,7 @@ class _MyAppState extends State { brightness: Brightness.light, primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( - primary: const Color(0xFFf4533d), background: Colors.white), + primary: const Color(0xFFf4533d), surface: Colors.white), scaffoldBackgroundColor: Colors.white, ), darkTheme: ThemeData().copyWith( @@ -60,7 +60,7 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark() .colorScheme - .copyWith(primary: Colors.blue, background: Colors.white), + .copyWith(primary: Colors.blue, surface: Colors.white), scaffoldBackgroundColor: Colors.grey[850], ), themeMode: themeMode, diff --git a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_bottom_sheet.dart b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_bottom_sheet.dart index eb66a1265..4ddc4f291 100644 --- a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_bottom_sheet.dart +++ b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_bottom_sheet.dart @@ -44,12 +44,12 @@ class _DesktopGroupBottomSheetState extends State { : TextButton( onPressed: () {}, style: ButtonStyle( - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) { + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) { return ColorConstants.orangeColor; }, - ), fixedSize: MaterialStateProperty.resolveWith( - (Set states) { + ), fixedSize: WidgetStateProperty.resolveWith( + (Set states) { return const Size(120, 40); }, )), diff --git a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_empty_group.dart b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_empty_group.dart index b6a4bb8cf..066cb6173 100644 --- a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_empty_group.dart +++ b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_empty_group.dart @@ -118,14 +118,14 @@ class _DesktopEmptyGroupState extends State { widget.onCreateBtnTap!(); }, style: ButtonStyle( - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) { + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) { return widget.createBtnTapped ? ColorConstants.dullText : ColorConstants.orangeColor; }, - ), fixedSize: MaterialStateProperty.resolveWith( - (Set states) { + ), fixedSize: WidgetStateProperty.resolveWith( + (Set states) { return const Size(160, 45); }, )), diff --git a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_detail.dart b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_detail.dart index 835e7de8e..0cdadf1f5 100644 --- a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_detail.dart +++ b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_detail.dart @@ -234,8 +234,6 @@ class _DesktopGroupDetailState extends State { widget.currentIndex); if (result is AtGroup) { - // ignore: todo - // TODO: Doubt widget.group = _group; if (mounted) { ScaffoldMessenger.of(context) @@ -427,8 +425,6 @@ class _DesktopGroupDetailState extends State { isDesktop: true, expandIndex: widget.currentIndex); if (result is AtGroup) { - // ignore: todo - // TODO: Doubt widget.group = _group; ScaffoldMessenger.of(context).showSnackBar(const SnackBar( content: Text( diff --git a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_list.dart b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_list.dart index 5ef48e234..40e4a132d 100644 --- a/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_list.dart +++ b/packages/at_contacts_group_flutter/lib/desktop_screens/desktop_group_list.dart @@ -111,12 +111,12 @@ class _DesktopGroupListState extends State { }); }, style: ButtonStyle( - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) { + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) { return ColorConstants.orangeColor; }, - ), fixedSize: MaterialStateProperty.resolveWith( - (Set states) { + ), fixedSize: WidgetStateProperty.resolveWith( + (Set states) { return const Size(100, 40); }, )), @@ -218,7 +218,7 @@ class _DesktopGroupListState extends State { onYesPressed: () async { var result = await GroupService().deleteGroup(group); - if(!mounted) return; + if(!context.mounted) return; if (result != null && result) { Navigator.of(context).pop(); } else { 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 af1678ae7..edf62bfd5 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 @@ -19,7 +19,7 @@ class AddContactDialog extends StatefulWidget { } class _AddContactDialogState extends State { - String atsignName = ''; + String atsign = ''; TextEditingController atSignController = TextEditingController(); @override void dispose() { @@ -67,7 +67,7 @@ class _AddContactDialogState extends State { TextFormField( autofocus: true, onChanged: (value) { - atsignName = value; + atsign = value; }, // validator: Validators.validateAdduser, decoration: InputDecoration( @@ -119,16 +119,16 @@ class _AddContactDialogState extends State { isLoading = true; }); var response = await _contactService.addAtSign( - atSign: atsignName); + atSign: atsign); var _groupService = GroupService(); - _groupService.appendNewContact(atsignName); + _groupService.appendNewContact(atsign); setState(() { isLoading = false; }); if (_contactService.checkAtSign != null && _contactService.checkAtSign! && response) { - if(!mounted) return; + if(!context.mounted) return; Navigator.pop(context); } }, diff --git a/packages/at_contacts_group_flutter/lib/widgets/remove_trusted_contact_dialog.dart b/packages/at_contacts_group_flutter/lib/widgets/remove_trusted_contact_dialog.dart index 91b883e88..d46fafc47 100644 --- a/packages/at_contacts_group_flutter/lib/widgets/remove_trusted_contact_dialog.dart +++ b/packages/at_contacts_group_flutter/lib/widgets/remove_trusted_contact_dialog.dart @@ -146,7 +146,7 @@ class _RemoveTrustedContactState extends State { ); if (result is bool && result) { - if(mounted){ + if(context.mounted){ Navigator.of(context).pop(); } } else if (result == null) { diff --git a/packages/at_events_flutter/example/lib/main.dart b/packages/at_events_flutter/example/lib/main.dart index ac18f7308..aa37b151f 100644 --- a/packages/at_events_flutter/example/lib/main.dart +++ b/packages/at_events_flutter/example/lib/main.dart @@ -22,8 +22,6 @@ Future loadAtClientPreference() async { ..hiveStoragePath = dir.path ..commitLogPath = dir.path ..isLocalStoreRequired = true - // ignore: todo - // TODO set the rest of your AtClientPreference here ; } @@ -56,7 +54,7 @@ class _MyAppState extends State { brightness: Brightness.light, primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( - primary: const Color(0xFFf4533d), background: Colors.white), + primary: const Color(0xFFf4533d), surface: Colors.white), scaffoldBackgroundColor: Colors.white, ), darkTheme: ThemeData().copyWith( @@ -64,7 +62,7 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark() .colorScheme - .copyWith(primary: Colors.blue, background: Colors.grey[850]), + .copyWith(primary: Colors.blue, surface: Colors.grey[850]), scaffoldBackgroundColor: Colors.grey[850], ), themeMode: themeMode, diff --git a/packages/at_events_flutter/lib/models/event_member_location.dart b/packages/at_events_flutter/lib/models/event_member_location.dart index 62ced6db5..265b0531d 100644 --- a/packages/at_events_flutter/lib/models/event_member_location.dart +++ b/packages/at_events_flutter/lib/models/event_member_location.dart @@ -44,12 +44,8 @@ class EventMemberLocation { 'receiver': eventMemberLocation.receiver, 'lat': eventMemberLocation.lat.toString(), 'long': eventMemberLocation.long.toString(), - 'startSharingFrom': eventMemberLocation.startSharingFrom != null - ? eventMemberLocation.startSharingFrom!.toUtc().toString() - : null, - 'shareUntil': eventMemberLocation.shareUntil != null - ? eventMemberLocation.shareUntil!.toUtc().toString() - : null, + 'startSharingFrom': eventMemberLocation.startSharingFrom?.toUtc().toString(), + 'shareUntil': eventMemberLocation.shareUntil?.toUtc().toString(), 'key': eventMemberLocation.key.toString(), }); diff --git a/packages/at_events_flutter/lib/models/event_notification.dart b/packages/at_events_flutter/lib/models/event_notification.dart index 54cca59da..71024e4bf 100644 --- a/packages/at_events_flutter/lib/models/event_notification.dart +++ b/packages/at_events_flutter/lib/models/event_notification.dart @@ -99,18 +99,14 @@ class EventNotificationModel { 'isRecurring': eventNotification.event!.isRecurring.toString(), 'date': eventNotification.event!.date.toString(), 'endDate': eventNotification.event!.endDate.toString(), - 'startTime': eventNotification.event!.startTime != null - ? eventNotification.event!.startTime!.toUtc().toString() - : null, - 'endTime': eventNotification.event!.endTime != null - ? eventNotification.event!.endTime!.toUtc().toString() - : null, + 'startTime': eventNotification.event!.startTime?.toUtc().toString(), + 'endTime': eventNotification.event!.endTime?.toUtc().toString(), 'repeatDuration': eventNotification.event!.repeatDuration.toString(), 'repeatCycle': eventNotification.event!.repeatCycle.toString(), 'occursOn': eventNotification.event!.occursOn.toString(), 'endsOn': eventNotification.event!.endsOn.toString(), 'endEventOnDate': eventNotification.event!.endEventOnDate.toString(), - 'endEventAfterOccurance': + 'endEventAfterOccurrence': eventNotification.event!.endEventAfterOccurance.toString() }) }); diff --git a/packages/at_follows_flutter/example/lib/main.dart b/packages/at_follows_flutter/example/lib/main.dart index 6701935ac..1196b71e8 100644 --- a/packages/at_follows_flutter/example/lib/main.dart +++ b/packages/at_follows_flutter/example/lib/main.dart @@ -120,7 +120,7 @@ class _MyAppState extends State { child: TextButton( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.black12), + WidgetStateProperty.all(Colors.black12), ), onPressed: () async { var _atsignsList = await KeychainUtil.getAtsignList(); diff --git a/packages/at_invitation_flutter/example/lib/main.dart b/packages/at_invitation_flutter/example/lib/main.dart index 5a9439a1b..fe7c6b745 100644 --- a/packages/at_invitation_flutter/example/lib/main.dart +++ b/packages/at_invitation_flutter/example/lib/main.dart @@ -107,7 +107,7 @@ class _MyAppState extends State { child: TextButton( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.black12), + WidgetStateProperty.all(Colors.black12), ), onPressed: () { FlutterKeychain.remove(key: '@atsign'); diff --git a/packages/at_invitation_flutter/example/lib/second_screen.dart b/packages/at_invitation_flutter/example/lib/second_screen.dart index 1c55dc78d..d8937ded5 100644 --- a/packages/at_invitation_flutter/example/lib/second_screen.dart +++ b/packages/at_invitation_flutter/example/lib/second_screen.dart @@ -71,7 +71,7 @@ class _SecondScreenState extends State { TextButton( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.black12), + WidgetStateProperty.all(Colors.black12), ), onPressed: () { shareAndInvite(context, 'welcome'); @@ -87,7 +87,7 @@ class _SecondScreenState extends State { TextButton( style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Colors.black12), + WidgetStateProperty.all(Colors.black12), ), onPressed: () { _checkForInvite(); diff --git a/packages/at_invitation_flutter/lib/widgets/share_dialog.dart b/packages/at_invitation_flutter/lib/widgets/share_dialog.dart index 60fcc02e0..9398a2c2c 100644 --- a/packages/at_invitation_flutter/lib/widgets/share_dialog.dart +++ b/packages/at_invitation_flutter/lib/widgets/share_dialog.dart @@ -222,7 +222,7 @@ class _ShareDialogState extends State { setState(() { isLoading = false; }); - if (mounted) Navigator.pop(context); + if (context.mounted) Navigator.pop(context); } }, buttonColor: diff --git a/packages/at_notify_flutter/example/lib/main.dart b/packages/at_notify_flutter/example/lib/main.dart index b257991ca..c3bc0dbf8 100644 --- a/packages/at_notify_flutter/example/lib/main.dart +++ b/packages/at_notify_flutter/example/lib/main.dart @@ -53,7 +53,7 @@ class _MyAppState extends State { primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), - background: Colors.white, + surface: Colors.white, ), scaffoldBackgroundColor: Colors.white, ), diff --git a/packages/at_onboarding_flutter/example/lib/contact_initial.dart b/packages/at_onboarding_flutter/example/lib/contact_initial.dart index db9366185..4f817ebcb 100644 --- a/packages/at_onboarding_flutter/example/lib/contact_initial.dart +++ b/packages/at_onboarding_flutter/example/lib/contact_initial.dart @@ -42,7 +42,7 @@ class ContactInitial extends StatelessWidget { class ContactInitialsColors { static Color getColor(String atsign) { if (atsign.length == 1) { - atsign = atsign + ' '; + atsign = '$atsign '; } switch (atsign[1].toUpperCase()) { case 'A': diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart index ff276bb41..a3cbe89b8 100644 --- a/packages/at_onboarding_flutter/example/lib/main.dart +++ b/packages/at_onboarding_flutter/example/lib/main.dart @@ -29,10 +29,10 @@ class MyApp extends StatefulWidget { const MyApp({Key? key}) : super(key: key); @override - _MyAppState createState() => _MyAppState(); + MyAppState createState() => MyAppState(); } -class _MyAppState extends State { +class MyAppState extends State { // * load the AtClientPreference in the background Future futurePreference = loadAtClientPreference(); AtClientPreference? atClientPreference; @@ -104,26 +104,31 @@ class _MyAppState extends State { setState(() { atClientPreference = preference; }); - final result = await AtOnboarding.onboard( - context: context, - config: AtOnboardingConfig( - atClientPreference: atClientPreference!, - domain: AtEnv.rootDomain, - rootEnvironment: AtEnv.rootEnvironment, - appAPIKey: AtEnv.appApiKey, - theme: AtOnboardingTheme( - primaryColor: null, + AtOnboardingResult? result; + if (context.mounted) { + result = await AtOnboarding.onboard( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference!, + domain: AtEnv.rootDomain, + rootEnvironment: AtEnv.rootEnvironment, + appAPIKey: AtEnv.appApiKey, + theme: AtOnboardingTheme( + primaryColor: null, + ), + showPopupSharedStorage: true, ), - showPopupSharedStorage: true, - ), - ); - switch (result.status) { + ); + } + + switch (result?.status) { case AtOnboardingResultStatus.success: Navigator.push( context, MaterialPageRoute( builder: (_) => const HomeScreen())); break; + case null: case AtOnboardingResultStatus.error: ScaffoldMessenger.of(context).showSnackBar( const SnackBar( @@ -143,15 +148,17 @@ class _MyAppState extends State { onPressed: () async { var preference = await futurePreference; atClientPreference = preference; - AtOnboarding.reset( - context: context, - config: AtOnboardingConfig( - atClientPreference: atClientPreference!, - domain: AtEnv.rootDomain, - rootEnvironment: AtEnv.rootEnvironment, - appAPIKey: AtEnv.appApiKey, - ), - ); + if (context.mounted) { + AtOnboarding.reset( + context: context, + config: AtOnboardingConfig( + atClientPreference: atClientPreference!, + domain: AtEnv.rootDomain, + rootEnvironment: AtEnv.rootEnvironment, + appAPIKey: AtEnv.appApiKey, + ), + ); + } }, child: const Text('Reset'), ), @@ -172,9 +179,9 @@ class _MyAppState extends State { value: _currentLocale.languageCode, items: const [ DropdownMenuItem( - child: Text('English'), value: 'en'), + value: 'en', child: Text('English')), DropdownMenuItem( - child: Text('French'), value: 'fr'), + value: 'fr', child: Text('French')), ], ) ], @@ -215,12 +222,14 @@ class _HomeScreenState extends State { tooltip: 'Switch atSign', onPressed: () async { var atSignList = await KeychainUtil.getAtsignList(); - await showModalBottomSheet( - context: context, - backgroundColor: Colors.transparent, - builder: (context) => - AtSignBottomSheet(atSignList: atSignList ?? []), - ); + if (context.mounted) { + await showModalBottomSheet( + context: context, + backgroundColor: Colors.transparent, + builder: (context) => + AtSignBottomSheet(atSignList: atSignList ?? []), + ); + } setState(() {}); }, ), diff --git a/packages/at_onboarding_flutter/example/lib/switch_atsign.dart b/packages/at_onboarding_flutter/example/lib/switch_atsign.dart index 96f1edda8..c4b319e0a 100644 --- a/packages/at_onboarding_flutter/example/lib/switch_atsign.dart +++ b/packages/at_onboarding_flutter/example/lib/switch_atsign.dart @@ -18,10 +18,10 @@ class AtSignBottomSheet extends StatefulWidget { : super(key: key); @override - _AtSignBottomSheetState createState() => _AtSignBottomSheetState(); + AtSignBottomSheetState createState() => AtSignBottomSheetState(); } -class _AtSignBottomSheetState extends State { +class AtSignBottomSheetState extends State { // var atClientManager = AtClientManager.getInstance(); bool isLoading = false; late AtClientPreference atClientPreferenceLocal; @@ -63,7 +63,7 @@ class _AtSignBottomSheetState extends State { final result = await AtOnboarding.changePrimaryAtsign( atsign: widget.atSignList[index]); - if (result) { + if (result && context.mounted) { await AtOnboarding.onboard( context: context, config: AtOnboardingConfig( @@ -74,11 +74,10 @@ class _AtSignBottomSheetState extends State { appAPIKey: AtEnv.appApiKey, ), ); - if (mounted) { setState(() { isLoading = false; }); - } + if(!context.mounted) return; Navigator.pop(context); } else { //Failure diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml index 781d137f1..6e51d3f5f 100644 --- a/packages/at_onboarding_flutter/example/pubspec.yaml +++ b/packages/at_onboarding_flutter/example/pubspec.yaml @@ -29,12 +29,14 @@ environment: dependencies: at_app_flutter: ^5.2.0 at_backupkey_flutter: ^4.0.10 + at_onboarding_flutter: ^6.1.7 cupertino_icons: ^1.0.6 flutter: sdk: flutter flutter_localizations: sdk: flutter intl: ^0.17.0 + path_provider: ^2.1.3 dev_dependencies: flutter_lints: ^2.0.3 @@ -43,8 +45,6 @@ dev_dependencies: dependency_overrides: intl: ^0.17.0 - at_onboarding_flutter: - path: ../ # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart index 38b7a6fb0..7ec312245 100644 --- a/packages/at_onboarding_flutter/lib/at_onboarding.dart +++ b/packages/at_onboarding_flutter/lib/at_onboarding.dart @@ -54,13 +54,16 @@ class AtOnboarding { //Check if existing an atsign => return onboard success // ignore: use_build_context_synchronously - final result = await showDialog( - context: context, - barrierDismissible: false, - builder: (_) => AtOnboardingStartScreen( - config: config, - ), - ); + AtOnboardingResult? result; + if (context.mounted) { + result = await showDialog( + context: context, + barrierDismissible: false, + builder: (_) => AtOnboardingStartScreen( + config: config, + ), + ); + } if (result is AtOnboardingResult) { return result; 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..fd0e79238 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 @@ -142,19 +142,21 @@ class _AtOnboardingActivateScreenState data = response.body; data = jsonDecode(data); - // ignore: use_build_context_synchronously - final result = await AtOnboardingOTPScreen.push( - context: context, - atSign: atsign ?? (widget.atSign ?? ''), - hideReferences: false, - config: widget.config, - ); + AtOnboardingOTPResult? result; + if(context.mounted) { + result = await AtOnboardingOTPScreen.push( + context: context, + atSign: atsign ?? (widget.atSign ?? ''), + hideReferences: false, + config: widget.config, + ); + } if (result != null) { String? secret = result.secret?.split(':').last ?? ''; _processSharedSecret(atsign: result.atSign, secret: secret); } else { - if (!mounted) return; + if (!context.mounted) return; Navigator.pop(context, AtOnboardingResult.cancelled()); } } else { 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 51083c983..cf8c471c1 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 @@ -10,7 +10,6 @@ import 'package:at_onboarding_flutter/screen/at_onboarding_activate_screen.dart' import 'package:at_onboarding_flutter/screen/at_onboarding_backup_screen.dart'; import 'package:at_onboarding_flutter/screen/at_onboarding_generate_screen.dart'; import 'package:at_onboarding_flutter/screen/at_onboarding_input_atsign_screen.dart'; -import 'package:at_onboarding_flutter/screen/at_onboarding_qrcode_screen.dart'; import 'package:at_onboarding_flutter/screen/at_onboarding_reference_screen.dart'; import 'package:at_onboarding_flutter/services/at_onboarding_config.dart'; import 'package:at_onboarding_flutter/services/at_onboarding_tutorial_service.dart'; @@ -512,26 +511,6 @@ class _AtOnboardingHomeScreenState extends State { } } - Future _desktopQRFilePicker() async { - try { - // ignore: omit_local_variable_types, prefer_const_constructors - XTypeGroup typeGroup = XTypeGroup( - label: 'images', - // ignore: prefer_const_literals_to_create_immutables - extensions: ['png'], - ); - List files = - await openFiles(acceptedTypeGroups: [typeGroup]); - if (files.isEmpty) { - return null; - } - XFile file = files[0]; - return file.path; - } catch (e) { - _logger.severe('Error in desktopImagePicker $e'); - return null; - } - } Future _desktopKeyPicker() async { try { @@ -815,7 +794,7 @@ class _AtOnboardingHomeScreenState extends State { ); if ((result ?? '').isNotEmpty) { - if (!mounted) return; + if (!context.mounted) return; final result2 = await Navigator.push( context, MaterialPageRoute( @@ -844,21 +823,6 @@ class _AtOnboardingHomeScreenState extends State { } } - void _showQRCodeScreen({ - required BuildContext context, - }) async { - final result = await Navigator.push( - context, - MaterialPageRoute( - builder: (_) => AtOnboardingQRCodeScreen( - config: widget.config, - ), - ), - ); - if (result is AtOnboardingQRCodeResult) { - _processSharedSecret(result.atSign, result.secret); - } - } Future _processSharedSecret(String atsign, String secret) async { dynamic authResponse; @@ -952,61 +916,6 @@ class _AtOnboardingHomeScreenState extends State { return authResponse; } - Future _uploadQRFileForDesktop() async { - try { - String? aesKey, atsign; - setState(() { - }); - String? path = await _desktopQRFilePicker(); - if (path == null) { - setState(() { - }); - return; - } - - File selectedFile = File(path); - - int length = selectedFile.lengthSync(); - if (length < 10) { - await showErrorDialog( - AtOnboardingLocalizations.current.error_incorrect_QRFile, - ); - return; - } - - img.Image image = img.decodePng(selectedFile.readAsBytesSync())!; - - LuminanceSource source = RGBLuminanceSource(image.width, image.height, - image.getBytes(order: img.ChannelOrder.abgr).buffer.asInt32List()); - BinaryBitmap bitmap = BinaryBitmap(HybridBinarizer(source)); - - QRCodeReader reader = QRCodeReader(); - Result result = reader.decode(bitmap); - List params = result.text.replaceAll('"', '').split(':'); - atsign = params[0]; - aesKey = params[1]; - - if (aesKey.isEmpty && atsign.isEmpty) { - await showErrorDialog( - AtOnboardingLocalizations.current.error_incorrect_QRFile, - ); - setState(() { - }); - return; - } - _processSharedSecret(atsign, aesKey); - // await processAESKey(atsign, aesKey, false); - setState(() { - }); - } catch (error) { - _logger.warning(error); - setState(() { - }); - await showErrorDialog( - AtOnboardingLocalizations.current.error_process_file, - ); - } - } Future _showAlertDialog(dynamic errorMessage, {String? title}) async { String? messageString = 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..0214bbff8 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 @@ -355,7 +355,7 @@ class _AtOnboardingOTPScreenState extends State { cramSecret = data['cramkey']; } else { String errorMessage = data['message']; - if (!mounted) return ''; + if (!context.mounted) return ''; ScaffoldMessenger.of(context).showSnackBar( SnackBar( backgroundColor: Colors.red, @@ -367,7 +367,7 @@ class _AtOnboardingOTPScreenState extends State { data = response.body; data = jsonDecode(data); String errorMessage = data['message']; - if (!mounted) return ''; + if (!context.mounted) return ''; ScaffoldMessenger.of(context).showSnackBar( SnackBar( backgroundColor: Colors.red, 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..8e9fd74d4 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 @@ -255,7 +255,7 @@ class _AtOnboardingPairScreenState extends State { if (errorMessage.contains('maximum number of free atSigns')) { await showlimitDialog(); } else { - if (!mounted) return status; + if (!context.mounted) return status; AtOnboardingDialog.showError(context: context, message: errorMessage); } } diff --git a/packages/at_onboarding_flutter/lib/widgets/at_onboarding_button.dart b/packages/at_onboarding_flutter/lib/widgets/at_onboarding_button.dart index e744d7f6c..05dba8bde 100644 --- a/packages/at_onboarding_flutter/lib/widgets/at_onboarding_button.dart +++ b/packages/at_onboarding_flutter/lib/widgets/at_onboarding_button.dart @@ -56,10 +56,10 @@ class AtOnboardingPrimaryButton extends AtOnboardingButton { child: TextButton( onPressed: isLoading ? null : onPressed, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( backgroundColor ?? themeData.primaryColor), - foregroundColor: MaterialStateProperty.all(Colors.white), - shape: MaterialStateProperty.all( + foregroundColor: WidgetStateProperty.all(Colors.white), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(borderRadius ?? 4), side: BorderSide( @@ -104,11 +104,11 @@ class AtOnboardingSecondaryButton extends AtOnboardingButton { child: TextButton( onPressed: isLoading ? null : onPressed, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( backgroundColor ?? Colors.transparent), foregroundColor: - MaterialStateProperty.all(themeData.primaryColor), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(themeData.primaryColor), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(borderRadius ?? 4), side: BorderSide( diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml index 0972cddc7..4102de780 100644 --- a/packages/at_onboarding_flutter/pubspec.yaml +++ b/packages/at_onboarding_flutter/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: archive: ^3.4.10 at_backupkey_flutter: ^4.0.12 at_client: ^3.0.72 - at_client_mobile: ^3.2.14 + at_client_mobile: ^3.2.15 at_commons: ^4.0.1 at_server_status: ^1.0.4 at_sync_ui_flutter: ^1.0.10 diff --git a/packages/at_sync_ui_flutter/example/lib/main.dart b/packages/at_sync_ui_flutter/example/lib/main.dart index beebc34f2..e855bb3b4 100644 --- a/packages/at_sync_ui_flutter/example/lib/main.dart +++ b/packages/at_sync_ui_flutter/example/lib/main.dart @@ -53,7 +53,7 @@ class _MyAppState extends State { primaryColor: const Color(0xFFf4533d), colorScheme: ThemeData.light().colorScheme.copyWith( primary: const Color(0xFFf4533d), - background: Colors.white, + surface: Colors.white, ), scaffoldBackgroundColor: Colors.white, ), @@ -62,7 +62,7 @@ class _MyAppState extends State { primaryColor: Colors.blue, colorScheme: ThemeData.dark().colorScheme.copyWith( primary: Colors.blue, - background: Colors.grey[850], + surface: Colors.grey[850], ), scaffoldBackgroundColor: Colors.grey[850], ), diff --git a/packages/at_theme_flutter/lib/src/app_theme.dart b/packages/at_theme_flutter/lib/src/app_theme.dart index 3c12e1cf5..cc7b31015 100644 --- a/packages/at_theme_flutter/lib/src/app_theme.dart +++ b/packages/at_theme_flutter/lib/src/app_theme.dart @@ -72,7 +72,7 @@ class AppTheme { colorScheme: ThemeData().colorScheme.copyWith( secondary: accentColor, brightness: brightness, - background: backgroundColor), + surface: backgroundColor), ); } diff --git a/packages/at_theme_flutter/lib/src/widgets/color_card.dart b/packages/at_theme_flutter/lib/src/widgets/color_card.dart index bca0b7aef..95fd5065f 100644 --- a/packages/at_theme_flutter/lib/src/widgets/color_card.dart +++ b/packages/at_theme_flutter/lib/src/widgets/color_card.dart @@ -18,12 +18,12 @@ class ColorCard extends StatelessWidget { return ElevatedButton( onPressed: onPressed, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), ), - backgroundColor: MaterialStateProperty.all(color), + backgroundColor: WidgetStateProperty.all(color), ), child: Visibility( visible: isSelected, diff --git a/packages/at_theme_flutter/lib/src/widgets/theme_mode_card.dart b/packages/at_theme_flutter/lib/src/widgets/theme_mode_card.dart index 1e71c15b0..545864d5e 100644 --- a/packages/at_theme_flutter/lib/src/widgets/theme_mode_card.dart +++ b/packages/at_theme_flutter/lib/src/widgets/theme_mode_card.dart @@ -25,14 +25,14 @@ class ThemeModeCard extends StatelessWidget { return ElevatedButton( onPressed: onPressed, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), ), backgroundColor: - MaterialStateProperty.all(theme.backgroundColor), - padding: MaterialStateProperty.all(EdgeInsets.zero), + WidgetStateProperty.all(theme.backgroundColor), + padding: WidgetStateProperty.all(EdgeInsets.zero), ), child: SizedBox( width: double.infinity, @@ -60,14 +60,14 @@ class ThemeModeCard extends StatelessWidget { child: ElevatedButton( onPressed: null, style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(16.0), ), ), backgroundColor: - MaterialStateProperty.all(primaryColor), - padding: MaterialStateProperty.all(EdgeInsets.zero), + WidgetStateProperty.all(primaryColor), + padding: WidgetStateProperty.all(EdgeInsets.zero), ), child: Container(), ), diff --git a/packages/at_theme_flutter/lib/src/widgets/theme_setting_page.dart b/packages/at_theme_flutter/lib/src/widgets/theme_setting_page.dart index f901ca6fd..7a052d4ca 100644 --- a/packages/at_theme_flutter/lib/src/widgets/theme_setting_page.dart +++ b/packages/at_theme_flutter/lib/src/widgets/theme_setting_page.dart @@ -138,7 +138,7 @@ class _ThemeSettingPageState extends State { widget.onPreviewPressed?.call(_appTheme); }, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( _appTheme.primaryColor), ), child: Container( @@ -156,7 +156,7 @@ class _ThemeSettingPageState extends State { ElevatedButton( onPressed: applyTheme, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( _appTheme.primaryColor), ), child: Container( From 54615a667804b03b151381d6c6545c531febcbbb Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Tue, 28 May 2024 08:01:50 -0400 Subject: [PATCH 02/13] chore: dependency overrides added to showcaseview until the packages is updated. --- packages/at_sync_ui_flutter/example/pubspec.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/at_sync_ui_flutter/example/pubspec.yaml b/packages/at_sync_ui_flutter/example/pubspec.yaml index d30db53dc..92a4da993 100644 --- a/packages/at_sync_ui_flutter/example/pubspec.yaml +++ b/packages/at_sync_ui_flutter/example/pubspec.yaml @@ -35,11 +35,21 @@ dependencies: cupertino_icons: ^1.0.6 flutter: sdk: flutter - flutter_colorpicker: ^1.0.3 + flutter_colorpicker: ^1.1.0 dependency_overrides: at_sync_ui_flutter: path: ../ + showcaseview: + git: + url: https://github.com/chandrabezzo/flutter_showcaseview + ref: bugfix/text-theme/removed-3.22 + +# dependency_overrides: +# at_sync_ui_flutter: +# path: ../ + + dev_dependencies: # The "flutter_lints" package below contains a set of recommended lints to From 454712d27c471a91bc026e1f59fd68bc2d79d50e Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Thu, 30 May 2024 10:44:38 -0400 Subject: [PATCH 03/13] chore: showcaseview dependency_override removed --- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../at_onboarding_flutter/example/ios/Podfile | 2 +- .../example/ios/Podfile.lock | 18 ++++++------- .../ios/Runner.xcodeproj/project.pbxproj | 26 ++++++++++++++++--- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../at_sync_ui_flutter/example/ios/Podfile | 2 +- .../example/ios/Podfile.lock | 18 ++++++------- .../ios/Runner.xcodeproj/project.pbxproj | 26 ++++++++++++++++--- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../at_sync_ui_flutter/example/pubspec.yaml | 8 ------ .../ios/Flutter/AppFrameworkInfo.plist | 2 +- packages/at_theme_flutter/example/ios/Podfile | 2 +- .../at_theme_flutter/example/ios/Podfile.lock | 22 ++++++++-------- .../ios/Runner.xcodeproj/project.pbxproj | 26 ++++++++++++++++--- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../at_theme_flutter/example/pubspec.yaml | 6 +++++ 18 files changed, 111 insertions(+), 59 deletions(-) diff --git a/packages/at_onboarding_flutter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/at_onboarding_flutter/example/ios/Flutter/AppFrameworkInfo.plist index 9625e105d..7c5696400 100644 --- a/packages/at_onboarding_flutter/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/at_onboarding_flutter/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/at_onboarding_flutter/example/ios/Podfile b/packages/at_onboarding_flutter/example/ios/Podfile index 313ea4a15..2c068c404 100644 --- a/packages/at_onboarding_flutter/example/ios/Podfile +++ b/packages/at_onboarding_flutter/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/at_onboarding_flutter/example/ios/Podfile.lock b/packages/at_onboarding_flutter/example/ios/Podfile.lock index e5fcedfbe..54aee351a 100644 --- a/packages/at_onboarding_flutter/example/ios/Podfile.lock +++ b/packages/at_onboarding_flutter/example/ios/Podfile.lock @@ -54,7 +54,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -145,21 +145,21 @@ SPEC CHECKSUMS: DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + file_selector_ios: b6a6c6667913d571590169ef946afbafe3b52688 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 - url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b - webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 -PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d +PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 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 0049911a6..1e33aa9d0 100644 --- a/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_onboarding_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -139,6 +139,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 7011AA49A0F1AE50C81A8692 /* [CP] Embed Pods Frameworks */, + 24D5BD94A14C467809EDDC94 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -155,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -197,6 +198,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 24D5BD94A14C467809EDDC94 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -342,7 +360,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; @@ -420,7 +438,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 +487,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; 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 a6b826db2..5e31d3d34 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 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/at_sync_ui_flutter/example/ios/Podfile b/packages/at_sync_ui_flutter/example/ios/Podfile index 88359b225..279576f38 100644 --- a/packages/at_sync_ui_flutter/example/ios/Podfile +++ b/packages/at_sync_ui_flutter/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/at_sync_ui_flutter/example/ios/Podfile.lock b/packages/at_sync_ui_flutter/example/ios/Podfile.lock index 4ca20b1d7..08291bfa7 100644 --- a/packages/at_sync_ui_flutter/example/ios/Podfile.lock +++ b/packages/at_sync_ui_flutter/example/ios/Podfile.lock @@ -145,21 +145,21 @@ SPEC CHECKSUMS: DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - file_selector_ios: b6a6c6667913d571590169ef946afbafe3b52688 - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + file_selector_ios: f0670c1064a8c8450e38145d8043160105d0b97c + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c - permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 - shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 - webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4 + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 -PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 +PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 diff --git a/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/project.pbxproj index a421b1e37..82333d5f7 100644 --- a/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -140,6 +140,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 5A1CCA328DB9D56081A0F7F6 /* [CP] Embed Pods Frameworks */, + 27CFCA4EDEBB989A73BC738A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -156,7 +157,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -198,6 +199,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 27CFCA4EDEBB989A73BC738A /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -343,7 +361,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; @@ -420,7 +438,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 +487,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; diff --git a/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6e1..e67b2808a 100644 --- a/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_sync_ui_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/at_theme_flutter/example/ios/Podfile b/packages/at_theme_flutter/example/ios/Podfile index 88359b225..279576f38 100644 --- a/packages/at_theme_flutter/example/ios/Podfile +++ b/packages/at_theme_flutter/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/at_theme_flutter/example/ios/Podfile.lock b/packages/at_theme_flutter/example/ios/Podfile.lock index b83d94aa7..a2bb70f9c 100644 --- a/packages/at_theme_flutter/example/ios/Podfile.lock +++ b/packages/at_theme_flutter/example/ios/Podfile.lock @@ -57,7 +57,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -153,23 +153,23 @@ SPEC CHECKSUMS: DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + file_selector_ios: f0670c1064a8c8450e38145d8043160105d0b97c + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 - fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c + fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b - webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe + webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 -PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 +PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 diff --git a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj index ec247ac50..803c338f7 100644 --- a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -139,6 +139,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 4B92C977563C98AEE05D64DE /* [CP] Embed Pods Frameworks */, + 0B7D2807DEBF5A18385533F0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -155,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -197,6 +198,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0B7D2807DEBF5A18385533F0 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -342,7 +360,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; @@ -423,7 +441,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; @@ -472,7 +490,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; diff --git a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6e1..e67b2808a 100644 --- a/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/at_theme_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 3 Jun 2024 17:47:08 +0530 Subject: [PATCH 04/13] fix: update implementation to replace now removed BuilderWidget in showcaseview --- .../at_backupkey_flutter/lib/widgets/backup_key_widget.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart index 09b2199a4..63fc89920 100644 --- a/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart +++ b/packages/at_backupkey_flutter/lib/widgets/backup_key_widget.dart @@ -137,7 +137,7 @@ class BackupKeyWidget extends StatelessWidget { showDialog( context: context, builder: (BuildContext ctxt) { - return ShowCaseWidget(builder: Builder(builder: (context) { + return ShowCaseWidget(builder: (context) { myContext = context; return Dialog( child: Container( @@ -237,7 +237,7 @@ class BackupKeyWidget extends StatelessWidget { ), ), ); - })); + }); }); } From 7aeeb7bee360ae431041bde748cd482684098781 Mon Sep 17 00:00:00 2001 From: Curtly Critchlow Date: Mon, 3 Jun 2024 09:02:35 -0400 Subject: [PATCH 05/13] chore: showcaseview updated to 3.0.0 --- packages/at_backupkey_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_backupkey_flutter/pubspec.yaml b/packages/at_backupkey_flutter/pubspec.yaml index c12f92d74..08ec5b382 100644 --- a/packages/at_backupkey_flutter/pubspec.yaml +++ b/packages/at_backupkey_flutter/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: at_file_saver: ^0.1.2 at_utils: ^3.0.15 at_client_mobile: ^3.2.12 - showcaseview: ^2.0.3 + showcaseview: ^3.0.0 device_info_plus: ^9.0.3 # desktop - dependencies file_selector: ^1.0.1 From 046f1df064a9d3f2dd0ad4f3e801ffc7e0c17132 Mon Sep 17 00:00:00 2001 From: Srie Teja Date: Wed, 5 Jun 2024 16:38:44 +0530 Subject: [PATCH 06/13] fix: [android] set android:exported="true" for required apps --- .../example/android/app/src/main/AndroidManifest.xml | 1 + .../example/android/app/src/main/AndroidManifest.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/at_chat_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/at_chat_flutter/example/android/app/src/main/AndroidManifest.xml index c466ba115..dac80112d 100644 --- a/packages/at_chat_flutter/example/android/app/src/main/AndroidManifest.xml +++ b/packages/at_chat_flutter/example/android/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ android:icon="@mipmap/ic_launcher">