Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add drawer #24

Merged
merged 1 commit into from
May 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 0 additions & 71 deletions lib/drawer/main_drawer.dart

This file was deleted.

13 changes: 6 additions & 7 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import 'package:intl/date_symbol_data_local.dart';
import 'package:capstone_2022_48/model/DataModel.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter_test/flutter_test.dart';

import 'package:capstone_2022_48/pages/profile_screen.dart';
import 'package:capstone_2022_48/navigator/profile.dart';

// void main() {
// runApp(MyApp());
Expand Down Expand Up @@ -173,11 +172,11 @@ class MyApp extends StatelessWidget {
child: MainScreen(),
),
// home: SignInScreen(),
routes: {
SignInScreen.route: (_) => SignInScreen(),
HomeCalendar.route: (_) => HomeCalendar(),
ProfileScreen.route: (_) => ProfileScreen(),
},
// routes: {
// SignInScreen.route: (_) => SignInScreen(),
// HomeCalendar.route: (_) => HomeCalendar(),
// ProfileScreen.route: (_) => ProfileScreen(),
// },
// home: MainScreen(),
);
}
Expand Down
40 changes: 40 additions & 0 deletions lib/navigator/bottom_tabs.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import 'package:capstone_2022_48/pages/ExercisePage.dart';
import 'package:capstone_2022_48/pages/Signin_screen.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:capstone_2022_48/pages/HomeCalendar.dart';
import 'package:capstone_2022_48/pages/Exercise.dart';
import 'package:capstone_2022_48/pages/Diet.dart';
import 'package:capstone_2022_48/pages/Stats.dart';

class TabNavigationItem {
final Widget page;
final Widget title;
final Icon icon;

TabNavigationItem(
{required this.page, required this.title, required this.icon});

static List<TabNavigationItem> get items => [
TabNavigationItem(
page: HomeCalendar(),
icon: Icon(Icons.favorite),
title: Text("Home"),
),
TabNavigationItem(
page: StopWatch(),
icon: Icon(Icons.directions_run),
title: Text("Exercise"),
),
TabNavigationItem(
page: Diet(),
icon: Icon(Icons.restaurant),
title: Text("Diet"),
),
TabNavigationItem(
page: Stats(),
icon: Icon(Icons.assessment),
title: Text("Stats"),
),
];
}
60 changes: 60 additions & 0 deletions lib/navigator/profile.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import 'package:flutter/material.dart';
import 'package:capstone_2022_48/navigator/sidemenu.dart';

class Profile extends StatefulWidget {
const Profile({Key? key}) : super(key: key);

@override
State<Profile> createState() => _ProfileState();
}

class _ProfileState extends State<Profile> {
@override
Widget build(BuildContext context) {
return Scaffold(
drawer: SideMenu(),
appBar: AppBar(
leading: Builder(
builder: (BuildContext context) {
return IconButton(
icon: Icon(Icons.menu, color: Colors.black),
onPressed: () => Scaffold.of(context).openDrawer(),
);
},
),
backgroundColor: Colors.white,
elevation: 0.0,
),
body: Column(
children: <Widget>[
SizedBox(height: 30.0),
Container(
width: MediaQuery.of(context).size.width * 0.9,
child: Column(
children: <Widget>[
Card(
child: ListTile(
leading: Icon(Icons.people),
title: Text('성별'),
),
),
Card(
child: ListTile(
leading: Icon(Icons.height),
title: Text('키'),
),
),
Card(
child: ListTile(
leading: Icon(Icons.monitor_weight),
title: Text('몸무게'),
),
),
],
),
),
],
),
);
}
}
126 changes: 126 additions & 0 deletions lib/navigator/sidemenu.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
import 'package:capstone_2022_48/pages/HomeCalendar.dart';
import 'package:flutter/material.dart';
import 'package:capstone_2022_48/navigator/tabspage.dart';
import 'package:capstone_2022_48/navigator/profile.dart';
import 'package:capstone_2022_48/pages/Signin_screen.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:fluttertoast/fluttertoast.dart';

class SideMenu extends StatefulWidget {
@override
State<SideMenu> createState() => _SideMenuState();
}

class _SideMenuState extends State<SideMenu> {
@override
Widget build(BuildContext context) {
return Drawer(
child: ListView(
padding: EdgeInsets.zero,
children: [
SizedBox(
height: 300,
child: DrawerHeader(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
height: 150,
child: Image.asset(
'assets/images/logo.png',
fit: BoxFit.cover,
),
),
]),
),
),
ListTile(
leading: Icon(Icons.home),
title: Text(
'Home',
style: TextStyle(
fontFamily: 'Pretendard',
fontWeight: FontWeight.bold,
fontSize: 17),
),
onTap: () => {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: ((context) => TabsPage(selectedIndex: 0)),
),
),
}),
ListTile(
leading: Icon(Icons.favorite),
title: Text(
'Profile',
style: TextStyle(
fontFamily: 'Pretendard',
fontWeight: FontWeight.bold,
fontSize: 17),
),
onTap: () => {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: ((context) => Profile()),
),
),
},
),
ListTile(
leading: Icon(Icons.account_circle),
title: Text(
'Log In',
style: TextStyle(
fontFamily: 'Pretendard',
fontWeight: FontWeight.bold,
fontSize: 17),
),
onTap: () => {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: ((context) => SignInScreen()),
),
),
},
),
ListTile(
leading: Icon(Icons.exit_to_app),
title: Text(
'Log Out',
style: TextStyle(
fontFamily: 'Pretendard',
fontWeight: FontWeight.bold,
fontSize: 17),
),
onTap: () => {
flutterToast(),
FirebaseAuth.instance.signOut().then((value) {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: ((context) => HomeCalendar()),
),
);
})
},
),
],
),
);
}
}

void flutterToast() {
Fluttertoast.showToast(
msg: '로그아웃 됐습니다.',
gravity: ToastGravity.BOTTOM, // 토스트 위치
backgroundColor: Colors.grey,
fontSize: 15.0,
textColor: Colors.white,
toastLength: Toast.LENGTH_SHORT);
}
71 changes: 71 additions & 0 deletions lib/navigator/tabspage.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import 'package:flutter/material.dart';
import 'package:capstone_2022_48/navigator/bottom_tabs.dart';

class TabsPage extends StatefulWidget {
int selectedIndex = 0;

TabsPage({required this.selectedIndex});

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

class _TabsPageState extends State<TabsPage> {
int _selectedIndex = 0;

void _onItemTapped(int index) {
setState(() {
widget.selectedIndex = index;
_selectedIndex = widget.selectedIndex;
print(_selectedIndex);
});
}

@override
void initState() {
_onItemTapped(widget.selectedIndex);

super.initState();
}

@override
Widget build(BuildContext context) {
return Scaffold(
body: Scaffold(
body: IndexedStack(
index: widget.selectedIndex,
children: [
for (final tabItem in TabNavigationItem.items) tabItem.page,
],
),
),
bottomNavigationBar: BottomNavigationBar(
selectedItemColor: Colors.blue,
selectedIconTheme: IconThemeData(color: Colors.blue[800]),
unselectedItemColor: Colors.black,
unselectedIconTheme: IconThemeData(color: Colors.grey),
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.favorite),
label: 'Home',
),
BottomNavigationBarItem(
icon: Icon(Icons.directions_run),
label: 'Exercise',
),
BottomNavigationBarItem(
icon: Icon(Icons.restaurant),
label: 'Diet',
),
BottomNavigationBarItem(
icon: Icon(Icons.assessment),
label: 'Stats',
),
],
currentIndex: _selectedIndex,
// selectedItemColor: Colors.blue[800],
onTap: _onItemTapped,
),
);
}
}
Loading