change app Routing

nadirbounoua · Jul 3, 2019 · 17035c6 · 17035c6
1 parent c136f15
commit 17035c6
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 27 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -5,6 +5,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 import 'redux/reducers.dart';
 import 'package:redux_thunk/redux_thunk.dart';
+import 'package:learning2/screens/feed/feed.dart';
 void main() {
   runApp(MyApp());
 }
@@ -22,10 +23,8 @@ class MyApp extends StatelessWidget {
         store:store , 
         child:      MaterialApp(
       title: _title,
-      home: Scaffold(
-        appBar: AppBar(title: const Text(_title)),
-        body: MyStatelessWidget(),
-      ),
+      home: FeedScreen(),
+
     )
     );
 

diff --git a/lib/screens/feed/feed.dart b/lib/screens/feed/feed.dart
@@ -10,26 +10,26 @@ import 'package:learning2/redux/reducers.dart';
 import 'package:redux/redux.dart';
 import 'dart:async';
 import 'package:learning2/main.dart';
+import 'package:learning2/screens/main/main.dart';
 import 'package:learning2/screens/feed/widgets/change_notification.dart';
 //void main() => runApp(Feed());
 
-class Feed extends StatefulWidget {
-  Feed({Key key}) : super(key: key);
+class FeedScreen extends StatefulWidget {
+  FeedScreen({Key key}) : super(key: key);
   static const String _title = 'Signalements';
 
-
   @override
   _FeedState createState() {
     // TODO: implement createState
     return _FeedState();
   }
 }
 
-class _FeedState extends State<Feed> {
+class _FeedState extends State<FeedScreen> {
   final GlobalKey<RefreshIndicatorState> _refreshIndicatorKey =
     new GlobalKey<RefreshIndicatorState>();
   bool loading = false;
-  List<Anomaly> list;
+  List<Anomaly> list = [];
   Timer timer;
 
   @override
@@ -40,6 +40,18 @@ class _FeedState extends State<Feed> {
         bool changed  = await api.checkNewPosts(MyApp.store);
         if (changed) MyApp.store.dispatch(new SetPostsChanged(changed: changed));
         });
+        final getReactions = GetUserReactionAction([]);
+        final getAnomalies = GetAnomaliesAction([]);
+
+        MyApp.store.dispatch(getReactions.getReactions());
+        MyApp.store.dispatch(getAnomalies.getAnomalies());
+
+        Future.wait([
+          getAnomalies.completer.future,
+          getReactions.completer.future,
+        ]).then((c)  {
+
+      });
     }
 
   @override
@@ -70,6 +82,7 @@ class _FeedState extends State<Feed> {
             )
           ],
         ),
+
         body: 
           Stack(
             alignment: Alignment.topCenter  ,
@@ -92,23 +105,31 @@ class _FeedState extends State<Feed> {
                 child:PostList(posts: store.state.anomalies),
                 color: Colors.blueAccent,
                 onRefresh: () {
-                 final getReactions = GetUserReactionAction([]);
-                          final getAnomalies = GetAnomaliesAction([]);
-                          
-                          store.dispatch(getReactions.getReactions());
-                          store.dispatch(getAnomalies.getAnomalies());
-                          
-                          Future.wait([
-                            getAnomalies.completer.future,
-                            getReactions.completer.future,
-                          ]).then((c)  {
+                  final getReactions = GetUserReactionAction([]);
+                  final getAnomalies = GetAnomaliesAction([]);
+
+                  store.dispatch(getReactions.getReactions());
+                  store.dispatch(getAnomalies.getAnomalies());
+
+                  Future.wait([
+                    getAnomalies.completer.future,
+                    getReactions.completer.future,
+                  ]).then((c)  {
 
                 });
                 return getReactions.completer.future;
                 }),              
             ],
-          )
+        ),
 
+        floatingActionButton: FloatingActionButton(
+          onPressed: () {
+
+            Navigator.push(context, MaterialPageRoute(builder: (context) => PostScreenWidget()));
+          },
+          child: Icon(Icons.add),
+          backgroundColor: Colors.blue,
+        ),
         );
       } 
     );

diff --git a/lib/screens/main/main.dart b/lib/screens/main/main.dart
@@ -18,8 +18,8 @@ import 'package:learning2/models/app_state.dart';
 
 
 /// This is the stateless widget that the main application instantiates.
-class MyStatelessWidget extends StatefulWidget {
-  MyStatelessWidget({Key key}) : super(key: key);
+class PostScreenWidget extends StatefulWidget {
+  PostScreenWidget({Key key}) : super(key: key);
 
 
   @override
@@ -29,7 +29,7 @@ class MyStatelessWidget extends StatefulWidget {
   }
 }
 
-class _MyStatefulWidgetState extends State<MyStatelessWidget> {
+class _MyStatefulWidgetState extends State<PostScreenWidget> {
   bool isLoading=false;
   bool havePosition = false;
   Position position;
@@ -67,7 +67,11 @@ class _MyStatefulWidgetState extends State<MyStatelessWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return StoreConnector<AppState, bool>(
+
+    return Scaffold(
+      appBar: AppBar(title: const Text('Ajouter un post')),
+
+      body:  StoreConnector<AppState, bool>(
       converter: (store) => store.state.isLoading,
       builder: (context, isLoading) => isLoading ? Center(child: CircularProgressIndicator(),) 
       :Center(
@@ -198,7 +202,7 @@ class _MyStatefulWidgetState extends State<MyStatelessWidget> {
                               onPressed: () async {
                               if (_formKey.currentState.validate()){
                                 onSave(title,description, state.position.latitude.toString(), state.position.longitude.toString());
-                                Navigator.push(context, MaterialPageRoute(builder: (context) => Feed()));
+                                Navigator.pop(context);
                                 }
                               },
                               )
@@ -224,7 +228,8 @@ class _MyStatefulWidgetState extends State<MyStatelessWidget> {
                             getAnomalies.completer.future,
                             getReactions.completer.future,
                           ]).then((c)  {
-                            Navigator.push(context, MaterialPageRoute(builder: (context) => Feed()));
+
+                            Navigator.pop(context);
                           });
 
                     });
@@ -238,9 +243,11 @@ class _MyStatefulWidgetState extends State<MyStatelessWidget> {
       ),
     )
   ,
-  );
+  )
 
 
+    );
+
   }
 
 }