Skip to content

Commit 6ae24b9

Browse files
chloefontchloefont
authored
Merge pull request #78 from PDG-NUTRI/66-créer-la-page-add-meal
66 créer la page add meal
2 parents 910c5f4 + 18bb864 commit 6ae24b9

15 files changed

+675
-115
lines changed

‎assets/images/placeholderfood.png

11 KB
Loading

‎lib/main.dart

-65
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
1-
import 'package:cloud_firestore/cloud_firestore.dart';
2-
3-
import 'dart:developer';
4-
51
import 'package:flutter/material.dart';
62
import 'package:firebase_core/firebase_core.dart';
7-
import 'package:pdg_app/model/message.dart';
8-
import 'package:pdg_app/widgets/forms/main_text_field.dart';
93
import 'package:pdg_app/router/router.gr.dart';
104
import 'package:pdg_app/theme.dart';
115
import 'firebase_options.dart';
126

13-
import 'api/imessage.dart';
14-
import 'api/firebase_message.dart';
15-
167
void main() async {
178
WidgetsFlutterBinding.ensureInitialized();
189
await Firebase.initializeApp(
1910
options: DefaultFirebaseOptions.currentPlatform,
2011
);
21-
IMessage msg = FirebaseMessage(FirebaseFirestore.instance);
22-
23-
final m1 = Message(uid: '', fromId: 'alice', toId: 'bob', content: "HELLOW");
24-
msg.createMessage(m1);
25-
log("test");
2612
runApp(MyApp());
2713
}
2814

@@ -47,54 +33,3 @@ class MyApp extends StatelessWidget {
4733
);
4834
}
4935
}
50-
51-
class MyHomePage extends StatefulWidget {
52-
const MyHomePage({Key? key, required this.title}) : super(key: key);
53-
54-
final String title;
55-
56-
@override
57-
State<MyHomePage> createState() => _MyHomePageState();
58-
}
59-
60-
class _MyHomePageState extends State<MyHomePage> {
61-
void _incrementCounter() {
62-
setState(() {});
63-
}
64-
65-
@override
66-
Widget build(BuildContext context) {
67-
return Scaffold(
68-
appBar: AppBar(
69-
title: Text(widget.title),
70-
),
71-
body: Center(
72-
child: Padding(
73-
padding: const EdgeInsets.all(20.0),
74-
child: Column(
75-
mainAxisAlignment: MainAxisAlignment.center,
76-
children: const <Widget>[
77-
MainTextField(
78-
name: "Email",
79-
icon: Icon(Icons.email_outlined),
80-
keyboardType: TextInputType.emailAddress,
81-
),
82-
SizedBox(height: 10),
83-
MainTextField(
84-
name: "Password",
85-
icon: Icon(Icons.password),
86-
obscureText: true,
87-
keyboardType: TextInputType.emailAddress,
88-
),
89-
],
90-
),
91-
),
92-
),
93-
floatingActionButton: FloatingActionButton(
94-
onPressed: _incrementCounter,
95-
tooltip: 'Increment',
96-
child: const Icon(Icons.add),
97-
),
98-
);
99-
}
100-
}

‎lib/router/router.dart

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import 'package:auto_route/auto_route.dart';
2+
import 'package:auto_route/empty_router_widgets.dart';
3+
import 'package:pdg_app/screens/add_meal.dart';
24
import 'package:pdg_app/screens/chat.dart';
35
import 'package:pdg_app/screens/diary.dart';
46
import 'package:pdg_app/screens/login.dart';
@@ -24,8 +26,19 @@ import '../screens/home.dart';
2426
path: 'chat',
2527
),
2628
AutoRoute(
27-
page: DiaryScreen,
29+
page: EmptyRouterPage,
30+
name: "DiaryRouterPage",
2831
path: 'diary',
32+
children: [
33+
AutoRoute(
34+
path: '',
35+
page: DiaryScreen,
36+
),
37+
AutoRoute(
38+
path: 'add',
39+
page: AddMealScreen,
40+
),
41+
],
2942
),
3043
AutoRoute(
3144
page: ProfileScreen,
@@ -36,6 +49,7 @@ import '../screens/home.dart';
3649
AutoRoute(
3750
page: LoginScreen,
3851
path: '/login',
52+
initial: false,
3953
),
4054
AutoRoute(
4155
page: RegisterScreen,

‎lib/router/router.gr.dart

+69-35
Original file line numberDiff line numberDiff line change
@@ -11,92 +11,109 @@
1111
// ignore_for_file: type=lint
1212

1313
// ignore_for_file: no_leading_underscores_for_library_prefixes
14-
import 'package:auto_route/auto_route.dart' as _i7;
15-
import 'package:flutter/material.dart' as _i8;
14+
import 'package:auto_route/auto_route.dart' as _i9;
15+
import 'package:auto_route/empty_router_widgets.dart' as _i5;
16+
import 'package:flutter/material.dart' as _i10;
1617

18+
import '../screens/add_meal.dart' as _i8;
1719
import '../screens/chat.dart' as _i4;
18-
import '../screens/diary.dart' as _i5;
20+
import '../screens/diary.dart' as _i7;
1921
import '../screens/home.dart' as _i1;
2022
import '../screens/login.dart' as _i2;
2123
import '../screens/profile.dart' as _i6;
2224
import '../screens/register.dart' as _i3;
2325

24-
class AppRouter extends _i7.RootStackRouter {
25-
AppRouter([_i8.GlobalKey<_i8.NavigatorState>? navigatorKey])
26+
class AppRouter extends _i9.RootStackRouter {
27+
AppRouter([_i10.GlobalKey<_i10.NavigatorState>? navigatorKey])
2628
: super(navigatorKey);
2729

2830
@override
29-
final Map<String, _i7.PageFactory> pagesMap = {
31+
final Map<String, _i9.PageFactory> pagesMap = {
3032
HomeScreenRoute.name: (routeData) {
31-
return _i7.MaterialPageX<dynamic>(
33+
return _i9.MaterialPageX<dynamic>(
3234
routeData: routeData, child: const _i1.HomeScreen());
3335
},
3436
LoginScreenRoute.name: (routeData) {
35-
return _i7.MaterialPageX<dynamic>(
37+
return _i9.MaterialPageX<dynamic>(
3638
routeData: routeData, child: const _i2.LoginScreen());
3739
},
3840
RegisterScreenRoute.name: (routeData) {
39-
return _i7.MaterialPageX<dynamic>(
41+
return _i9.MaterialPageX<dynamic>(
4042
routeData: routeData, child: const _i3.RegisterScreen());
4143
},
4244
ChatScreenRoute.name: (routeData) {
43-
return _i7.MaterialPageX<dynamic>(
45+
return _i9.MaterialPageX<dynamic>(
4446
routeData: routeData, child: const _i4.ChatScreen());
4547
},
46-
DiaryScreenRoute.name: (routeData) {
47-
return _i7.MaterialPageX<dynamic>(
48-
routeData: routeData, child: const _i5.DiaryScreen());
48+
DiaryRouterPage.name: (routeData) {
49+
return _i9.MaterialPageX<dynamic>(
50+
routeData: routeData, child: const _i5.EmptyRouterPage());
4951
},
5052
ProfileScreenRoute.name: (routeData) {
51-
return _i7.MaterialPageX<dynamic>(
53+
return _i9.MaterialPageX<dynamic>(
5254
routeData: routeData, child: const _i6.ProfileScreen());
55+
},
56+
DiaryScreenRoute.name: (routeData) {
57+
return _i9.MaterialPageX<dynamic>(
58+
routeData: routeData, child: const _i7.DiaryScreen());
59+
},
60+
AddMealScreenRoute.name: (routeData) {
61+
return _i9.MaterialPageX<dynamic>(
62+
routeData: routeData, child: const _i8.AddMealScreen());
5363
}
5464
};
5565

5666
@override
57-
List<_i7.RouteConfig> get routes => [
58-
_i7.RouteConfig('/#redirect',
67+
List<_i9.RouteConfig> get routes => [
68+
_i9.RouteConfig('/#redirect',
5969
path: '/', redirectTo: '/home', fullMatch: true),
60-
_i7.RouteConfig(HomeScreenRoute.name, path: '/home', children: [
61-
_i7.RouteConfig('#redirect',
70+
_i9.RouteConfig(HomeScreenRoute.name, path: '/home', children: [
71+
_i9.RouteConfig('#redirect',
6272
path: '',
6373
parent: HomeScreenRoute.name,
6474
redirectTo: 'diary',
6575
fullMatch: true),
66-
_i7.RouteConfig(ChatScreenRoute.name,
76+
_i9.RouteConfig(ChatScreenRoute.name,
6777
path: 'chat', parent: HomeScreenRoute.name),
68-
_i7.RouteConfig(DiaryScreenRoute.name,
69-
path: 'diary', parent: HomeScreenRoute.name),
70-
_i7.RouteConfig(ProfileScreenRoute.name,
78+
_i9.RouteConfig(DiaryRouterPage.name,
79+
path: 'diary',
80+
parent: HomeScreenRoute.name,
81+
children: [
82+
_i9.RouteConfig(DiaryScreenRoute.name,
83+
path: '', parent: DiaryRouterPage.name),
84+
_i9.RouteConfig(AddMealScreenRoute.name,
85+
path: 'add', parent: DiaryRouterPage.name)
86+
]),
87+
_i9.RouteConfig(ProfileScreenRoute.name,
7188
path: 'my', parent: HomeScreenRoute.name)
7289
]),
73-
_i7.RouteConfig(LoginScreenRoute.name, path: '/login'),
74-
_i7.RouteConfig(RegisterScreenRoute.name, path: '/register'),
75-
_i7.RouteConfig('*#redirect',
90+
_i9.RouteConfig(LoginScreenRoute.name, path: '/login'),
91+
_i9.RouteConfig(RegisterScreenRoute.name, path: '/register'),
92+
_i9.RouteConfig('*#redirect',
7693
path: '*', redirectTo: '/home/diary', fullMatch: true)
7794
];
7895
}
7996

8097
/// generated route for
8198
/// [_i1.HomeScreen]
82-
class HomeScreenRoute extends _i7.PageRouteInfo<void> {
83-
const HomeScreenRoute({List<_i7.PageRouteInfo>? children})
99+
class HomeScreenRoute extends _i9.PageRouteInfo<void> {
100+
const HomeScreenRoute({List<_i9.PageRouteInfo>? children})
84101
: super(HomeScreenRoute.name, path: '/home', initialChildren: children);
85102

86103
static const String name = 'HomeScreenRoute';
87104
}
88105

89106
/// generated route for
90107
/// [_i2.LoginScreen]
91-
class LoginScreenRoute extends _i7.PageRouteInfo<void> {
108+
class LoginScreenRoute extends _i9.PageRouteInfo<void> {
92109
const LoginScreenRoute() : super(LoginScreenRoute.name, path: '/login');
93110

94111
static const String name = 'LoginScreenRoute';
95112
}
96113

97114
/// generated route for
98115
/// [_i3.RegisterScreen]
99-
class RegisterScreenRoute extends _i7.PageRouteInfo<void> {
116+
class RegisterScreenRoute extends _i9.PageRouteInfo<void> {
100117
const RegisterScreenRoute()
101118
: super(RegisterScreenRoute.name, path: '/register');
102119

@@ -105,24 +122,41 @@ class RegisterScreenRoute extends _i7.PageRouteInfo<void> {
105122

106123
/// generated route for
107124
/// [_i4.ChatScreen]
108-
class ChatScreenRoute extends _i7.PageRouteInfo<void> {
125+
class ChatScreenRoute extends _i9.PageRouteInfo<void> {
109126
const ChatScreenRoute() : super(ChatScreenRoute.name, path: 'chat');
110127

111128
static const String name = 'ChatScreenRoute';
112129
}
113130

114131
/// generated route for
115-
/// [_i5.DiaryScreen]
116-
class DiaryScreenRoute extends _i7.PageRouteInfo<void> {
117-
const DiaryScreenRoute() : super(DiaryScreenRoute.name, path: 'diary');
132+
/// [_i5.EmptyRouterPage]
133+
class DiaryRouterPage extends _i9.PageRouteInfo<void> {
134+
const DiaryRouterPage({List<_i9.PageRouteInfo>? children})
135+
: super(DiaryRouterPage.name, path: 'diary', initialChildren: children);
118136

119-
static const String name = 'DiaryScreenRoute';
137+
static const String name = 'DiaryRouterPage';
120138
}
121139

122140
/// generated route for
123141
/// [_i6.ProfileScreen]
124-
class ProfileScreenRoute extends _i7.PageRouteInfo<void> {
142+
class ProfileScreenRoute extends _i9.PageRouteInfo<void> {
125143
const ProfileScreenRoute() : super(ProfileScreenRoute.name, path: 'my');
126144

127145
static const String name = 'ProfileScreenRoute';
128146
}
147+
148+
/// generated route for
149+
/// [_i7.DiaryScreen]
150+
class DiaryScreenRoute extends _i9.PageRouteInfo<void> {
151+
const DiaryScreenRoute() : super(DiaryScreenRoute.name, path: '');
152+
153+
static const String name = 'DiaryScreenRoute';
154+
}
155+
156+
/// generated route for
157+
/// [_i8.AddMealScreen]
158+
class AddMealScreenRoute extends _i9.PageRouteInfo<void> {
159+
const AddMealScreenRoute() : super(AddMealScreenRoute.name, path: 'add');
160+
161+
static const String name = 'AddMealScreenRoute';
162+
}

0 commit comments

Comments
 (0)