Updating to latest FlutterFlow output.

ValetTech · Nov 18, 2022 · 8f19064 · 8f19064
1 parent 61e4708
commit 8f19064
Show file tree

Hide file tree

Showing 8 changed files with 528 additions and 795 deletions.
diff --git a/assets/images/app_launcher_icon.png b/assets/images/app_launcher_icon.png
diff --git a/lib/dashboard/dashboard_widget.dart b/lib/dashboard/dashboard_widget.dart
@@ -16,7 +16,12 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:percent_indicator/percent_indicator.dart';
 
 class DashboardWidget extends StatefulWidget {
-  const DashboardWidget({Key? key}) : super(key: key);
+  const DashboardWidget({
+    Key? key,
+    this.firstName,
+  }) : super(key: key);
+
+  final String? firstName;
 
   @override
   _DashboardWidgetState createState() => _DashboardWidgetState();
@@ -525,7 +530,7 @@ class _DashboardWidgetState extends State<DashboardWidget> {
                                   ),
                                   Padding(
                                     padding: EdgeInsetsDirectional.fromSTEB(
-                                        16, 16, 8, 16),
+                                        16, 8, 8, 16),
                                     child: Container(
                                       decoration: BoxDecoration(
                                         color:

diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart
@@ -101,7 +101,9 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) => GoRouter(
               requireAuth: true,
               builder: (context, params) => params.isEmpty
                   ? NavBarPage(initialPage: 'Dashboard')
-                  : DashboardWidget(),
+                  : DashboardWidget(
+                      firstName: params.getParam('firstName', ParamType.String),
+                    ),
             ),
             FFRoute(
               name: 'Reservations',

diff --git a/lib/main_login/main_login_widget.dart b/lib/main_login/main_login_widget.dart
@@ -174,10 +174,10 @@ class _MainLoginWidgetState extends State<MainLoginWidget> {
                                 controller: emailAddressController,
                                 obscureText: false,
                                 decoration: InputDecoration(
-                                  labelText: 'Your email address...',
+                                  labelText: 'E-mail address...',
                                   labelStyle:
                                       FlutterFlowTheme.of(context).bodyText2,
-                                  hintText: 'Enter your email...',
+                                  hintText: 'Please enter your email...',
                                   hintStyle: FlutterFlowTheme.of(context)
                                       .bodyText1
                                       .override(
@@ -339,7 +339,17 @@ class _MainLoginWidgetState extends State<MainLoginWidget> {
                                   return;
                                 }
 
-                                context.goNamedAuth('Dashboard', mounted);
+                                context.pushNamedAuth(
+                                  'Dashboard',
+                                  mounted,
+                                  queryParams: {
+                                    'firstName': serializeParam(
+                                      valueOrDefault(
+                                          currentUserDocument?.firstName, ''),
+                                      ParamType.String,
+                                    ),
+                                  }.withoutNulls,
+                                );
                               },
                               text: 'Login',
                               icon: Icon(

diff --git a/lib/new_order/new_order_widget.dart b/lib/new_order/new_order_widget.dart
diff --git a/lib/order_summary/order_summary_widget.dart b/lib/order_summary/order_summary_widget.dart
diff --git a/lib/p_i_n_login/p_i_n_login_widget.dart b/lib/p_i_n_login/p_i_n_login_widget.dart
@@ -353,46 +353,6 @@ class _PINLoginWidgetState extends State<PINLoginWidget>
                                         ),
                                       ),
                                     ),
-                                    Padding(
-                                      padding: EdgeInsetsDirectional.fromSTEB(
-                                          0, 0, 0, 24),
-                                      child: FFButtonWidget(
-                                        onPressed: () async {
-                                          context.pushNamed(
-                                            'mainLogin',
-                                            extra: <String, dynamic>{
-                                              kTransitionInfoKey:
-                                                  TransitionInfo(
-                                                hasTransition: true,
-                                                transitionType:
-                                                    PageTransitionType.fade,
-                                              ),
-                                            },
-                                          );
-                                        },
-                                        text: 'First Time User',
-                                        icon: Icon(
-                                          Icons.accessibility_new_rounded,
-                                          size: 20,
-                                        ),
-                                        options: FFButtonOptions(
-                                          width: 175,
-                                          height: 40,
-                                          color: FlutterFlowTheme.of(context)
-                                              .secondaryColor,
-                                          textStyle:
-                                              FlutterFlowTheme.of(context)
-                                                  .bodyText1,
-                                          elevation: 2,
-                                          borderSide: BorderSide(
-                                            color: Colors.transparent,
-                                            width: 1,
-                                          ),
-                                          borderRadius:
-                                              BorderRadius.circular(8),
-                                        ),
-                                      ),
-                                    ),
                                     Padding(
                                       padding: EdgeInsetsDirectional.fromSTEB(
                                           0, 0, 0, 24),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.12+1
+version: 1.0.15+1
 
 environment:
   sdk: ">=2.12.0 <3.0.0"