[DEV] Update Navigator for preview story + view list feed

Author: dangngocduc

lib/features/account/header_account_widget.dart

@@ -34,7 +34,7 @@ class _HeaderAccountWidgetState extends State<HeaderAccountWidget> {
                     BigAvatarUserWidget(),
                     Padding(
                       padding: EdgeInsets.only(top: 8),
-                      child: Text('Đặng Ngọc Đức', style: Theme.of(context).textTheme.bodyText1,),
+                      child: Text('Đặng Ngọc Đức', style: Theme.of(context).textTheme.bodyText2,),
                     )
                   ],
                 ),
@@ -54,9 +54,10 @@ class _HeaderAccountWidgetState extends State<HeaderAccountWidget> {
             ),
           ),
           Container(
-              padding: EdgeInsets.symmetric(
-                  horizontal: 16
-              ),
+            width: double.infinity,
+            padding: EdgeInsets.symmetric(
+              horizontal: 16,
+            ),
             child: Text('Mastering B&W: The Art of B&W \nEditor: @dangngocduc Mod: @dangngocduc @dangngocduc \nFounder: @dangngocduc',
               style: Theme.of(context).textTheme.bodyText1,),
           ),

lib/features/authorized/authorized_navigation.dart

@@ -13,23 +13,30 @@ class AuthorizedNavigation extends StatefulWidget {
 
 class _AuthorizedNavigationState extends State<AuthorizedNavigation> {
   static const TAG = 'AuthorizedNavigation';
+
+  GlobalKey<NavigatorState> navigator = GlobalKey();
   @override
   Widget build(BuildContext context) {
-    return Navigator(
-      onGenerateRoute: (setting) {
-        switch(setting.name) {
-          case CommentPage.ROUTE_NAME:
-            return MaterialPageRoute(
-                builder: (context) => CommentPage(
-                  setting.arguments
-                ),
-                settings: setting
-            );
-          default:
-            return MaterialPageRoute(builder: (context) => MainPage());
-        }
-      },
-      initialRoute: MainPage.ROUTE_NAME,
-    );
+    return WillPopScope(
+        child: Navigator(
+          key: navigator,
+          onGenerateRoute: (setting) {
+            switch(setting.name) {
+              case CommentPage.ROUTE_NAME:
+                return MaterialPageRoute(
+                    builder: (context) => CommentPage(
+                        setting.arguments
+                    ),
+                    settings: setting
+                );
+              default:
+                return MaterialPageRoute(builder: (context) => MainPage());
+            }
+          },
+          initialRoute: MainPage.ROUTE_NAME,
+        ),
+        onWillPop: () async {
+          return !(await navigator.currentState.maybePop());
+        });
   }
 }

lib/features/bottom_nav/bottom_nav_page.dart

@@ -12,6 +12,11 @@ import 'bottom_navigation_item.dart';
 
 class BottomNavPage extends StatefulWidget {
   static const ROUTE_NAME = 'BottomNavPage';
+
+  final VoidCallback onCameraClick;
+
+  BottomNavPage(this.onCameraClick);
+
   @override
   _BottomNavPageState createState() => _BottomNavPageState();
 }
@@ -53,7 +58,7 @@ class _BottomNavPageState extends State<BottomNavPage> {
           }
         },
         children: <Widget>[
-          HomePage(),
+          HomePage(widget.onCameraClick),
           SearchPages(),
           ActivityPage(),
           AccountPage()

lib/features/camera/camera_pge.dart

@@ -1,8 +1,15 @@
 import 'package:flutter/material.dart';
 import 'dart:developer' as developer;
 
+import 'package:google_fonts/google_fonts.dart';
+
 class CameraPge extends StatefulWidget {
   static const ROUTE_NAME = 'CameraPge';
+
+  final VoidCallback onClose;
+
+  CameraPge(this.onClose);
+
   @override
   _CameraPgeState createState() => _CameraPgeState();
 }
@@ -12,8 +19,16 @@ class _CameraPgeState extends State<CameraPge> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(),
-      body: Container(),
+      appBar: AppBar(
+        leading: IconButton(icon: Icon(Icons.close), onPressed: widget.onClose,),
+      ),
+      body: Container(
+        alignment: Alignment.center,
+        child: Text(
+          'Story Preview',
+          style: GoogleFonts.pacificoTextTheme(Theme.of(context).textTheme).headline5,
+        ),
+      ),
     );
   }
 }

lib/features/home/header_widget.dart

@@ -8,6 +8,10 @@ import 'package:instagramflutter/features/direct/direct_page.dart';
 import 'package:instagramflutter/res/icons_app.dart';
 
 class HeaderWidget extends StatelessWidget with PreferredSizeWidget {
+  final VoidCallback onCameraClick;
+
+  HeaderWidget(this.onCameraClick);
+
   @override
   Widget build(BuildContext context) {
     return Material(
@@ -18,7 +22,7 @@ class HeaderWidget extends StatelessWidget with PreferredSizeWidget {
           child: Row(
             children: <Widget>[
               IconButton(icon: SvgPicture.asset(IconsApp.icCamera,
-                color: Theme.of(context).colorScheme.onPrimary,), onPressed: (){}),
+                color: Theme.of(context).colorScheme.onPrimary,), onPressed: onCameraClick),
               Expanded(child: Container(
                 child: SvgPicture.asset(IconsApp.logoInsta,
                   color: Theme.of(context).colorScheme.onPrimary,),

lib/features/home/home_page.dart

@@ -7,6 +7,11 @@ import 'header_widget.dart';
 
 class HomePage extends StatefulWidget {
   static const ROUTE_NAME = 'HomePage';
+
+  final VoidCallback onCameraClick;
+
+  HomePage(this.onCameraClick);
+
   @override
   _HomePageState createState() => _HomePageState();
 }
@@ -16,7 +21,7 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: HeaderWidget(),
+      appBar: HeaderWidget(widget.onCameraClick),
       body: RefreshIndicator(
           child: SingleChildScrollView(
             child: Column(

lib/features/main_page.dart

@@ -17,6 +17,7 @@ class MainPage extends StatefulWidget {
 class _MainPageState extends State<MainPage> {
   static const TAG = 'MainPage';
   PageController _pageController;
+  int currentPage = 1;
   @override
   void initState() {
     super.initState();
@@ -26,21 +27,45 @@ class _MainPageState extends State<MainPage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _pageController = PageController(initialPage: 1);
+    _pageController = PageController(initialPage: currentPage);
   }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: PageView(
-        physics: NeverScrollableScrollPhysics(),
-        controller: _pageController,
-        children: <Widget>[
-          CameraPge(),
-          BottomNavPage(),
-          DirectPage(),
-        ],
-      ),
-    );
+    return WillPopScope(
+        child: Scaffold(
+          body: PageView(
+            physics: NeverScrollableScrollPhysics(),
+            controller: _pageController,
+            onPageChanged: (current) {
+              currentPage = current;
+            },
+            children: <Widget>[
+              CameraPge(() {
+                _pageController.animateToPage(
+                    1,
+                    duration: Duration(milliseconds: 300),
+                    curve: Curves.easeIn);
+              }),
+              BottomNavPage(() {
+                _pageController.animateToPage(
+                    0,
+                    duration: Duration(milliseconds: 300),
+                    curve: Curves.easeIn);
+              }),
+            ],
+          ),
+        ),
+        onWillPop: () async {
+          if (currentPage == 0) {
+            _pageController.animateToPage(
+                1,
+                duration: Duration(milliseconds: 300),
+                curve: Curves.easeIn);
+            return false;
+          } else {
+            return true;
+          }
+        });
   }
 }

lib/features/search/search_pages.dart

@@ -72,7 +72,9 @@ class _SearchPagesState extends State<SearchPages> {
             return InkResponse(
               child: Image.asset('assets/sample/search_demo1.jpg', fit: BoxFit.cover,),
               onTap: () {
-                Navigator.of(context).pushNamed(ExplorePage.ROUTE_NAME);
+                Navigator.of(context).push(
+                  MaterialPageRoute(builder: (context) => ExplorePage())
+                );
               },
             );
           }),

lib/widgets/story/story_item_widget.dart

@@ -57,7 +57,9 @@ class _StoryItemWidgetState extends State<StoryItemWidget> {
         fit: BoxFit.scaleDown,
       ),
       onTap: () {
-        Navigator.of(context).pushNamed(StoryPage.ROUTE_NAME);
+        Navigator.of(context).push(MaterialPageRoute(
+            builder: (context) => StoryPage(),
+        ));
       },
     );
   }