Léo Salé 3 лет назад
Родитель
Сommit
b3c3440dfa
3 измененных файлов с 47 добавлено и 39 удалено
  1. 2 2
      app/lib/main.dart
  2. 0 37
      app/lib/mainPage.dart
  3. 45 0
      app/lib/menu/main_page.dart

+ 2 - 2
app/lib/main.dart

@@ -7,7 +7,7 @@ import 'package:physigo/logIn.dart';
 import 'package:physigo/profilePage.dart';
 import 'package:physigo/widgets/rankingNavigation.dart';
 import 'package:physigo/SignupPage.dart';
-import 'package:physigo/mainPage.dart';
+import 'package:physigo/menu/main_page.dart';
 import 'package:physigo/welcomeScreen.dart';
 
 void main() async {
@@ -29,7 +29,7 @@ class PhysiGo extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blueGrey,
       ),
-      initialRoute: '/',
+      initialRoute: '/mainPage',
       routes: {
         '/': (context) => MyHomePage(title: ''),
         '/register': (context) => SignupPage(),

+ 0 - 37
app/lib/mainPage.dart

@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:physigo/walking/walking_permission.dart';
-
-class MainPage extends StatefulWidget {
-  const MainPage({Key? key}) : super(key: key);
-  @override
-  State<MainPage> createState() => _MainPage();
-}
-class _MainPage extends State<MainPage> {
-
-
-  @override
-  Widget build(BuildContext context) {
-    final arguments = (ModalRoute.of(context)?.settings.arguments ?? <String, dynamic>{}) as Map;
-    final String id = arguments['uid'];
-    print(id);
-
-    return Scaffold(
-      appBar: AppBar(
-
-        title: const Text('Welcome Back!'),
-        leading: GestureDetector(
-          onTap: () {
-            print('going to profile page');
-            Navigator.pushNamed(context, '/profilePage',
-              arguments: {'id': id},
-            );
-            },
-          child: Icon(
-            Icons.account_circle_rounded,  // add custom icons also
-          ),
-        ),
-      ),
-      body: WalkingPermission()
-    );
-  }
-}

+ 45 - 0
app/lib/menu/main_page.dart

@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:physigo/friends/friends_page.dart';
+import 'package:physigo/home/home_page.dart';
+
+class MainPage extends StatefulWidget {
+  const MainPage({Key? key}) : super(key: key);
+  @override
+  State<MainPage> createState() => _MainPage();
+}
+
+class _MainPage extends State<MainPage> {
+  static const List<Widget> _widgets = [
+    HomePage(),
+    Text("Exercises"),
+    Text("Rank"),
+    FriendsPage(),
+  ];
+  int _selectedIndex = 0;
+
+  void _onMenuTap(int newIndex) {
+    setState(() {
+      _selectedIndex = newIndex;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      child: Scaffold(
+        bottomNavigationBar: BottomNavigationBar(
+          type: BottomNavigationBarType.fixed, // need to specify fixed with more than 3 items
+          currentIndex: _selectedIndex,
+          onTap: _onMenuTap,
+          items: const [
+            BottomNavigationBarItem(icon: Icon(Icons.home), label: "Home"),
+            BottomNavigationBarItem(icon: Icon(Icons.sports_gymnastics), label: "Exercises"),
+            BottomNavigationBarItem(icon: Icon(Icons.emoji_events), label: "Ranking"),
+            BottomNavigationBarItem(icon: Icon(Icons.people), label: "Social"),
+          ],
+        ),
+        body: _widgets[_selectedIndex],
+      ),
+    );
+  }
+}