Skip to content

Commit

Permalink
order booking added
Browse files Browse the repository at this point in the history
  • Loading branch information
@techstore56
techstore56 committed Aug 14, 2021
1 parent 51d9ab2 commit 4c7345a
Show file tree
Hide file tree
Showing 9 changed files with 1,064 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .flutter-plugins-dependencies
View file

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions lib/src/pages/details.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,68 +100,68 @@ class _DetailsWidgetState extends StateMVC<DetailsWidget> {
return Scaffold(
key: widget.scaffoldKey,
drawer: DrawerWidget(),
// bottomNavigationBar: Container(
// height: 66,
// decoration: BoxDecoration(
// color: Theme.of(context).primaryColor,
// boxShadow: [BoxShadow(color: Theme.of(context).hintColor.withOpacity(0.10), offset: Offset(0, -4), blurRadius: 10)],
// ),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: [
// IconButton(
// icon: Icon(
// Icons.store,
// size: widget.currentTab == 0 ? 28 : 24,
// color: widget.currentTab == 0 ? Theme.of(context).accentColor : Theme.of(context).focusColor,
// ),
// onPressed: () {
// this._selectTab(0);
// },
// ),
// IconButton(
// icon: Icon(
// Icons.chat,
// size: widget.currentTab == 1 ? 28 : 24,
// color: widget.currentTab == 1 ? Theme.of(context).accentColor : Theme.of(context).focusColor,
// ),
// onPressed: () {
// this._selectTab(1);
// },
// ),
// IconButton(
// icon: Icon(
// Icons.directions,
// size: widget.currentTab == 2 ? 28 : 24,
// color: widget.currentTab == 2 ? Theme.of(context).accentColor : Theme.of(context).focusColor,
// ),
// onPressed: () {
// this._selectTab(2);
// },
// ),
bottomNavigationBar: Container(
height: 66,
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
boxShadow: [BoxShadow(color: Theme.of(context).hintColor.withOpacity(0.10), offset: Offset(0, -4), blurRadius: 10)],
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
IconButton(
icon: Icon(
Icons.store,
size: widget.currentTab == 0 ? 28 : 24,
color: widget.currentTab == 0 ? Theme.of(context).accentColor : Theme.of(context).focusColor,
),
onPressed: () {
this._selectTab(0);
},
),
IconButton(
icon: Icon(
Icons.chat,
size: widget.currentTab == 1 ? 28 : 24,
color: widget.currentTab == 1 ? Theme.of(context).accentColor : Theme.of(context).focusColor,
),
onPressed: () {
this._selectTab(1);
},
),
IconButton(
icon: Icon(
Icons.directions,
size: widget.currentTab == 2 ? 28 : 24,
color: widget.currentTab == 2 ? Theme.of(context).accentColor : Theme.of(context).focusColor,
),
onPressed: () {
this._selectTab(2);
},
),

// //restaurent menue button
// FlatButton(
// onPressed: () {
// this._selectTab(3);
// },
// padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
// shape: StadiumBorder(),
// color: Theme.of(context).accentColor,
// child: Wrap(
// spacing: 10,
// children: [
// Icon(Icons.restaurant, color: Theme.of(context).primaryColor),
// Text(
// S.of(context).menu,
// style: TextStyle(color: Theme.of(context).primaryColor),
// )
// ],
// ),
// ),
// ],
// ),
// ),
//restaurent menue button
FlatButton(
onPressed: () {
this._selectTab(3);
},
padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
shape: StadiumBorder(),
color: Theme.of(context).accentColor,
child: Wrap(
spacing: 10,
children: [
Icon(Icons.restaurant, color: Theme.of(context).primaryColor),
Text(
S.of(context).menu,
style: TextStyle(color: Theme.of(context).primaryColor),
)
],
),
),
],
),
),
/*
bottomNavigationBar: BottomNavigationBar(
type: BottomNavigationBarType.fixed,
Expand Down
8 changes: 5 additions & 3 deletions lib/src/pages/navbar_main.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:food_delivery_app/src/screen/booking/book_page.dart';
import 'package:food_delivery_app/src/screen/booking/booking_home.dart';
import 'package:food_delivery_app/src/screen/orders/orders_home.dart';
import 'package:food_delivery_app/src/screen/profile/my_profile.dart';
import 'package:food_delivery_app/src/screen/profile/profile_menu.dart';

Expand Down Expand Up @@ -62,9 +63,10 @@ class _PagesWidgetState extends State<PagesWidget> {
NotificationsWidget(parentScaffoldKey: widget.scaffoldKey);
break;
case 1:
widget.currentPage = MapWidget(
parentScaffoldKey: widget.scaffoldKey,
routeArgument: widget.routeArgument);
// widget.currentPage = MapWidget(
// parentScaffoldKey: widget.scaffoldKey,
// routeArgument: widget.routeArgument);
widget.currentPage = OrderHome();
break;
case 2:
widget.currentPage =
Expand Down
10 changes: 9 additions & 1 deletion lib/src/screen/booking/booking_home.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:food_delivery_app/src/elements/SearchWidget.dart';
import 'package:food_delivery_app/src/elements/ShoppingCartButtonWidget.dart';
import 'package:food_delivery_app/src/pages/home.dart';
import 'package:food_delivery_app/src/screen/booking/book_page.dart';
import 'package:food_delivery_app/src/screen/booking/booking_details.dart';
import 'package:food_delivery_app/src/screen/booking/booking_list_show.dart';
Expand All @@ -24,7 +25,14 @@ class _BookingHomeState extends State<BookingHome> {
leading: new IconButton(
icon: new Icon(Icons.arrow_back, color: Theme.of(context).hintColor),
// onPressed: () => Navigator.of(context).pushNamed('/Details', arguments: RouteArgument(id: '0', param: _con.restaurant.id, heroTag: 'menu_tab')),
onPressed: () => Navigator.pop(context),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => HomeWidget()),
);

},
),
title: Text(
'',
Expand Down
17 changes: 17 additions & 0 deletions lib/src/screen/orders/order_Delivered.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import 'package:flutter/material.dart';

class OrderDelivered extends StatefulWidget {
OrderDelivered({Key key}) : super(key: key);

@override
_OrderDeliveredState createState() => _OrderDeliveredState();
}

class _OrderDeliveredState extends State<OrderDelivered> {
@override
Widget build(BuildContext context) {
return Container(
child: null,
);
}
}
17 changes: 17 additions & 0 deletions lib/src/screen/orders/order_canceled.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import 'package:flutter/material.dart';

class OrderCanceled extends StatefulWidget {
OrderCanceled({Key key}) : super(key: key);

@override
_OrderCanceledState createState() => _OrderCanceledState();
}

class _OrderCanceledState extends State<OrderCanceled> {
@override
Widget build(BuildContext context) {
return Container(
child: null,
);
}
}
Loading

0 comments on commit 4c7345a

Please sign in to comment.