diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e8667fd..003ea95 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -38,45 +38,45 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/Analytics (11.0.0): + - Firebase/Analytics (11.2.0): - Firebase/Core - - Firebase/Core (11.0.0): + - Firebase/Core (11.2.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 11.0.0) - - Firebase/CoreOnly (11.0.0): - - FirebaseCore (= 11.0.0) - - Firebase/Crashlytics (11.0.0): + - FirebaseAnalytics (~> 11.2.0) + - Firebase/CoreOnly (11.2.0): + - FirebaseCore (= 11.2.0) + - Firebase/Crashlytics (11.2.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 11.0.0) - - Firebase/Messaging (11.0.0): + - FirebaseCrashlytics (~> 11.2.0) + - Firebase/Messaging (11.2.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.0.0) - - Firebase/Performance (11.0.0): + - FirebaseMessaging (~> 11.2.0) + - Firebase/Performance (11.2.0): - Firebase/CoreOnly - - FirebasePerformance (~> 11.0.0) - - firebase_analytics (11.3.2): - - Firebase/Analytics (= 11.0.0) + - FirebasePerformance (~> 11.2.0) + - firebase_analytics (11.3.3): + - Firebase/Analytics (= 11.2.0) - firebase_core - Flutter - - firebase_core (3.5.0): - - Firebase/CoreOnly (= 11.0.0) + - firebase_core (3.6.0): + - Firebase/CoreOnly (= 11.2.0) - Flutter - - firebase_crashlytics (4.1.2): - - Firebase/Crashlytics (= 11.0.0) + - firebase_crashlytics (4.1.3): + - Firebase/Crashlytics (= 11.2.0) - firebase_core - Flutter - - firebase_messaging (15.1.2): - - Firebase/Messaging (= 11.0.0) + - firebase_messaging (15.1.3): + - Firebase/Messaging (= 11.2.0) - firebase_core - Flutter - - firebase_performance (0.10.0-7): - - Firebase/Performance (= 11.0.0) + - firebase_performance (0.10.0-8): + - Firebase/Performance (= 11.2.0) - firebase_core - Flutter - - FirebaseABTesting (11.2.0): + - FirebaseABTesting (11.3.0): - FirebaseCore (~> 11.0) - - FirebaseAnalytics (11.0.0): - - FirebaseAnalytics/AdIdSupport (= 11.0.0) + - FirebaseAnalytics (11.2.0): + - FirebaseAnalytics/AdIdSupport (= 11.2.0) - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) @@ -84,24 +84,24 @@ PODS: - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.0.0): + - FirebaseAnalytics/AdIdSupport (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.0.0) + - GoogleAppMeasurement (= 11.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseCore (11.0.0): + - FirebaseCore (11.2.0): - FirebaseCoreInternal (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.2.0): + - FirebaseCoreExtension (11.3.0): - FirebaseCore (~> 11.0) - - FirebaseCoreInternal (11.2.0): + - FirebaseCoreInternal (11.3.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseCrashlytics (11.0.0): + - FirebaseCrashlytics (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) @@ -110,12 +110,12 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.2.0): + - FirebaseInstallations (11.3.0): - FirebaseCore (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.0.0): + - FirebaseMessaging (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) @@ -124,7 +124,7 @@ PODS: - GoogleUtilities/Reachability (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - FirebasePerformance (11.0.0): + - FirebasePerformance (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfig (~> 11.0) @@ -134,7 +134,7 @@ PODS: - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfig (11.2.0): + - FirebaseRemoteConfig (11.3.0): - FirebaseABTesting (~> 11.0) - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) @@ -142,8 +142,8 @@ PODS: - FirebaseSharedSwift (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.2.0) - - FirebaseSessions (11.2.0): + - FirebaseRemoteConfigInterop (11.3.0) + - FirebaseSessions (11.3.0): - FirebaseCore (~> 11.0) - FirebaseCoreExtension (~> 11.0) - FirebaseInstallations (~> 11.0) @@ -152,7 +152,7 @@ PODS: - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (11.2.0) + - FirebaseSharedSwift (11.3.0) - Flutter (1.0.0) - flutter_app_update (0.0.1): - Flutter @@ -172,21 +172,21 @@ PODS: - gal (1.0.0): - Flutter - FlutterMacOS - - GoogleAppMeasurement (11.0.0): - - GoogleAppMeasurement/AdIdSupport (= 11.0.0) + - GoogleAppMeasurement (11.2.0): + - GoogleAppMeasurement/AdIdSupport (= 11.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.0.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.0.0) + - GoogleAppMeasurement/AdIdSupport (11.2.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.0.0): + - GoogleAppMeasurement/WithoutAdIdSupport (11.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) @@ -454,25 +454,25 @@ SPEC CHECKSUMS: DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 - Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9 - firebase_analytics: 4fd10182fd08bb8358f26ac8aca8dad7b6d0f592 - firebase_core: 2ec6b789859c7c24766344ec71fdf78639402d56 - firebase_crashlytics: 60630a0f91ee432275fa1660fd8593079761448a - firebase_messaging: a18e1e02b2e8e69097c8173e0c851be223b21c50 - firebase_performance: 12d45fdf120992fa879d990929bf73d4a5ced053 - FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1 - FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a - FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 - FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de - FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5 - FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b - FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a - FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 - FirebasePerformance: efdc02bacb1b4710588c9f867011605c081cdf79 - FirebaseRemoteConfig: fca0b2d017fc1de52b28a4e5bcf2007c1a840457 - FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db - FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6 - FirebaseSharedSwift: 7a0d78d155ede78407f0fdc89fbc914014c7c540 + Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c + firebase_analytics: fbc57838bdb94eef1e0ff504f127d974ff2981ad + firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af + firebase_crashlytics: 37d104d457b51760b48504a93a12b3bf70995d77 + firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38 + firebase_performance: 26ad47755d3e8d7b04b9bb36bdfbf1cec8d8dfcc + FirebaseABTesting: c4559fcd2eba9f6bdaf0599e2c37ded01c343e4c + FirebaseAnalytics: c36efd5710c60c17558650fa58c2066eca7e9265 + FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da + FirebaseCoreExtension: 30bb063476ef66cd46925243d64ad8b2c8ac3264 + FirebaseCoreInternal: ac26d09a70c730e497936430af4e60fb0c68ec4e + FirebaseCrashlytics: cfc69af5b53565dc6a5e563788809b5778ac4eac + FirebaseInstallations: 58cf94dabf1e2bb2fa87725a9be5c2249171cda0 + FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152 + FirebasePerformance: c39138c0700b8ef6040f0b80b5707320808e2862 + FirebaseRemoteConfig: 5be2ca4f9870d475b39214210955fdaeecf7e5ca + FirebaseRemoteConfigInterop: c3a5c31b3c22079f41ba1dc645df889d9ce38cb9 + FirebaseSessions: 655ff17f3cc1a635cbdc2d69b953878001f9e25b + FirebaseSharedSwift: d39c2ad64a11a8d936ce25a42b00df47078bb59c Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac @@ -482,7 +482,7 @@ SPEC CHECKSUMS: flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f gal: 61e868295d28fe67ffa297fae6dacebf56fd53e1 - GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de + GoogleAppMeasurement: 76d4f8b36b03bd8381fa9a7fe2cc7f99c0a2e93a GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf diff --git a/lib/router.dart b/lib/router.dart index 2f5d54e..3812a6c 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -178,6 +178,7 @@ abstract class AppRouter { final arguments = state.extra as ChannelDetailArguments; return TitleShell( state: state, + isResponsive: true, child: ChannelDetailScreen( channel: arguments.channel, profile: arguments.profile, diff --git a/lib/screens/account/profile_edit.dart b/lib/screens/account/profile_edit.dart index 0b1711b..62654a5 100644 --- a/lib/screens/account/profile_edit.dart +++ b/lib/screens/account/profile_edit.dart @@ -12,7 +12,6 @@ import 'package:solian/providers/auth.dart'; import 'package:solian/providers/content/attachment.dart'; import 'package:solian/services.dart'; import 'package:solian/widgets/account/account_avatar.dart'; -import 'package:solian/widgets/root_container.dart'; class PersonalizeScreen extends StatefulWidget { const PersonalizeScreen({super.key}); diff --git a/lib/screens/account/profile_page.dart b/lib/screens/account/profile_page.dart index f4b7c14..78f2c1f 100644 --- a/lib/screens/account/profile_page.dart +++ b/lib/screens/account/profile_page.dart @@ -231,7 +231,11 @@ class _AccountProfilePageState extends State { @override Widget build(BuildContext context) { if (_isBusy || _userinfo == null) { - return const Center(child: CircularProgressIndicator()); + return RootContainer( + child: const Center( + child: CircularProgressIndicator(), + ), + ); } return RootContainer( @@ -250,7 +254,11 @@ class _AccountProfilePageState extends State { height: 56, child: Row( children: [ - AppBarLeadingButton.adaptive(context) ?? const Gap(8), + AppBarLeadingButton.adaptive( + context, + forceBack: true, + ) ?? + const Gap(8), const Gap(8), if (_userinfo != null) AccountAvatar(content: _userinfo!.avatar, radius: 16), diff --git a/lib/screens/auth/signin.dart b/lib/screens/auth/signin.dart index 2ff0db1..4794a49 100644 --- a/lib/screens/auth/signin.dart +++ b/lib/screens/auth/signin.dart @@ -11,7 +11,6 @@ import 'package:solian/providers/content/realm.dart'; import 'package:solian/providers/relation.dart'; import 'package:solian/providers/websocket.dart'; import 'package:solian/services.dart'; -import 'package:solian/widgets/root_container.dart'; import 'package:solian/widgets/sized_container.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/screens/channel/channel_chat.dart b/lib/screens/channel/channel_chat.dart index 9aed9f3..03ea8af 100644 --- a/lib/screens/channel/channel_chat.dart +++ b/lib/screens/channel/channel_chat.dart @@ -218,7 +218,7 @@ class _ChannelChatScreenState extends State ); } - return RootContainer( + return ResponsiveRootContainer( child: Scaffold( appBar: AppBar( leading: AppBarLeadingButton.adaptive(context), diff --git a/lib/screens/channel/channel_organize.dart b/lib/screens/channel/channel_organize.dart index f7ce3a1..dad97d5 100644 --- a/lib/screens/channel/channel_organize.dart +++ b/lib/screens/channel/channel_organize.dart @@ -115,7 +115,7 @@ class _ChannelOrganizeScreenState extends State { ), ]; - return RootContainer( + return ResponsiveRootContainer( child: Scaffold( appBar: AppBar( title: AppBarTitle('channelOrganizing'.tr), diff --git a/lib/screens/chat.dart b/lib/screens/chat.dart index 8b0d226..f7a5500 100644 --- a/lib/screens/chat.dart +++ b/lib/screens/chat.dart @@ -27,7 +27,7 @@ class ChatScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return const RootContainer( + return const ResponsiveRootContainer( child: ChatList(), ); } @@ -140,7 +140,7 @@ class _ChatListState extends State { return Obx( () => DefaultTabController( length: 2 + realms.availableRealms.length, - child: RootContainer( + child: ResponsiveRootContainer( child: Scaffold( appBar: AppBar( leading: Obx(() { diff --git a/lib/shells/title_shell.dart b/lib/shells/title_shell.dart index c03d6ee..21d228c 100644 --- a/lib/shells/title_shell.dart +++ b/lib/shells/title_shell.dart @@ -10,6 +10,7 @@ import 'package:solian/widgets/root_container.dart'; class TitleShell extends StatelessWidget { final bool showAppBar; final bool isCenteredTitle; + final bool isResponsive; final String? title; final GoRouterState? state; final Widget child; @@ -21,32 +22,37 @@ class TitleShell extends StatelessWidget { this.state, this.showAppBar = true, this.isCenteredTitle = false, + this.isResponsive = false, }); @override Widget build(BuildContext context) { assert(state != null || title != null); - return RootContainer( - child: Scaffold( - appBar: showAppBar - ? AppBar( - leading: AppBarLeadingButton.adaptive(context), - title: AppBarTitle( - title ?? (state!.topRoute?.name?.tr ?? 'page'.tr), + final widget = Scaffold( + appBar: showAppBar + ? AppBar( + leading: AppBarLeadingButton.adaptive(context), + title: AppBarTitle( + title ?? (state!.topRoute?.name?.tr ?? 'page'.tr), + ), + centerTitle: isCenteredTitle, + toolbarHeight: AppTheme.toolbarHeight(context), + actions: [ + const BackgroundStateWidget(), + SizedBox( + width: AppTheme.isLargeScreen(context) ? 8 : 16, ), - centerTitle: isCenteredTitle, - toolbarHeight: AppTheme.toolbarHeight(context), - actions: [ - const BackgroundStateWidget(), - SizedBox( - width: AppTheme.isLargeScreen(context) ? 8 : 16, - ), - ], - ) - : null, - body: child, - ), + ], + ) + : null, + body: child, ); + + if (isResponsive) { + return ResponsiveRootContainer(child: widget); + } else { + return RootContainer(child: widget); + } } } diff --git a/lib/widgets/account/account_profile_popup.dart b/lib/widgets/account/account_profile_popup.dart index 0190df1..fab114d 100644 --- a/lib/widgets/account/account_profile_popup.dart +++ b/lib/widgets/account/account_profile_popup.dart @@ -118,7 +118,7 @@ class _AccountProfilePopupState extends State { const VisualDensity(horizontal: -4, vertical: -2), trailing: const Icon(Icons.chevron_right), onTap: () { - AppRouter.instance.goNamed( + AppRouter.instance.pushNamed( 'accountProfilePage', pathParameters: {'name': _userinfo!.name}, ); diff --git a/lib/widgets/app_bar_leading.dart b/lib/widgets/app_bar_leading.dart index 3c88d45..300788e 100644 --- a/lib/widgets/app_bar_leading.dart +++ b/lib/widgets/app_bar_leading.dart @@ -1,28 +1,22 @@ import 'package:flutter/material.dart'; -import 'package:solian/shells/root_shell.dart'; class AppBarLeadingButton extends StatelessWidget { - const AppBarLeadingButton({super.key}); + final bool forceBack; - static Widget? adaptive(BuildContext context) { - final hasContent = - Navigator.canPop(context) || rootScaffoldKey.currentState!.hasDrawer; - return hasContent ? const AppBarLeadingButton() : null; + const AppBarLeadingButton({super.key, this.forceBack = false}); + + static Widget? adaptive(BuildContext context, {bool forceBack = false}) { + final hasContent = Navigator.canPop(context) || forceBack; + return hasContent ? AppBarLeadingButton(forceBack: forceBack) : null; } @override Widget build(BuildContext context) { - if (Navigator.canPop(context)) { + if (Navigator.canPop(context) || forceBack) { return BackButton( onPressed: () => Navigator.pop(context), ); } - if (rootScaffoldKey.currentState!.hasDrawer) { - return DrawerButton( - onPressed: () => rootScaffoldKey.currentState!.openDrawer(), - ); - } else { - return const SizedBox.shrink(); - } + return const SizedBox.shrink(); } } diff --git a/lib/widgets/root_container.dart b/lib/widgets/root_container.dart index 9e70cbb..6f862cb 100644 --- a/lib/widgets/root_container.dart +++ b/lib/widgets/root_container.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:path_provider/path_provider.dart'; import 'package:solian/platform.dart'; +import 'package:solian/theme.dart'; class RootContainer extends StatelessWidget { final Widget? child; @@ -46,3 +47,18 @@ class RootContainer extends StatelessWidget { ); } } + +class ResponsiveRootContainer extends StatelessWidget { + final Widget? child; + + const ResponsiveRootContainer({super.key, this.child}); + + @override + Widget build(BuildContext context) { + if (AppTheme.isLargeScreen(context)) { + return child ?? SizedBox.shrink(); + } else { + return RootContainer(child: child); + } + } +} diff --git a/lib/widgets/sidebar/empty_placeholder.dart b/lib/widgets/sidebar/empty_placeholder.dart index b6a7aad..ae40907 100644 --- a/lib/widgets/sidebar/empty_placeholder.dart +++ b/lib/widgets/sidebar/empty_placeholder.dart @@ -6,7 +6,7 @@ class EmptyPagePlaceholder extends StatelessWidget { @override Widget build(BuildContext context) { - return RootContainer( + return ResponsiveRootContainer( child: Center( child: ClipRRect( borderRadius: const BorderRadius.all(Radius.circular(12)), diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 4e3161c..c58af6d 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -8,38 +8,38 @@ PODS: - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - - Firebase/Analytics (11.0.0): + - Firebase/Analytics (11.2.0): - Firebase/Core - - Firebase/Core (11.0.0): + - Firebase/Core (11.2.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 11.0.0) - - Firebase/CoreOnly (11.0.0): - - FirebaseCore (= 11.0.0) - - Firebase/Crashlytics (11.0.0): + - FirebaseAnalytics (~> 11.2.0) + - Firebase/CoreOnly (11.2.0): + - FirebaseCore (= 11.2.0) + - Firebase/Crashlytics (11.2.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 11.0.0) - - Firebase/Messaging (11.0.0): + - FirebaseCrashlytics (~> 11.2.0) + - Firebase/Messaging (11.2.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.0.0) - - firebase_analytics (11.3.2): - - Firebase/Analytics (= 11.0.0) + - FirebaseMessaging (~> 11.2.0) + - firebase_analytics (11.3.3): + - Firebase/Analytics (= 11.2.0) - firebase_core - FlutterMacOS - - firebase_core (3.5.0): - - Firebase/CoreOnly (~> 11.0.0) + - firebase_core (3.6.0): + - Firebase/CoreOnly (~> 11.2.0) - FlutterMacOS - - firebase_crashlytics (4.1.2): - - Firebase/CoreOnly (~> 11.0.0) - - Firebase/Crashlytics (~> 11.0.0) + - firebase_crashlytics (4.1.3): + - Firebase/CoreOnly (~> 11.2.0) + - Firebase/Crashlytics (~> 11.2.0) - firebase_core - FlutterMacOS - - firebase_messaging (15.1.2): - - Firebase/CoreOnly (~> 11.0.0) - - Firebase/Messaging (~> 11.0.0) + - firebase_messaging (15.1.3): + - Firebase/CoreOnly (~> 11.2.0) + - Firebase/Messaging (~> 11.2.0) - firebase_core - FlutterMacOS - - FirebaseAnalytics (11.0.0): - - FirebaseAnalytics/AdIdSupport (= 11.0.0) + - FirebaseAnalytics (11.2.0): + - FirebaseAnalytics/AdIdSupport (= 11.2.0) - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) @@ -47,24 +47,24 @@ PODS: - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.0.0): + - FirebaseAnalytics/AdIdSupport (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.0.0) + - GoogleAppMeasurement (= 11.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseCore (11.0.0): + - FirebaseCore (11.2.0): - FirebaseCoreInternal (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.2.0): + - FirebaseCoreExtension (11.3.0): - FirebaseCore (~> 11.0) - - FirebaseCoreInternal (11.2.0): + - FirebaseCoreInternal (11.3.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseCrashlytics (11.0.0): + - FirebaseCrashlytics (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) @@ -73,12 +73,12 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.2.0): + - FirebaseInstallations (11.3.0): - FirebaseCore (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.0.0): + - FirebaseMessaging (11.2.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) @@ -87,8 +87,8 @@ PODS: - GoogleUtilities/Reachability (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfigInterop (11.2.0) - - FirebaseSessions (11.2.0): + - FirebaseRemoteConfigInterop (11.3.0) + - FirebaseSessions (11.3.0): - FirebaseCore (~> 11.0) - FirebaseCoreExtension (~> 11.0) - FirebaseInstallations (~> 11.0) @@ -108,21 +108,21 @@ PODS: - gal (1.0.0): - Flutter - FlutterMacOS - - GoogleAppMeasurement (11.0.0): - - GoogleAppMeasurement/AdIdSupport (= 11.0.0) + - GoogleAppMeasurement (11.2.0): + - GoogleAppMeasurement/AdIdSupport (= 11.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.0.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.0.0) + - GoogleAppMeasurement/AdIdSupport (11.2.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.0.0): + - GoogleAppMeasurement/WithoutAdIdSupport (11.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) @@ -342,26 +342,26 @@ SPEC CHECKSUMS: desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898 device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720 file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d - Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9 - firebase_analytics: a2d0d907566e4a48e27745317f05b4b7db85edd9 - firebase_core: c55630cdb8a01cf49eae741dd4bc8c93bdd546b8 - firebase_crashlytics: a359f1f75a23e560c8c97b743ab684ba795d7688 - firebase_messaging: 12726b352752420d073ff075e328cc2f0ca14c47 - FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a - FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 - FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de - FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5 - FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b - FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a - FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 - FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db - FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6 + Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c + firebase_analytics: 30ff72f6d4847ff0b479d8edd92fc8582e719072 + firebase_core: e88f946a4601cb1854178cb07da241bba5a6508e + firebase_crashlytics: e09adc8a2db53e71b3ef3d085deb688a0c17467a + firebase_messaging: e1b1c1504659e13d66131f62ec22919293cd0d11 + FirebaseAnalytics: c36efd5710c60c17558650fa58c2066eca7e9265 + FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da + FirebaseCoreExtension: 30bb063476ef66cd46925243d64ad8b2c8ac3264 + FirebaseCoreInternal: ac26d09a70c730e497936430af4e60fb0c68ec4e + FirebaseCrashlytics: cfc69af5b53565dc6a5e563788809b5778ac4eac + FirebaseInstallations: 58cf94dabf1e2bb2fa87725a9be5c2249171cda0 + FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152 + FirebaseRemoteConfigInterop: c3a5c31b3c22079f41ba1dc645df889d9ce38cb9 + FirebaseSessions: 655ff17f3cc1a635cbdc2d69b953878001f9e25b flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9 flutter_webrtc: 2b4e4a2de70a1485836e40fd71a7a94c77d49bd9 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 gal: 61e868295d28fe67ffa297fae6dacebf56fd53e1 - GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de + GoogleAppMeasurement: 76d4f8b36b03bd8381fa9a7fe2cc7f99c0a2e93a GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0