From 2dac014064bcd776642a0b0ce5992ba8a5b2b294 Mon Sep 17 00:00:00 2001 From: Josh Patra Date: Sat, 25 Feb 2023 21:46:23 -0500 Subject: [PATCH] Force PersistentNavBar --- lib/profile_screen_custom.dart | 22 +++++++++++++--------- pubspec.lock | 8 ++++++++ pubspec.yaml | 1 + 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/profile_screen_custom.dart b/lib/profile_screen_custom.dart index fe29e7b..d30657d 100644 --- a/lib/profile_screen_custom.dart +++ b/lib/profile_screen_custom.dart @@ -2,10 +2,13 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// ignore_for_file: implementation_imports + import 'package:firebase_auth/firebase_auth.dart' show ActionCodeSettings, FirebaseAuth, FirebaseAuthException, User; import 'package:flutter/cupertino.dart' hide Title; -import 'package:flutterfire_ui/i10n.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/material.dart' hide Title; +import 'package:flutter_credit_card/flutter_credit_card.dart'; import 'package:flutterfire_ui/auth.dart'; import 'package:flutterfire_ui/src/auth/widgets/internal/loading_button.dart'; @@ -112,7 +115,6 @@ class _EmailVerificationBadgeState extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - const SizedBox(width: 16), Wrap( children: const [ @@ -220,7 +222,7 @@ class ProfileScreenCustom extends MultiProviderScreen { final user = auth.currentUser!; final content = Column( - crossAxisAlignment: CrossAxisAlignment.stretch, + crossAxisAlignment: CrossAxisAlignment.center, children: [ Align( child: UserAvatar( @@ -247,10 +249,13 @@ class ProfileScreenCustom extends MultiProviderScreen { ), ], ...children, - const SizedBox(height: 16), - SignOutButton( - auth: auth, - variant: ButtonVariant.outlined, + const SizedBox(height: 300), + Align( + alignment: Alignment.bottomCenter, + child: SignOutButton( + auth: auth, + variant: ButtonVariant.filled, + ), ), const SizedBox(height: 8), ], @@ -261,8 +266,7 @@ class ProfileScreenCustom extends MultiProviderScreen { child: LayoutBuilder( builder: (context, constraints) { if (constraints.maxWidth > 500) { - return ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 500), + return Expanded( child: content, ); } else { diff --git a/pubspec.lock b/pubspec.lock index 4c9d6c4..c4056d9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -206,6 +206,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_credit_card: + dependency: "direct main" + description: + name: flutter_credit_card + sha256: "0fc71e8bfb0e126d2c4247830c04e2acf2b831161411a361e9fa9dc1cc41e605" + url: "https://pub.dev" + source: hosted + version: "3.0.5" flutter_dotenv: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index d8761c8..f84f51f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -40,6 +40,7 @@ dependencies: flutterfire_ui: ^0.4.3+20 flutter_dotenv: ^5.0.2 persistent_bottom_nav_bar: any + flutter_credit_card: any dev_dependencies: flutter_test: