diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart index fe07af723..ebf40384f 100644 --- a/lib/widgets/layouts/login_scaffold.dart +++ b/lib/widgets/layouts/login_scaffold.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:particles_network/particles_network.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/l10n/l10n.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; class LoginScaffold extends StatelessWidget { final Widget body; @@ -29,74 +31,62 @@ class LoginScaffold extends StatelessWidget { return Scaffold( key: const Key('LoginScaffold'), appBar: appBar, - body: SafeArea( - // #Pangea - child: Container( - decoration: const BoxDecoration( - image: DecorationImage( - fit: BoxFit.cover, - image: AssetImage('assets/login_wallpaper.png'), - ), - ), - // Pangea# - child: body, - ), - ), + body: SafeArea(child: body), ); } return Container( - // #Pangea - // decoration: BoxDecoration( - // gradient: LinearGradient( - // colors: [ - // theme.colorScheme.surfaceContainerLow, - // theme.colorScheme.surfaceContainer, - // theme.colorScheme.surfaceContainerHighest, - // ], - // begin: Alignment.topLeft, - // end: Alignment.bottomRight, - // ), - // ), - decoration: const BoxDecoration( - image: DecorationImage( - fit: BoxFit.cover, - image: AssetImage('assets/login_wallpaper.png'), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + theme.colorScheme.surfaceContainerLow, + theme.colorScheme.surfaceContainer, + theme.colorScheme.surfaceContainerHighest, + ], + begin: Alignment.topLeft, + end: Alignment.bottomRight, ), ), - // Pangea# - child: Column( + child: Stack( children: [ - const SizedBox(height: 16), - Expanded( - child: Center( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Material( - borderRadius: BorderRadius.circular(AppConfig.borderRadius), - clipBehavior: Clip.hardEdge, - elevation: theme.appBarTheme.scrolledUnderElevation ?? 4, - shadowColor: theme.appBarTheme.shadowColor, - child: ConstrainedBox( - constraints: isMobileMode - ? const BoxConstraints() - : const BoxConstraints( - maxWidth: 480, - // #Pangea - // maxHeight: 640, - maxHeight: 700, - // Pangea# - ), - child: Scaffold( - key: const Key('LoginScaffold'), - appBar: appBar, - body: SafeArea(child: body), + if (!MediaQuery.of(context).disableAnimations) + ParticleNetwork( + particleColor: theme.colorScheme.primary, + lineColor: theme.colorScheme.secondary, + ), + Column( + children: [ + const SizedBox(height: 16), + Expanded( + child: Center( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Material( + borderRadius: BorderRadius.circular( + AppConfig.borderRadius, + ), + clipBehavior: Clip.hardEdge, + elevation: theme.appBarTheme.scrolledUnderElevation ?? 4, + shadowColor: theme.appBarTheme.shadowColor, + child: ConstrainedBox( + constraints: isMobileMode + ? const BoxConstraints() + : const BoxConstraints( + maxWidth: 480, + maxHeight: 640, + ), + child: Scaffold( + key: const Key('LoginScaffold'), + appBar: appBar, + body: SafeArea(child: body), + ), + ), ), ), ), ), - ), + const _PrivacyButtons(mainAxisAlignment: .center), + ], ), - const _PrivacyButtons(mainAxisAlignment: .center), ], ), ); @@ -130,12 +120,10 @@ class _PrivacyButtons extends StatelessWidget { onPressed: () => launchUrl(AppConfig.privacyUrl), child: Text(L10n.of(context).privacy, style: shadowTextStyle), ), - // #Pangea - // TextButton( - // onPressed: () => PlatformInfos.showDialog(context), - // child: Text(L10n.of(context).about, style: shadowTextStyle), - // ), - // Pangea# + TextButton( + onPressed: () => PlatformInfos.showDialog(context), + child: Text(L10n.of(context).about, style: shadowTextStyle), + ), ], ), ), diff --git a/pubspec.lock b/pubspec.lock index d488266b2..cf35217e7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1500,14 +1500,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" - native_imaging: - dependency: "direct main" - description: - name: native_imaging - sha256: "93573afdcab070011d78a40fc1f69b61967f1f8485d2b81a7a2ee585a85f4c04" - url: "https://pub.dev" - source: hosted - version: "0.2.0" nested: dependency: transitive description: @@ -1636,6 +1628,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.23.3" + particles_network: + dependency: "direct main" + description: + name: particles_network + sha256: "10350bbf446b504acf591b928b1a39ba687237a8895d73e6567abba1a2740c4c" + url: "https://pub.dev" + source: hosted + version: "1.9.0" path: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 3856fdbca..40abf423e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -65,9 +65,9 @@ dependencies: path: /Users/ggurdin/pangea/matrix-dart-sdk # Pangea# mime: ^2.0.0 - native_imaging: ^0.2.0 opus_caf_converter_dart: ^1.0.1 package_info_plus: ^8.3.1 + particles_network: ^1.9.0 path: ^1.9.0 path_provider: ^2.1.2 permission_handler: ^12.0.1 diff --git a/scripts/release-ios-testflight.sh b/scripts/release-ios-testflight.sh index 14e6ea08d..5eef16622 100644 --- a/scripts/release-ios-testflight.sh +++ b/scripts/release-ios-testflight.sh @@ -1,5 +1,5 @@ #!/bin/sh -ve -flutter pub add fcm_shared_isolate:0.1.0 +flutter pub add fcm_shared_isolate:0.2.0 sed -i '' 's,//,,g' lib/utils/background_push.dart flutter clean flutter pub get