diff --git a/lib/components/organism_components/menu_component/menu_component_model.dart b/lib/components/organism_components/menu_component/menu_component_model.dart index 2db66ce7..8830bbf1 100644 --- a/lib/components/organism_components/menu_component/menu_component_model.dart +++ b/lib/components/organism_components/menu_component/menu_component_model.dart @@ -211,42 +211,6 @@ class MenuComponentModel extends FlutterFlowModel { MaterialPageRoute(builder: (context) => ReservationPageWidget())); } - Future packageOrder(BuildContext context) async { - context.pushNamed( - 'packageOrder', - extra: { - kTransitionInfoKey: const TransitionInfo( - hasTransition: true, - transitionType: PageTransitionType.scale, - alignment: Alignment.bottomCenter, - ), - }, - ).then((value) => true); - } - - Future reservation(BuildContext context) async { - Navigator.push(context, - MaterialPageRoute(builder: (context) => ReservationPageWidget())); - } - - Future packageOrder(BuildContext context) async { - context.pushNamed( - 'packageOrder', - extra: { - kTransitionInfoKey: const TransitionInfo( - hasTransition: true, - transitionType: PageTransitionType.scale, - alignment: Alignment.bottomCenter, - ), - }, - ).then((value) => true); - } - - Future reservation(BuildContext context) async { - Navigator.push(context, - MaterialPageRoute(builder: (context) => ReservationPageWidget())); - } - Future consultHistoriesAction(BuildContext context) async { await showAdaptiveDialog( // isScrollControlled: true, diff --git a/lib/components/organism_components/menu_component/menu_component_widget.dart b/lib/components/organism_components/menu_component/menu_component_widget.dart index 4c708c2a..2d40ab8b 100644 --- a/lib/components/organism_components/menu_component/menu_component_widget.dart +++ b/lib/components/organism_components/menu_component/menu_component_widget.dart @@ -162,7 +162,7 @@ class _MenuComponentWidgetState extends State { MenuButtonWidget( icon: Icons.inventory_2_outlined, action: () async { - await _model.scheduleCompleteVisitAction(context); + await _model.packageOrder(context); setState(() {}); }, title: FFLocalizations.of(context).getVariableText( @@ -173,7 +173,7 @@ class _MenuComponentWidgetState extends State { MenuButtonWidget( icon: Icons.event_available, action: () async { - await _model.scheduleCompleteVisitAction(context); + await _model.reservation(context); setState(() {}); }, title: FFLocalizations.of(context).getVariableText( @@ -401,7 +401,7 @@ class _MenuComponentWidgetState extends State { MenuCardItem( icon: Icons.inventory_2_outlined, action: () async { - await _model.scheduleCompleteVisitAction(context); + await _model.packageOrder(context); setState(() {}); }, title: FFLocalizations.of(context).getVariableText( @@ -412,7 +412,7 @@ class _MenuComponentWidgetState extends State { MenuCardItem( icon: Icons.event_available, action: () async { - await _model.scheduleCompleteVisitAction(context); + await _model.reservation(context); setState(() {}); }, title: FFLocalizations.of(context).getVariableText( diff --git a/lib/pages/fast_pass_page/fast_pass_page_widget.dart b/lib/pages/fast_pass_page/fast_pass_page_widget.dart index b5f962c5..6613162c 100644 --- a/lib/pages/fast_pass_page/fast_pass_page_widget.dart +++ b/lib/pages/fast_pass_page/fast_pass_page_widget.dart @@ -1,8 +1,8 @@ +import 'dart:io' show Platform; + import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:hub/app_state.dart'; -import 'package:hub/app_state.dart'; -import 'package:hub/flutter_flow/flutter_flow_theme.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:webview_flutter/webview_flutter.dart'; @@ -44,7 +44,6 @@ class _FastPassPageWidgetState extends State { Widget build(BuildContext context) { return SafeArea( child: Scaffold( - backgroundColor: FlutterFlowTheme.of(context).primaryBackground, body: Platform.isIOS ? InAppWebView( initialUrlRequest: URLRequest(url: WebUri(url)), @@ -102,16 +101,6 @@ class _FastPassPageWidgetState extends State { ) ..loadRequest(Uri.parse(url)), ), - appBar: AppBar( - // Navigator pop - leading: IconButton( - icon: const Icon(Icons.arrow_back), - onPressed: () { - Navigator.pop(context); - }, - ), - backgroundColor: FlutterFlowTheme.of(context).primaryBackground, - ), ), ); }