Commit 009ca007 authored by Tuan Anh Nguyen's avatar Tuan Anh Nguyen
Browse files

fix: move ChangeNotifier

parent a25e0853

lib/bottom_nav_bar/widget/bottom_nav_bar.dart

+31 −24
Original line number Original line Diff line number Diff line 
import 'package:flutter/material.dart';

import 'package:flutter/material.dart';

import 'package:provider/provider.dart';

import 'package:stamped/bottom_nav_bar/model/bottom_nav_bar_item.dart';

import 'package:stamped/bottom_nav_bar/model/bottom_nav_bar_item.dart';

import 'package:stamped/pages/collections/collections_page.dart';

import 'package:stamped/pages/collections/collections_page.dart';

import 'package:stamped/pages/create_front/notifiers/create_postcard_notifier.dart';

import 'package:stamped/pages/create/create_front/select_image.dart';

import 'package:stamped/pages/create_front/select_image.dart';

import 'package:stamped/pages/home/home_page.dart';

import 'package:stamped/pages/home/home_page.dart';

import 'package:stamped/pages/profile/profile_page.dart';

import 'package:stamped/pages/profile/profile_page.dart';
@@ -20,9 +18,21 @@ final List<BottomNavBarItem> _navItems = [ 
  ),

  ),

  BottomNavBarItem(

  BottomNavBarItem(

    label: 'Create',

    label: 'Create',

<<<<<<< HEAD

    icon: Icon(Icons.add),

    icon: Icon(Icons.add),

    child: SelectImage(),

    child: SelectImage(),

  ),

  ),

=======

    icon: Icon(Icons.add_circle_outline),

    child: SelectImage(),

  ),

  // BottomNavBarItem(

  //   label: 'Friends',

  //   icon: Icon(Icons.group),

  //   // TODO: replace with the friends page

  //   child: Placeholder(),

  // ),

>>>>>>> 3a9869b (fix: move ChangeNotifier)

  BottomNavBarItem(

  BottomNavBarItem(

    label: 'Profile',

    label: 'Profile',

    icon: Icon(Icons.person),

    icon: Icon(Icons.person),
@@ -42,9 +52,7 @@ class _BottomNavBarState extends State<BottomNavBar> { 




  @override

  @override

  Widget build(BuildContext context) {

  Widget build(BuildContext context) {

    return ChangeNotifierProvider(

    return Scaffold(

      create: (context) => CreatePostcardNotifier(),

      child: Scaffold(

      body: _navItems[_currentIndex].child,

      body: _navItems[_currentIndex].child,

      bottomNavigationBar: BottomNavigationBar(

      bottomNavigationBar: BottomNavigationBar(

        currentIndex: _currentIndex,

        currentIndex: _currentIndex,
@@ -63,7 +71,6 @@ class _BottomNavBarState extends State<BottomNavBar> { 
        showSelectedLabels: false,

        showSelectedLabels: false,

        showUnselectedLabels: false,

        showUnselectedLabels: false,

      ),

      ),

      ),

    );

    );

  }

  }

lib/common/widget/app_wrapper.dart

+25 −19
Original line number Original line Diff line number Diff line 
import 'package:flutter/foundation.dart';

import 'package:flutter/foundation.dart';

import 'package:flutter/material.dart';

import 'package:flutter/material.dart';

import 'package:provider/provider.dart';

import 'package:stamped/bottom_nav_bar/widget/bottom_nav_bar.dart';

import 'package:stamped/bottom_nav_bar/widget/bottom_nav_bar.dart';

import 'package:stamped/common/service/ioc_container.dart';

import 'package:stamped/common/service/ioc_container.dart';

import 'package:stamped/common/widget/future_builder_handler.dart';

import 'package:stamped/common/widget/future_builder_handler.dart';

import 'package:stamped/pages/auth/login_page.dart';

import 'package:stamped/pages/auth/login_page.dart';

import 'package:stamped/pages/create/notifiers/create_postcard_notifier.dart';

import 'package:stamped/service/auth_service.dart';

import 'package:stamped/service/auth_service.dart';





class AppWrapper extends StatelessWidget {

class AppWrapper extends StatelessWidget {
@@ -17,7 +19,9 @@ class AppWrapper extends StatelessWidget { 
  @override

  @override

  Widget build(BuildContext context) {

  Widget build(BuildContext context) {

    final authService = get<AuthService>();

    final authService = get<AuthService>();

    return MaterialApp(

    return ChangeNotifierProvider(

      create: (context) => CreatePostcardNotifier(),

      child: MaterialApp(

        title: 'Stamped!',

        title: 'Stamped!',

        theme: ThemeData(

        theme: ThemeData(

          useMaterial3: true,

          useMaterial3: true,
@@ -39,8 +43,10 @@ class AppWrapper extends StatelessWidget { 
              future: authService.setUser(),

              future: authService.setUser(),

              builder: (context, data) {

              builder: (context, data) {

                return BottomNavBar();

                return BottomNavBar();

              });

              },

              },

            );

          },

        ),

      ),

      ),

    );

    );

  }

  }